mrrl

commit a110ad8a868622c78fad5e117849d37ff86ab39c
parent fab7d25b86a560932a6a1886417bb7237fe63c41
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Tue,  9 Dec 2025 18:01:41 +0000

Set gcc-related search paths in mcm environment

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

379 files changed, 8057 insertions(+), 8199 deletions(-)
diff --git a/templates/functions/build_env_dynamic b/templates/functions/build_env_dynamic
@@ -1,7 +1,8 @@
 build_env_dynamic() {
 	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
 	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/{{dynlibdir}}"
 	export CPATH="$pthbs_build_environment/{{includedir}}"
 	export LDFLAGS="-L$pthbs_build_environment/{{dynlibdir}} $LDFLAGS"
+	export LIBRARY_PATH="$pthbs_build_environment/{{dynlibdir}}:$LIBRARY_PATH"
+	LIBRARY_PATH=${LIBRARY_PATH%:}
 }
diff --git a/templates/functions/build_env_static b/templates/functions/build_env_static
@@ -1,7 +1,5 @@
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/{{libdir}} $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/{{libdir}} $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/{{libdir}}"
-	export CPATH="$pthbs_build_environment/{{includedir}}"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/{{libdir}} $LDFLAGS"
 }
diff --git a/templates/pkg/musl-cross-make b/templates/pkg/musl-cross-make
@@ -36,6 +36,19 @@ rm patches/binutils-2.44/0001-j2.diff patches/binutils-2.44/0002-sh-fdpic-pr3161
 {% block build_and_install -%}
 {{- super() }}
 
+mkdir -p "$dest/{{dynlibdir}}" "$dest/.env-template"
+printf '%s' >"$dest/.env-template/CPATH" @ENVROOT@/{{includedir|shesc}}
+printf '%s' >"$dest/.env-template/LIBRARY_PATH" @ENVROOT@/{{libdir|shesc}}
+printf '%s' >"$dest/.env-template/LD_LIBRARY_PATH" @ENVROOT@/{{dynlibdir|shesc}}
+
+{# go through relevant directories and make symlinks depending on type of library -#}
+dynlib_to_top="$(printf "%s\n" {{dynlibdir|shesc}} | sed -Ee "s!^\./!!; s![^/]+!..!g")"
+printf >>link_to_dynlib '%s\n' 'ln -s "'$dynlib_to_top'${1#.}" '{{dynlibdir|shesc}}/
+( cd "$dest" && find "./lib" "./{{triplet}}" \
+	\( -type f -o -type l \) \( -name '*.so' -o -name '*.so.*' \) \
+	-exec sh -xe "$pthbs_workdir/link_to_dynlib" '{}' ';'
+)
+
 pkgs="gmp mpc mpfr zlib"
 #pkgs="$pkgs libbacktrace libcc1 libcpp libdecnumber libiberty lto-plugin"
 
@@ -76,6 +89,10 @@ cmp -s true.c true.c.2
 	x["./lib/libmpfr.a"]=1
 	x["./lib/libz.a"]=1
 
+	x["./{{triplet}}/lib/libc.so"]=1
+	x["./{{triplet}}/lib/libgcc_s.so"]=1
+	x["./{{triplet}}/lib/libstdc++.so"]=1
+
 	x["./{{includedir}}/gmp.h"]=1
 	x["./{{includedir}}/mpc.h"]=1
 	x["./{{includedir}}/mpf2mpfr.h"]=1
diff --git a/templates/pkg/zsh b/templates/pkg/zsh
@@ -8,6 +8,10 @@
 #@git:{{submodule.current["zsh_config"]}}:zsh_config
 {% endblock %}
 {%- block configure %}
+export CPATH=$pthbs_build_environment/{{includedir|shesc}}
+export LIBRARY_PATH=$pthbs_build_environment/{{libdir|shesc}}
+export LD_LIBRARY_PATH=$pthbs_build_environment/{{dynlibdir|shesc}}
+build_env_static
 autotools_config \
 	--enable-datadir="${prefix}" \
 	--enable-datarootdir="${prefix}" \
diff --git a/variants/ccx-x86_64/aat b/variants/ccx-x86_64/aat
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+zsh.fcfc54f4ac311f948cfc2406559ef99ab8dac08eb0beed43b9b337082535bb97
-#+pthbs-banginstall.f1d73070c78f925ef111e3802e934ca20663bfd59af29c362fcf3e8e7b437312
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+zsh.2cb2e0585ce2058c4cf69794bd14e9d84c9f93437a1fc66cdaf3c2e396e37cd8
+#+pthbs-banginstall.8746c2e75c56ad9ad12a0a5951c510bb34b76e5be8406c7492602cb9c108ab82
 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat
 
 
diff --git a/variants/ccx-x86_64/abduco b/variants/ccx-x86_64/abduco
@@ -1,45 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
 #@git:8c32909a159aaa9484c82b71f05b7a73321eb491:abduco
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
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.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
 #@git:c7b36ed27103ee3f9aa01905ba1fac2d606079cf:alpine-keys
 
 
diff --git a/variants/ccx-x86_64/apk-tools b/variants/ccx-x86_64/apk-tools
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+patch.930184dce3e1dbdfbf8ac1ccbcb3ab728cc22196e7459af586877968909a0543
-#+libressl.4a59407f93a86c2bab70daaed9958b39daf97f238f1e6ae269ddda85bce9fbb5
-#+zstd.8bd51affe68613292d100159bd8a6c511a3baa7667d329be44ab6a017107c7b8
-#+pkgconf-pkg-config.746069f838745544ee4125e5e77822aad9f95bad2e65b6be5bb94091d0d70ec6
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+patch.f9af9058385753a59f5f726db36eb7a83c7693dd3f87907691614dd77f622534
+#+libressl.5220a49e3b686e5776e80491a62ead7cdf5a4dc4e22a1e1383724aa811826ad3
+#+zstd.bf9212fdc735903c1ef7409a8f4e0639faf27b9aff11feca6e35f4f84b0710c9
+#+pkgconf-pkg-config.6e835df6aed5c8ad6cea2774f013b169b0d16b07b84112809ed145cb6a3bd7d4
 #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch
 #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools
 
@@ -41,10 +41,8 @@
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/applyuidgid-caps b/variants/ccx-x86_64/applyuidgid-caps
@@ -1,45 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+skalibs.7f2610571321bf6ff32187e4720b1f4d7bdeab2163da455e07e75549b216fbe8
-#+libcap.8b9b94ff01e70717816b90ca878449aab38863bfcda5eb041e16b143c9ef9a77
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+skalibs.513c9f46b250859f980edc5e4ab5de6aac0497533a1644f8f70c2c1afc815eb6
+#+libcap.444bdff77be4de9afde0a7185ff76fd5ff1ed6b1ad640657a4774b8d246a69c9
 #@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/argp-standalone b/variants/ccx-x86_64/argp-standalone
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+m4.13e8f64dca14c47846841a8a697180a2fe96d777a0f56f5e52079761eb6b79aa
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+m4.3bd69e2dd42ef971ed64b42d4d396a042ea9e223d89a4ab70c526474b3383357
 #@untar:-z:sha256:c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6:.
 #@untar::sha256:a4facc0856b512ad8ab5aed7b07e14a9629aaf042b1e92377ba22fcfc4c4205b:argp-standalone-1.5.0
 
diff --git a/variants/ccx-x86_64/attr b/variants/ccx-x86_64/attr
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+m4.13e8f64dca14c47846841a8a697180a2fe96d777a0f56f5e52079761eb6b79aa
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+m4.3bd69e2dd42ef971ed64b42d4d396a042ea9e223d89a4ab70c526474b3383357
 #@untar:-z:sha256:39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87:.
 
 
@@ -60,10 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/binutils b/variants/ccx-x86_64/binutils
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
-#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
-#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+m4.d7c9e4dd9474e659d6c16f640cd2d57ac62b252b2a4bb12259dcc48d2412e402
-#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
+#+musl-cross-make.7fc68aacf3c3af5e943bf800f4927f49f0ccf4a9bc5f424ff037ac513a258553
+#+gnu-make.2c3345112e9f2486d0d450f9f3e3da34c00d6d91d901bb8857cc2e4e75a43078
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+m4.f7461c6652293037f08fb6768207644716d0111a9b8bcb7841c20f28c926da16
+#+nawk.b1d41648e3331f461db172fca1ad98cd8da92077bb3abb107a581f6dd2b5bbfa
 #@sha256:a119e7e50cae23feaad160a533d69a90073a519521924da56abc74724cec65c6:merged.patch
 #@untar:-z:sha256:0cdd76777a0dfd3dd3a63f215f030208ddb91c2361d2bcc02acec0f1c16b6a2e:.
 
@@ -34,10 +34,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/bison b/variants/ccx-x86_64/bison
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+m4.13e8f64dca14c47846841a8a697180a2fe96d777a0f56f5e52079761eb6b79aa
-#+flex.b91fd0bbc76abf76c0368bf4f5b4b19c3a643eb531725abdbe295e4f78d5d471
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.b1d41648e3331f461db172fca1ad98cd8da92077bb3abb107a581f6dd2b5bbfa
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+m4.3bd69e2dd42ef971ed64b42d4d396a042ea9e223d89a4ab70c526474b3383357
+#+flex.3a3870e15fbc145f3cfb7d5e3040078bfaa096010de16a41fa34be6f6bfde1be
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 
@@ -62,10 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/bootstrap.environment b/variants/ccx-x86_64/bootstrap.environment
@@ -1,4 +1,4 @@
 #!/usr/bin/env pthbs-build
-#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
-#+musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4-
\ No newline at end of file
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+gnu-make.2c3345112e9f2486d0d450f9f3e3da34c00d6d91d901bb8857cc2e4e75a43078
+#+musl-cross-make.7fc68aacf3c3af5e943bf800f4927f49f0ccf4a9bc5f424ff037ac513a258553+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/busybox b/variants/ccx-x86_64/busybox
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
-#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.2c3345112e9f2486d0d450f9f3e3da34c00d6d91d901bb8857cc2e4e75a43078
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
 #@sha256:cf378a58f842c7a06997afc04d614912f2f8068d8a8f74ca4ec636bdf1adeba9:busybox/.config
 #@git:3621595939e43a831d66f6b757d4f410029bff95:busybox
 
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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
 
 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:bootstrap b/variants/ccx-x86_64/busybox:bootstrap
@@ -1,15 +1,15 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
 #@pragma:nopath
-#+musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
-#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
-#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
+#+musl-cross-make.7fc68aacf3c3af5e943bf800f4927f49f0ccf4a9bc5f424ff037ac513a258553
+#+gnu-make.2c3345112e9f2486d0d450f9f3e3da34c00d6d91d901bb8857cc2e4e75a43078
+#+nawk.b1d41648e3331f461db172fca1ad98cd8da92077bb3abb107a581f6dd2b5bbfa
 #@git:8d7ae80eda7e08ee361f8793683ae58216caf720:busybox
 #@sha256:13ed92216aef70e6fc431b2e66a9b20a71b5f4b69a3d7a84acbc4d1210d6ea6a:busybox/.config
 
 PATH="$pthbs_build_environment/command:$PATH"
-mcm=/home/ccx/versions/musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
-make=/home/ccx/versions/gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
+mcm=/home/ccx/versions/musl-cross-make.7fc68aacf3c3af5e943bf800f4927f49f0ccf4a9bc5f424ff037ac513a258553
+make=/home/ccx/versions/gnu-make.2c3345112e9f2486d0d450f9f3e3da34c00d6d91d901bb8857cc2e4e75a43078
 
 export CC="x86_64-linux-musl-gcc"
 export CFLAGS="-D_GNU_SOURCE"
diff --git a/variants/ccx-x86_64/busybox:modutils b/variants/ccx-x86_64/busybox:modutils
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+linux-qemu-guest.2146f6782e67214c7ad7ee82b2c006ba2f2cd852ed4df91c86decd5c41d0e7ae
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
+#+linux-qemu-guest.777a0ba4f6890b1584fd940d2ed5af6e34a390518c7e1b459ab1b5e3a931f8b8
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
 #@sha256:ccb459010923e1a9b49cb39d45bc93d0fc8749acea6efd7b19cfb00e76a5562e:busybox/.config
 #@git:3621595939e43a831d66f6b757d4f410029bff95:busybox
 
@@ -60,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.2146f6782e67214c7ad7ee82b2c006ba2f2cd852ed4df91c86decd5c41d0e7ae"
+CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux-qemu-guest.777a0ba4f6890b1584fd940d2ed5af6e34a390518c7e1b459ab1b5e3a931f8b8"
 EOF
 make oldconfig
 cat .config
diff --git a/variants/ccx-x86_64/busybox:old b/variants/ccx-x86_64/busybox:old
@@ -1,8 +1,8 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.e6726ea29e8b7fe316c8a30b8a500f73aab8cf8c862a1bcd575d50b3265dd793
-#+gnu-make.b7cde92a7edabca3a8e00739fed6aaa5533d94f74d290dff8ce739ffef9171b5
-#+busybox.3cee246e09c72f86b6e714fb4b4557dc2f9ee571084f716bbcb612fa8ebd3deb
-#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
+#+musl-cross-make.881a7e5ccca8d906a570a92378e03d43b936a4f9ca607adf8bfc8255fdc341f3
+#+gnu-make.a3596a3a78160446705972f45fdfefa8b7529275cd23e67891db41713c920975
+#+busybox.f26f17d6b39529e6faba81d3296ee8b543f18f1d6417de3fb643b497f9f7dbca
+#+nawk.b1d41648e3331f461db172fca1ad98cd8da92077bb3abb107a581f6dd2b5bbfa
 #@sha256:31b8f61d2173fa36d4409e8e91f52088691d6ba4db13efe19ea7ae7512e64275:busybox/.config
 #@git:3621595939e43a831d66f6b757d4f410029bff95:busybox
 
diff --git a/variants/ccx-x86_64/busybox:oldbootstrap b/variants/ccx-x86_64/busybox:oldbootstrap
@@ -1,13 +1,13 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
 #@pragma:nopath
-#+musl-cross-make.a92bd0a73a662b4ebb61cd88fa1f6d034a327326d3a9d0f0040cc87ed97e5cb3
-#+gnu-make.b7cde92a7edabca3a8e00739fed6aaa5533d94f74d290dff8ce739ffef9171b5
+#+musl-cross-make.d903f7566ce74e61dc3c4873651fe5f229f21b7b98426c73a8918b5e9d68324c
+#+gnu-make.a3596a3a78160446705972f45fdfefa8b7529275cd23e67891db41713c920975
 #@git:8d7ae80eda7e08ee361f8793683ae58216caf720:busybox
 #@sha256:13ed92216aef70e6fc431b2e66a9b20a71b5f4b69a3d7a84acbc4d1210d6ea6a:busybox/.config
 
-mcm=/home/ccx/versions/musl-cross-make.a92bd0a73a662b4ebb61cd88fa1f6d034a327326d3a9d0f0040cc87ed97e5cb3
-make=/home/ccx/versions/gnu-make.b7cde92a7edabca3a8e00739fed6aaa5533d94f74d290dff8ce739ffef9171b5
+mcm=/home/ccx/versions/musl-cross-make.d903f7566ce74e61dc3c4873651fe5f229f21b7b98426c73a8918b5e9d68324c
+make=/home/ccx/versions/gnu-make.a3596a3a78160446705972f45fdfefa8b7529275cd23e67891db41713c920975
 
 export PATH="$mcm/command:$make/command:$PATH"
 export CC="$mcm/command/x86_64-linux-musl-gcc"
diff --git a/variants/ccx-x86_64/ca-certificates-wip-donotuse b/variants/ccx-x86_64/ca-certificates-wip-donotuse
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+certdata2pem.b9ccaeb555c3a8c85ca4fb25ee542fb66f97b6c5e523cd1af103d4031b7176c2
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+certdata2pem.1a7468f1d7c3dba85bbe3003a5494bbdd46e1f01d8f121c28f38aea1b8ec536a
 #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:.
 
 
diff --git a/variants/ccx-x86_64/ccx-utils b/variants/ccx-x86_64/ccx-utils
@@ -1,46 +1,44 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+skalibs.7f2610571321bf6ff32187e4720b1f4d7bdeab2163da455e07e75549b216fbe8
-#+s6.c57430ab256e3869863e62c5bb25648fedcd64f7f7c7457dbac241125ada2f7a
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+skalibs.513c9f46b250859f980edc5e4ab5de6aac0497533a1644f8f70c2c1afc815eb6
+#+s6.bf276ad2b4dffc5d18ec04cb80e448f9bf1e59d99803e840b450c8fda7b99e3f
 #@git:461a9ec198c1e2b9c39a34e21786747dbb8671b4:ccx-utils
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/certdata2pem b/variants/ccx-x86_64/certdata2pem
@@ -1,43 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
 #@sha256:064f7d41106cd9efa08b9e68cf049f44e3be55666bd2ab96d02c508293b8dce7:certdata2pem.c
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/confz b/variants/ccx-x86_64/confz
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+zsh.fcfc54f4ac311f948cfc2406559ef99ab8dac08eb0beed43b9b337082535bb97
-#+pthbs-banginstall.f1d73070c78f925ef111e3802e934ca20663bfd59af29c362fcf3e8e7b437312
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+zsh.2cb2e0585ce2058c4cf69794bd14e9d84c9f93437a1fc66cdaf3c2e396e37cd8
+#+pthbs-banginstall.8746c2e75c56ad9ad12a0a5951c510bb34b76e5be8406c7492602cb9c108ab82
 #@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.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-dosfstools.9b3057bd3af0689982eeeeafd40976da6de22eb582f2a3113d7d40cbaed47387
-#+busybox-e2fsprogs.ed89377fdda3b4950ccbb22377346f587ae861c320318d2818a6d9bfe8c2fd7c
-#+busybox-iproute2.42cdfdcc9c3785b3005d73132f3186d37a75a6c0238b1abba2702a30186846a1
-#+busybox-iputils.aea3097879e47c1808fe7cec01f6aaaa0cf18f47e5218755697682af064f1a32
-#+busybox-net-misc.ccb6419806ff5bb640d862cc6d91b2c5c11c586e2b60e5b6cf9cc5e2ae3c7fbb
-#+busybox-net-tools.fdeca83091d03c43b9951558f0df781b9be09e166be6c601ffcc80547855dca3
-#+busybox-traceroute.9cc6e884e825a2e1447cf5488411a1a5f7d7a9435dc5d9a61a2640ad3824ed0f
-#+busybox-wget.8b4a52293c1e9437934f47ce634ef8698c1137d922111cab5ac56759d6180947
-#+busybox-chpst.69b7af983aa39943d7050c9c4e32ccf75687ba2002bbdb1b8d433ff1ab25e9e8
-#+busybox-console.7a0d8889d218addd1685e9b8a2437cadde35698c8e186bae9478424d62c14774
-#+busybox-getty.2c2f385504144928a2624a9e53c0851a5404627280fcc2b335af279ad8a155d1
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-dosfstools.0511d5c82da793363dcb0e46e42a266c2b7d1c337f361446a1c7c960951efd38
+#+busybox-e2fsprogs.42cd012d3b2b80507a138d59f23a83b3f1fa05861cffd479626d123d7e263a4d
+#+busybox-iproute2.350839a016a508830f23c6d06d1cceeb913d6ac735216ce48a4e7e5508c36b57
+#+busybox-iputils.8124e5a0cd596e3f4cac4e75f8e319c457b96ad423550ea4b30d2199cd7ef1b9
+#+busybox-net-misc.06a71e639b39b572bf62cdaf7f924df4a0a98cf54756121f5877bb3d7d18b674
+#+busybox-net-tools.693d34ee5d3d30af40fd6d778618d63cca52e898d3e37bcc7214896bd68c6933
+#+busybox-traceroute.b16257a0cb0d0e8eaf67f1058f8828ad2264217e3883e82d509e84a102a2bc26
+#+busybox-wget.63aea650c8ec578590609ec90516a948a9596866c99237c13d3adf11e45d1cc1
+#+busybox-chpst.bd2cbd7fb8931418573d407e76bd0788a668ec9537d365fc0f7cbdb6e98c8476
+#+busybox-console.a19d5faff0a876c303cd60021283a14a0244a7212ea09cd91e92fb6dd27353ab
+#+busybox-getty.f5432b352d1835f45f2e15df4c09116a7551163891d148fd07f79af034bbddc7
 
-#+busybox-linux-extra.9a986cfce35706fc44a78b86ffba66eb2e7970512ecb90a4fe5adc935db2cbf7
-#+busybox-mtd-utils.37b9aa531f31ef29cacd4a2f44760986bc407aeb2fcc563b169300746605cf7a
-#+busybox-shadow.5505514d1291925f05d21e765451c06c91362afa571e9ff4d6aff1ec94bca161
-#+busybox-su.d583ac9e406459e8ca84c788770a6d9aa3f8dc94b353b3d05016ae437341b780
-#+busybox-util-linux-priv.385943a04498e4d2f929f7f354cf2233694b0794e63e9cd7ce57632f5143acd5
-#+busybox-logging.160c10a45c118945fbaa98289b93fa07ef32a24ff3997693f8d2027247b7f352
-#+busybox-cron.3831dc78a22400d6c5c9375955bd4e347ec269d52771209c2fe5e2ad17a6f67a
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+busybox-login.2c8c36c76790e8f6f4f172e70eb8b481fd5fdee46fe82f272cef0cce1d3c5c54
-#+execline.9a580cb41e897f8c4616ced5d0341954fadb2dd4a5b514934616c5c503fc082d
-#+s6.c57430ab256e3869863e62c5bb25648fedcd64f7f7c7457dbac241125ada2f7a
-#+ccx-utils.6a649c5a8cafa805be7b50623c4d96b074f33c280aba7e94cdd53a1f8690bfa1
-#+applyuidgid-caps.1fe7ed735185f4d206f3a1a4311118e0767bea2dd731b59ebf50da4be2daf690
-#+easyseccomp.971f5f4573f8800ed43356938995d2501a41a4c2861062f6ce941df618bdbde6
-#+mlog.70368f1db8153bccb367e479ebafcd2dc664ba61858e119ababf71f2d7433790
-#+abduco.e7103ecf3bced1d6dd77efbf58dd6d8ec1fcd9eb824bb4ea6a58c26633dee2ae
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
+#+busybox-linux-extra.38485b5c5a4f61f328032d0e01a2dbe62e863d1c1da7f8f0a6d1769929ced1f2
+#+busybox-mtd-utils.ef4e23042fc20a1c2f33b521310f9a520afa3baf8584f55b2340a876fc822a6b
+#+busybox-shadow.c1755eb505cfb497436463fcbf63ce0847c770d6d6694a0ff569b1ba1a59ca62
+#+busybox-su.6b08d544f03c997e05bd58336ec3214f94bf3f7d144d2f430fb30a5238c69343
+#+busybox-util-linux-priv.dfe1bb37dcd5a3e7b29f6e0d9733ece5eba031249453f29d8e6a56af4055da52
+#+busybox-logging.8964b9d3e85a11ed014de8db28128272a44b8790bb32ef517161be263a2bf3f6
+#+busybox-cron.662bf9740d863cb722d6c23b293a45815c071708e0e43aa0959def005916e66d
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+busybox-login.881d1e257089dc758e45fceff95443054aaf956d053f0fd86afe3228ee4abcf4
+#+execline.8015583ca9fa606067d748c308753b8d9caaa1f4d78bb8a48d17346362b6c7c7
+#+s6.bf276ad2b4dffc5d18ec04cb80e448f9bf1e59d99803e840b450c8fda7b99e3f
+#+ccx-utils.7593c2009473425dd152e2650d4b47b72005dff3aafcb1cc9bedb62adae8af99
+#+applyuidgid-caps.5db44969e03e24c29cfe955ca8650ad5d695820e42d91c2038850cf1bda8afe6
+#+easyseccomp.c090e30a7aa1daa9135cc0f236ece29f57bb266f199f3474aa29c4c3373cec6f
+#+mlog.5ee3104939dd62b85be02700a126e2001543e59c0c668c97c56bfc381190f4d0
+#+abduco.a7566584012b79a9a340172f71d2f2ad521b4625d94bd030ea1ea0794d086a14
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
 #@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.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+zsh.fcfc54f4ac311f948cfc2406559ef99ab8dac08eb0beed43b9b337082535bb97
-#+pthbs-banginstall.f1d73070c78f925ef111e3802e934ca20663bfd59af29c362fcf3e8e7b437312
-#+execline.9a580cb41e897f8c4616ced5d0341954fadb2dd4a5b514934616c5c503fc082d
-#+alpine-keys.9eaaca66e8ce40e80163bc44c50e906938a8cd6f640554a57a6c2c5e95e08d70
-#+apk-tools.f9406c59592f516d703fe7270a0c7e9d7aea762c4af215d21df42e721a954f51
-#+xbps.aa21c50c81629365c03a2529a67af5b03d3dad9eb4a511575009c5f0447a6722
-#+container-bin-image.3a0cd4100fdb49b145fa15faf10169bf94c43f4817e678ea6efdea833740ab1e
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+zsh.2cb2e0585ce2058c4cf69794bd14e9d84c9f93437a1fc66cdaf3c2e396e37cd8
+#+pthbs-banginstall.8746c2e75c56ad9ad12a0a5951c510bb34b76e5be8406c7492602cb9c108ab82
+#+execline.8015583ca9fa606067d748c308753b8d9caaa1f4d78bb8a48d17346362b6c7c7
+#+alpine-keys.193f202d5fb3ebae0cbe2ce1121174ae0874c3aa6e11ba73058abfb8ef187ab7
+#+apk-tools.913fb14f40043443c483e9c646882a47b7140f60b6cc9733f5ff6c88851c720d
+#+xbps.ae5801a73321f497b8a78aed24a7393e6635e2296368775e3cd1159bf73a981e
+#+container-bin-image.1bffa0615482b31a6b2e3ee2d2e086cc6e48ccb18c4e7e8fea8b66c247ded439
 #@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.f9406c59592f516d703fe7270a0c7e9d7aea762c4af215d21df42e721a954f51/command/apk.static' "${dest}/deps/command/"
-ln -sf '/home/ccx/versions/xbps.aa21c50c81629365c03a2529a67af5b03d3dad9eb4a511575009c5f0447a6722/command/xbps-install.static' "${dest}/deps/command/"
+ln -sf '/home/ccx/versions/apk-tools.913fb14f40043443c483e9c646882a47b7140f60b6cc9733f5ff6c88851c720d/command/apk.static' "${dest}/deps/command/"
+ln -sf '/home/ccx/versions/xbps.ae5801a73321f497b8a78aed24a7393e6635e2296368775e3cd1159bf73a981e/command/xbps-install.static' "${dest}/deps/command/"
 
-for f in '/home/ccx/versions/alpine-keys.9eaaca66e8ce40e80163bc44c50e906938a8cd6f640554a57a6c2c5e95e08d70'/keys/alpine/*/*; do
+for f in '/home/ccx/versions/alpine-keys.193f202d5fb3ebae0cbe2ce1121174ae0874c3aa6e11ba73058abfb8ef187ab7'/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.9eaaca66e8ce40e80163bc44c50e906938a8cd6
 done
  
 mkdir -p "${dest}/deps/keys/void"
-for f in '/home/ccx/versions/xbps.aa21c50c81629365c03a2529a67af5b03d3dad9eb4a511575009c5f0447a6722'/keys/void/*; do
+for f in '/home/ccx/versions/xbps.ae5801a73321f497b8a78aed24a7393e6635e2296368775e3cd1159bf73a981e'/keys/void/*; do
 	ln -sf "$f" "${dest}/deps/keys/void/"
 done
 
-test -d '/home/ccx/versions/container-bin-image.3a0cd4100fdb49b145fa15faf10169bf94c43f4817e678ea6efdea833740ab1e/container-bin-image'
-test -f '/home/ccx/versions/container-bin-image.3a0cd4100fdb49b145fa15faf10169bf94c43f4817e678ea6efdea833740ab1e/container-bin-image/if'
-ln -sf '/home/ccx/versions/container-bin-image.3a0cd4100fdb49b145fa15faf10169bf94c43f4817e678ea6efdea833740ab1e/container-bin-image' "${dest}/deps/"
+test -d '/home/ccx/versions/container-bin-image.1bffa0615482b31a6b2e3ee2d2e086cc6e48ccb18c4e7e8fea8b66c247ded439/container-bin-image'
+test -f '/home/ccx/versions/container-bin-image.1bffa0615482b31a6b2e3ee2d2e086cc6e48ccb18c4e7e8fea8b66c247ded439/container-bin-image/if'
+ln -sf '/home/ccx/versions/container-bin-image.1bffa0615482b31a6b2e3ee2d2e086cc6e48ccb18c4e7e8fea8b66c247ded439/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.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-dosfstools.9b3057bd3af0689982eeeeafd40976da6de22eb582f2a3113d7d40cbaed47387
-#+busybox-e2fsprogs.ed89377fdda3b4950ccbb22377346f587ae861c320318d2818a6d9bfe8c2fd7c
-#+busybox-iproute2.42cdfdcc9c3785b3005d73132f3186d37a75a6c0238b1abba2702a30186846a1
-#+busybox-iputils.aea3097879e47c1808fe7cec01f6aaaa0cf18f47e5218755697682af064f1a32
-#+busybox-net-misc.ccb6419806ff5bb640d862cc6d91b2c5c11c586e2b60e5b6cf9cc5e2ae3c7fbb
-#+busybox-net-tools.fdeca83091d03c43b9951558f0df781b9be09e166be6c601ffcc80547855dca3
-#+busybox-traceroute.9cc6e884e825a2e1447cf5488411a1a5f7d7a9435dc5d9a61a2640ad3824ed0f
-#+busybox-wget.8b4a52293c1e9437934f47ce634ef8698c1137d922111cab5ac56759d6180947
-#+busybox-chpst.69b7af983aa39943d7050c9c4e32ccf75687ba2002bbdb1b8d433ff1ab25e9e8
-#+busybox-console.7a0d8889d218addd1685e9b8a2437cadde35698c8e186bae9478424d62c14774
-#+busybox-getty.2c2f385504144928a2624a9e53c0851a5404627280fcc2b335af279ad8a155d1
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-dosfstools.0511d5c82da793363dcb0e46e42a266c2b7d1c337f361446a1c7c960951efd38
+#+busybox-e2fsprogs.42cd012d3b2b80507a138d59f23a83b3f1fa05861cffd479626d123d7e263a4d
+#+busybox-iproute2.350839a016a508830f23c6d06d1cceeb913d6ac735216ce48a4e7e5508c36b57
+#+busybox-iputils.8124e5a0cd596e3f4cac4e75f8e319c457b96ad423550ea4b30d2199cd7ef1b9
+#+busybox-net-misc.06a71e639b39b572bf62cdaf7f924df4a0a98cf54756121f5877bb3d7d18b674
+#+busybox-net-tools.693d34ee5d3d30af40fd6d778618d63cca52e898d3e37bcc7214896bd68c6933
+#+busybox-traceroute.b16257a0cb0d0e8eaf67f1058f8828ad2264217e3883e82d509e84a102a2bc26
+#+busybox-wget.63aea650c8ec578590609ec90516a948a9596866c99237c13d3adf11e45d1cc1
+#+busybox-chpst.bd2cbd7fb8931418573d407e76bd0788a668ec9537d365fc0f7cbdb6e98c8476
+#+busybox-console.a19d5faff0a876c303cd60021283a14a0244a7212ea09cd91e92fb6dd27353ab
+#+busybox-getty.f5432b352d1835f45f2e15df4c09116a7551163891d148fd07f79af034bbddc7
 
-#+busybox-linux-extra.9a986cfce35706fc44a78b86ffba66eb2e7970512ecb90a4fe5adc935db2cbf7
-#+busybox-mtd-utils.37b9aa531f31ef29cacd4a2f44760986bc407aeb2fcc563b169300746605cf7a
-#+busybox-shadow.5505514d1291925f05d21e765451c06c91362afa571e9ff4d6aff1ec94bca161
-#+busybox-su.d583ac9e406459e8ca84c788770a6d9aa3f8dc94b353b3d05016ae437341b780
-#+busybox-util-linux-priv.385943a04498e4d2f929f7f354cf2233694b0794e63e9cd7ce57632f5143acd5
-#+busybox-logging.160c10a45c118945fbaa98289b93fa07ef32a24ff3997693f8d2027247b7f352
-#+busybox-cron.3831dc78a22400d6c5c9375955bd4e347ec269d52771209c2fe5e2ad17a6f67a
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+execline.9a580cb41e897f8c4616ced5d0341954fadb2dd4a5b514934616c5c503fc082d
-#+s6.c57430ab256e3869863e62c5bb25648fedcd64f7f7c7457dbac241125ada2f7a
-#+s6-portable-utils.c8c1f0dff642bcbbc1bb07bc0bed9f642344bcc85c3ac3eb67c081c1342dc1b1
-#+s6-linux-utils.d9bd02a7e3f804e52f5c9633ef27e7907c90e2eb7f9a72616d0128864fc84b05
-#+zsh.fcfc54f4ac311f948cfc2406559ef99ab8dac08eb0beed43b9b337082535bb97
-#+confz.3298fbb58ac255be5f137645e88568ca62cbb26f7fbe53b57d52486728211352
-#+containers.208229e381817d6203fb5a9ec96bf658ba3d4c7e90f0dbe22feeaac876b30858
-#+xbps.aa21c50c81629365c03a2529a67af5b03d3dad9eb4a511575009c5f0447a6722
-#+zstd.8bd51affe68613292d100159bd8a6c511a3baa7667d329be44ab6a017107c7b8
-#+apk-tools.f9406c59592f516d703fe7270a0c7e9d7aea762c4af215d21df42e721a954f51
-#+alpine-keys.9eaaca66e8ce40e80163bc44c50e906938a8cd6f640554a57a6c2c5e95e08d70
-#+getent.995a31c4652f3450cc7d1a1cd118576157c7cd4e79485a69438df17c48e70810
-#+fileset.bcb24cd2f464a965593d550faa9b0332b348465485c9e04bc18ec5d8d4c408c9
-#+ccx-utils.6a649c5a8cafa805be7b50623c4d96b074f33c280aba7e94cdd53a1f8690bfa1
-#+easyseccomp.971f5f4573f8800ed43356938995d2501a41a4c2861062f6ce941df618bdbde6
-#+findutils.a29215d76b3963477109d40bddac471025f3a033c6d5b7c7941b44cb52e0ef91
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36-
\ No newline at end of file
+#+busybox-linux-extra.38485b5c5a4f61f328032d0e01a2dbe62e863d1c1da7f8f0a6d1769929ced1f2
+#+busybox-mtd-utils.ef4e23042fc20a1c2f33b521310f9a520afa3baf8584f55b2340a876fc822a6b
+#+busybox-shadow.c1755eb505cfb497436463fcbf63ce0847c770d6d6694a0ff569b1ba1a59ca62
+#+busybox-su.6b08d544f03c997e05bd58336ec3214f94bf3f7d144d2f430fb30a5238c69343
+#+busybox-util-linux-priv.dfe1bb37dcd5a3e7b29f6e0d9733ece5eba031249453f29d8e6a56af4055da52
+#+busybox-logging.8964b9d3e85a11ed014de8db28128272a44b8790bb32ef517161be263a2bf3f6
+#+busybox-cron.662bf9740d863cb722d6c23b293a45815c071708e0e43aa0959def005916e66d
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+execline.8015583ca9fa606067d748c308753b8d9caaa1f4d78bb8a48d17346362b6c7c7
+#+s6.bf276ad2b4dffc5d18ec04cb80e448f9bf1e59d99803e840b450c8fda7b99e3f
+#+s6-portable-utils.6a2e677060877bab203317a15f71dde089bf2a0af12bb32fd59486ff0dd6b7ff
+#+s6-linux-utils.794cb960490318677884fd5bc560d35a15d413c51bfff2617f24adfe244bbb4d
+#+zsh.2cb2e0585ce2058c4cf69794bd14e9d84c9f93437a1fc66cdaf3c2e396e37cd8
+#+confz.8a2e2f9a346883877ffaf0ae1b971be83f7156ccd519f8e3d9d3784504bcbd30
+#+containers.f9ff6f6dc3340ddba74ad26235fd751cd45d2a60e6e49eca1b0ec43fa70b8081
+#+xbps.ae5801a73321f497b8a78aed24a7393e6635e2296368775e3cd1159bf73a981e
+#+zstd.bf9212fdc735903c1ef7409a8f4e0639faf27b9aff11feca6e35f4f84b0710c9
+#+apk-tools.913fb14f40043443c483e9c646882a47b7140f60b6cc9733f5ff6c88851c720d
+#+alpine-keys.193f202d5fb3ebae0cbe2ce1121174ae0874c3aa6e11ba73058abfb8ef187ab7
+#+getent.afee1956bd0a747252b23100c2482116df257c5234cf4590cd5a6a36d2d65fe3
+#+fileset.5f1592137625bcdbd74e791d49ae603899537c5c27f1f71b3fe2aed7c6e47295
+#+ccx-utils.7593c2009473425dd152e2650d4b47b72005dff3aafcb1cc9bedb62adae8af99
+#+easyseccomp.c090e30a7aa1daa9135cc0f236ece29f57bb266f199f3474aa29c4c3373cec6f
+#+findutils.4ca372c5806e835fbb83d9e18972ebed2934bda510401bd2f457222de1892290
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/curl b/variants/ccx-x86_64/curl
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+m4.13e8f64dca14c47846841a8a697180a2fe96d777a0f56f5e52079761eb6b79aa
-#+libressl.4a59407f93a86c2bab70daaed9958b39daf97f238f1e6ae269ddda85bce9fbb5
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+m4.3bd69e2dd42ef971ed64b42d4d396a042ea9e223d89a4ab70c526474b3383357
+#+libressl.5220a49e3b686e5776e80491a62ead7cdf5a4dc4e22a1e1383724aa811826ad3
 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:.
 
 
@@ -61,10 +61,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -1,97 +1,97 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-dosfstools.9b3057bd3af0689982eeeeafd40976da6de22eb582f2a3113d7d40cbaed47387
-#+busybox-e2fsprogs.ed89377fdda3b4950ccbb22377346f587ae861c320318d2818a6d9bfe8c2fd7c
-#+busybox-iproute2.42cdfdcc9c3785b3005d73132f3186d37a75a6c0238b1abba2702a30186846a1
-#+busybox-iputils.aea3097879e47c1808fe7cec01f6aaaa0cf18f47e5218755697682af064f1a32
-#+busybox-net-misc.ccb6419806ff5bb640d862cc6d91b2c5c11c586e2b60e5b6cf9cc5e2ae3c7fbb
-#+busybox-net-tools.fdeca83091d03c43b9951558f0df781b9be09e166be6c601ffcc80547855dca3
-#+busybox-traceroute.9cc6e884e825a2e1447cf5488411a1a5f7d7a9435dc5d9a61a2640ad3824ed0f
-#+busybox-wget.8b4a52293c1e9437934f47ce634ef8698c1137d922111cab5ac56759d6180947
-#+busybox-chpst.69b7af983aa39943d7050c9c4e32ccf75687ba2002bbdb1b8d433ff1ab25e9e8
-#+busybox-console.7a0d8889d218addd1685e9b8a2437cadde35698c8e186bae9478424d62c14774
-#+busybox-getty.2c2f385504144928a2624a9e53c0851a5404627280fcc2b335af279ad8a155d1
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-dosfstools.0511d5c82da793363dcb0e46e42a266c2b7d1c337f361446a1c7c960951efd38
+#+busybox-e2fsprogs.42cd012d3b2b80507a138d59f23a83b3f1fa05861cffd479626d123d7e263a4d
+#+busybox-iproute2.350839a016a508830f23c6d06d1cceeb913d6ac735216ce48a4e7e5508c36b57
+#+busybox-iputils.8124e5a0cd596e3f4cac4e75f8e319c457b96ad423550ea4b30d2199cd7ef1b9
+#+busybox-net-misc.06a71e639b39b572bf62cdaf7f924df4a0a98cf54756121f5877bb3d7d18b674
+#+busybox-net-tools.693d34ee5d3d30af40fd6d778618d63cca52e898d3e37bcc7214896bd68c6933
+#+busybox-traceroute.b16257a0cb0d0e8eaf67f1058f8828ad2264217e3883e82d509e84a102a2bc26
+#+busybox-wget.63aea650c8ec578590609ec90516a948a9596866c99237c13d3adf11e45d1cc1
+#+busybox-chpst.bd2cbd7fb8931418573d407e76bd0788a668ec9537d365fc0f7cbdb6e98c8476
+#+busybox-console.a19d5faff0a876c303cd60021283a14a0244a7212ea09cd91e92fb6dd27353ab
+#+busybox-getty.f5432b352d1835f45f2e15df4c09116a7551163891d148fd07f79af034bbddc7
 
-#+busybox-linux-extra.9a986cfce35706fc44a78b86ffba66eb2e7970512ecb90a4fe5adc935db2cbf7
-#+busybox-mtd-utils.37b9aa531f31ef29cacd4a2f44760986bc407aeb2fcc563b169300746605cf7a
-#+busybox-shadow.5505514d1291925f05d21e765451c06c91362afa571e9ff4d6aff1ec94bca161
-#+busybox-su.d583ac9e406459e8ca84c788770a6d9aa3f8dc94b353b3d05016ae437341b780
-#+busybox-util-linux-priv.385943a04498e4d2f929f7f354cf2233694b0794e63e9cd7ce57632f5143acd5
-#+busybox-logging.160c10a45c118945fbaa98289b93fa07ef32a24ff3997693f8d2027247b7f352
-#+busybox-cron.3831dc78a22400d6c5c9375955bd4e347ec269d52771209c2fe5e2ad17a6f67a
-#+attr.cc743930379984ea8211162cc6dc1df60701028be18d32084f3ea8120578164f
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+diffutils.b4a300af866981068118991b7efd5d100083350978a91dd7a30d0352a63c3967
-#+patch.930184dce3e1dbdfbf8ac1ccbcb3ab728cc22196e7459af586877968909a0543
-#+flex.b91fd0bbc76abf76c0368bf4f5b4b19c3a643eb531725abdbe295e4f78d5d471
-#+bison.38041d5aa8dabf9daf6903deb39cef07a6cbcce24000a78f274198ce32d303fc
-#+rsync.31f320cbeaff5420d78cb5dd43af6670a003ad3527bff54127d8e4b9a361860c
-#+execline.9a580cb41e897f8c4616ced5d0341954fadb2dd4a5b514934616c5c503fc082d
-#+s6.c57430ab256e3869863e62c5bb25648fedcd64f7f7c7457dbac241125ada2f7a
-#+s6-rc.f8fbc4b3393b1dd7815e91805063c8df18a4d572f2a067a7b7fb2f11190526cc
-#+s6-portable-utils.c8c1f0dff642bcbbc1bb07bc0bed9f642344bcc85c3ac3eb67c081c1342dc1b1
-#+s6-linux-utils.d9bd02a7e3f804e52f5c9633ef27e7907c90e2eb7f9a72616d0128864fc84b05
-#+s6-linux-init.ad954e5fd8d69ae5b5d88312cc6d91b06bddee80444aa0dd3cb59358ebee6c61
-#+mdevd.b79b7bebdd6ad63d1c8d55835f21727f1074ce56b0ef6cb1923eae49f3fb3554
-#+s6-dns.daa5a6b2fbcfb606be9faed18ddb9a36ff9a62c5e74e579ea8094a30f93b953d
-#+libressl.4a59407f93a86c2bab70daaed9958b39daf97f238f1e6ae269ddda85bce9fbb5
-#+s6-networking.4619cbf31883f0eb83f2284060752de4be472181e5eced9f7c3e053de817f23f
-#+zsh.fcfc54f4ac311f948cfc2406559ef99ab8dac08eb0beed43b9b337082535bb97
-#+pthbs-banginstall.f1d73070c78f925ef111e3802e934ca20663bfd59af29c362fcf3e8e7b437312
-#+aat.df4591e3e70168d854451ab3cfbfd995b2a6d36869c403c9377604b9660c907b
-#+confz.3298fbb58ac255be5f137645e88568ca62cbb26f7fbe53b57d52486728211352
-#+containers.208229e381817d6203fb5a9ec96bf658ba3d4c7e90f0dbe22feeaac876b30858
-#+fileset.bcb24cd2f464a965593d550faa9b0332b348465485c9e04bc18ec5d8d4c408c9
-#+logincaps.c5c16c0ac4a0503c0143f0c383434e635e16586dcbe2bf78bc25c66d8e281421
-#+snaprep.0757ca3b09fceb5866ce1529fc789bd7338a864ad0eb6f00604ca5cf3b7a8f50
-#+curl.e37c6ee555052a6b9fcac6dceae7014ec5935e12679bc5205f109786b33c2a8e
-#+git.86ba30522dba0c89b33e3c26bd9ec0bc642016a59295778f9e915d05ccd24ba7
-#+xbps.aa21c50c81629365c03a2529a67af5b03d3dad9eb4a511575009c5f0447a6722
-#+apk-tools.f9406c59592f516d703fe7270a0c7e9d7aea762c4af215d21df42e721a954f51
-#+getent.995a31c4652f3450cc7d1a1cd118576157c7cd4e79485a69438df17c48e70810
-#+getconf.421b3925fecf41d2e530f184ad54ad4eb74edd93f0aaab32b4712fff0c0c914d
-#+iconv.181dd6d5d32da8501a6bc3064e51f66948015a53b6f668bb4ccd9aeccda0e0f0
-#+libcap.8b9b94ff01e70717816b90ca878449aab38863bfcda5eb041e16b143c9ef9a77
-#+applyuidgid-caps.1fe7ed735185f4d206f3a1a4311118e0767bea2dd731b59ebf50da4be2daf690
-#+ccx-utils.6a649c5a8cafa805be7b50623c4d96b074f33c280aba7e94cdd53a1f8690bfa1
-#+user-env.a5bbf392f749cdb3f7991400b37721a2fba43a0599450b3e47f4956ed404c501
-#+strace.77d07a44faa33b457e3dfa3837d1ead59a88afb323737c6e0960c954c84af8a3
-#+mlog.70368f1db8153bccb367e479ebafcd2dc664ba61858e119ababf71f2d7433790
-#+findutils.a29215d76b3963477109d40bddac471025f3a033c6d5b7c7941b44cb52e0ef91
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+nvi.b0a4e25d19d47bb783232f159e124829f25247c89214ab6c448c24758e641dda
-#+squashfs-tools.c35a0cc584090c3ae9002843fc43240f0427510227fdf32a16678c304878ef41
-#+mandoc.64ae1562733424384c284ea7c2c40017addb442421c82768aac558dabca72e08
-#+tinyssh.bd0d6c58bb164b98bcb01f8766fef6c327659a627985c910f49b8f2e7f091562
-#+system-config.66975cf360621a11c95e95daf32201fcd7ff9b23d5cf158a8395443b8418b6f1
-#+system-config-rc.f6ae1e98cc8b0b2d0832376a251b5f0d3f2ee8eaca2de93980c1c3144ee9ac07
-#+system-config-scripts.a3110e35cac245ded94e710295f9cfc51150beae495bbd0ef270544c64726146
-#+system-config-init.a2a8f6d885a0be09815bf13ed79696e98bd8a5cba5dfb822c1093a1a48b362b5
-#+system-config-zsh.7a01ea22dedfee303ffd1575005fd910c619619e017f12b22171714264007d65
-#+busybox.c6b6443b5623b38e0a8ecc5840aabdf6abfb2163181801f84f344072c0386312-
\ No newline at end of file
+#+busybox-linux-extra.38485b5c5a4f61f328032d0e01a2dbe62e863d1c1da7f8f0a6d1769929ced1f2
+#+busybox-mtd-utils.ef4e23042fc20a1c2f33b521310f9a520afa3baf8584f55b2340a876fc822a6b
+#+busybox-shadow.c1755eb505cfb497436463fcbf63ce0847c770d6d6694a0ff569b1ba1a59ca62
+#+busybox-su.6b08d544f03c997e05bd58336ec3214f94bf3f7d144d2f430fb30a5238c69343
+#+busybox-util-linux-priv.dfe1bb37dcd5a3e7b29f6e0d9733ece5eba031249453f29d8e6a56af4055da52
+#+busybox-logging.8964b9d3e85a11ed014de8db28128272a44b8790bb32ef517161be263a2bf3f6
+#+busybox-cron.662bf9740d863cb722d6c23b293a45815c071708e0e43aa0959def005916e66d
+#+attr.dac6f74379e4c8704c6854d770487956a0c2b8416e5fe87b0a7c34a226d8d0d7
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+diffutils.2609f4ea58052c7e64af9aa6798a2b3a8a201ab3289c7f48676c85e36c9fbfe0
+#+patch.f9af9058385753a59f5f726db36eb7a83c7693dd3f87907691614dd77f622534
+#+flex.3a3870e15fbc145f3cfb7d5e3040078bfaa096010de16a41fa34be6f6bfde1be
+#+bison.2a6ac34959b39dd064f3e376e1228a841202df5a91f96922ea613a12e4e34067
+#+rsync.7aa279b369e7b8c6f1cdf6717c0935314361130c5df23b732a25882e439880e0
+#+execline.8015583ca9fa606067d748c308753b8d9caaa1f4d78bb8a48d17346362b6c7c7
+#+s6.bf276ad2b4dffc5d18ec04cb80e448f9bf1e59d99803e840b450c8fda7b99e3f
+#+s6-rc.f43022841ced67ea526b0c40649b5e9a9c00c7e769a8f5158a98824ea9ae15cd
+#+s6-portable-utils.6a2e677060877bab203317a15f71dde089bf2a0af12bb32fd59486ff0dd6b7ff
+#+s6-linux-utils.794cb960490318677884fd5bc560d35a15d413c51bfff2617f24adfe244bbb4d
+#+s6-linux-init.81dd822df62f7156893815f0565bcd218763e19ab598ebe83ccdfd63acf94631
+#+mdevd.218bf6fd3b48c0d6fb430ace17cabaa19add5d98479ec2f80a17a26ab5a6cd7e
+#+s6-dns.6d26c22bf69b5330a4d59cacc710c342968f2b60c9627c898383de945999f992
+#+libressl.5220a49e3b686e5776e80491a62ead7cdf5a4dc4e22a1e1383724aa811826ad3
+#+s6-networking.e5b0465819f7a94fc9f6cbc435fbd1f06e4c72fda8389e426c370bfcdae153df
+#+zsh.2cb2e0585ce2058c4cf69794bd14e9d84c9f93437a1fc66cdaf3c2e396e37cd8
+#+pthbs-banginstall.8746c2e75c56ad9ad12a0a5951c510bb34b76e5be8406c7492602cb9c108ab82
+#+aat.78fc4dcc45dc49b8392491ed8579d15437eb800fbca1ebb5a2084c7b604c7cca
+#+confz.8a2e2f9a346883877ffaf0ae1b971be83f7156ccd519f8e3d9d3784504bcbd30
+#+containers.f9ff6f6dc3340ddba74ad26235fd751cd45d2a60e6e49eca1b0ec43fa70b8081
+#+fileset.5f1592137625bcdbd74e791d49ae603899537c5c27f1f71b3fe2aed7c6e47295
+#+logincaps.8b2fa97a7dd2f849df85f44aa0d88abd22ec65960177eba575fd8fa4f05ea056
+#+snaprep.84cf5ac359f3aa70b7a563da9615fe35954619d455913002e9ce7580893c7da9
+#+curl.8e8689858e363de3ab46e8cc697da28880362625bbe498c39e62256dc9bc283d
+#+git.4609b5df59652f9080cc83cfb6b56f56e7817c49fe7e8f24f57c5ac4bbcb9ef3
+#+xbps.ae5801a73321f497b8a78aed24a7393e6635e2296368775e3cd1159bf73a981e
+#+apk-tools.913fb14f40043443c483e9c646882a47b7140f60b6cc9733f5ff6c88851c720d
+#+getent.afee1956bd0a747252b23100c2482116df257c5234cf4590cd5a6a36d2d65fe3
+#+getconf.9185b07ead0b64f38c1693fe656b3e59f2408b786db5d4ad6bdc541ba1b403a6
+#+iconv.c50b208b1a9b65e30e2a66a172e79973a43e153d851e5492bb191eba5539d514
+#+libcap.444bdff77be4de9afde0a7185ff76fd5ff1ed6b1ad640657a4774b8d246a69c9
+#+applyuidgid-caps.5db44969e03e24c29cfe955ca8650ad5d695820e42d91c2038850cf1bda8afe6
+#+ccx-utils.7593c2009473425dd152e2650d4b47b72005dff3aafcb1cc9bedb62adae8af99
+#+user-env.9a6b627b848a333c299dfb3ca86370179cef083124e3c8f0b369d1f279bb086b
+#+strace.8de292185446141c8b47194c4702dae9d74a39ca2be1843992d256bd419b2429
+#+mlog.5ee3104939dd62b85be02700a126e2001543e59c0c668c97c56bfc381190f4d0
+#+findutils.4ca372c5806e835fbb83d9e18972ebed2934bda510401bd2f457222de1892290
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+nvi.7090d6104ce2ab0bb5941c49727796ffb766fd3781454f588ba5b8c5900804d2
+#+squashfs-tools.31c3f975cdbf2297537b1c18a85dd03f75aa769f9e9c9d5c9d1f7dca9a7522d4
+#+mandoc.19a422cd88c7c5ed6e9bcf330aa8e634590df2ad8a1aac1521dac0552f2612df
+#+tinyssh.741229eaaa26db3e95d54a0b69e06579bb896e786a32e93f0789adfd8695675e
+#+system-config.9dd621f06e1de18617c10f1847a26fef6df2ef306474cb305b55c7ed432ed6b8
+#+system-config-rc.e809b942b02a39158a1a97c03035d96bf46e1e8490a2c78903a488f22624032d
+#+system-config-scripts.d12c5dcb3d8c52356e47177a5cce88f61d47406eb657e30a18b8107a914a2f4a
+#+system-config-init.cc6cd415ae419ec1a37b2ff98d9fff88e7115f29848b5f6d6737b06b86e41add
+#+system-config-zsh.fa25a597c0bfd985cbff7cab0f6f47a5f1d1c5e7eec3643c0fff2f31ef6446a7
+#+busybox.7d6fa3654618b0a2d27c9b173c6c4b73edbe793a3c2ef3a9536924751758c8de+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/diffutils b/variants/ccx-x86_64/diffutils
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+m4.13e8f64dca14c47846841a8a697180a2fe96d777a0f56f5e52079761eb6b79aa
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+m4.3bd69e2dd42ef971ed64b42d4d396a042ea9e223d89a4ab70c526474b3383357
 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:.
 
 
@@ -60,10 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/dune b/variants/ccx-x86_64/dune
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+ocaml.819d781b7986f8a3af9d9cb3060b5cf1321208b6740d9d03edd97f0596c89621
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+ocaml.e01c6e7cb1ca624bacac03edc55c55b9a6304219ae3ada6e8934d363f10ac8a1
 #@untar:-z:sha256:579c738f8ca191ba0a9b22dbe78f1377542442c9827cf4939f8964f09f9edb28:.
 
 
@@ -49,7 +49,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/home/ccx/versions/musl.d828e4f6cb803b5cd778bf063a4ea6455e0eec6251844c9d88f69a3fab854167/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/home/ccx/versions/musl.4b712e00a652ccacd250921a5a78218a958b086bb86791ccc8ec65cd67a66969/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
 			return 0
 			;;
 		(*)
diff --git a/variants/ccx-x86_64/easyseccomp b/variants/ccx-x86_64/easyseccomp
@@ -1,42 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+m4.13e8f64dca14c47846841a8a697180a2fe96d777a0f56f5e52079761eb6b79aa
-#+patch.930184dce3e1dbdfbf8ac1ccbcb3ab728cc22196e7459af586877968909a0543
-#+flex.b91fd0bbc76abf76c0368bf4f5b4b19c3a643eb531725abdbe295e4f78d5d471
-#+bison.38041d5aa8dabf9daf6903deb39cef07a6cbcce24000a78f274198ce32d303fc
-#+libseccomp.7faf094ef266ca03314e1fe813c6772e7a7df2437c16b860c3e07f3f27c218af
-#+error-standalone.33f600df49f5d8a9db7b5b479c24cddc6c1dfc62b09245ae39f49fada43ca454
-#+argp-standalone.bb78b87c0c6471fb432f85943a601d64f7bffe2c54ce946d68ecaa500eb6cd1e
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+m4.3bd69e2dd42ef971ed64b42d4d396a042ea9e223d89a4ab70c526474b3383357
+#+patch.f9af9058385753a59f5f726db36eb7a83c7693dd3f87907691614dd77f622534
+#+flex.3a3870e15fbc145f3cfb7d5e3040078bfaa096010de16a41fa34be6f6bfde1be
+#+bison.2a6ac34959b39dd064f3e376e1228a841202df5a91f96922ea613a12e4e34067
+#+libseccomp.32907592f992fd04423f04858629757341454eb782330894ff6598250d056481
+#+error-standalone.bb0c4fd29dcf034a4fb1802ea29bbe1cbb0904b9e74b7e8ed226f63a631b416b
+#+argp-standalone.19aa48af3bdfa497bc2eec3c9c8a0a37b5a84c6c2c718a5fc1250ef74f07aa40
 #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp
 #@sha256:eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10:easyseccomp_fix_includes.patch
 #@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
@@ -68,10 +68,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/error-standalone b/variants/ccx-x86_64/error-standalone
@@ -1,45 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
 #@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/execline b/variants/ccx-x86_64/execline
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+skalibs.7f2610571321bf6ff32187e4720b1f4d7bdeab2163da455e07e75549b216fbe8
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+skalibs.513c9f46b250859f980edc5e4ab5de6aac0497533a1644f8f70c2c1afc815eb6
 #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline
 
 
@@ -46,7 +46,7 @@ cd 'execline'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.7f2610571321bf6ff32187e4720b1f4d7bdeab2163da455e07e75549b216fbe8/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.513c9f46b250859f980edc5e4ab5de6aac0497533a1644f8f70c2c1afc815eb6/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/execline:bootstrap b/variants/ccx-x86_64/execline:bootstrap
@@ -1,10 +1,10 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
-#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
-#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
-#+skalibs.d1ff8cdcea9d046498fa6d934eac84fb74629f477532b3480ad1b38b794db050
+#+musl-cross-make.7fc68aacf3c3af5e943bf800f4927f49f0ccf4a9bc5f424ff037ac513a258553
+#+gnu-make.2c3345112e9f2486d0d450f9f3e3da34c00d6d91d901bb8857cc2e4e75a43078
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+nawk.b1d41648e3331f461db172fca1ad98cd8da92077bb3abb107a581f6dd2b5bbfa
+#+skalibs.a8a00a264036f872341516bbcba7047e02664ec28a6c610f432c571b446ea720
 #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline
 
 
@@ -28,7 +28,7 @@ export CFLAGS="-O2 -ggdb"
 	--dynlibdir="${prefix}/library.so" \
 	--libdir="${prefix}/library" \
 	--includedir="${prefix}/include" \
-	--with-sysdeps='/home/ccx/versions/skalibs.d1ff8cdcea9d046498fa6d934eac84fb74629f477532b3480ad1b38b794db050/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.a8a00a264036f872341516bbcba7047e02664ec28a6c610f432c571b446ea720/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.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+zsh.fcfc54f4ac311f948cfc2406559ef99ab8dac08eb0beed43b9b337082535bb97
-#+pthbs-banginstall.f1d73070c78f925ef111e3802e934ca20663bfd59af29c362fcf3e8e7b437312
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+zsh.2cb2e0585ce2058c4cf69794bd14e9d84c9f93437a1fc66cdaf3c2e396e37cd8
+#+pthbs-banginstall.8746c2e75c56ad9ad12a0a5951c510bb34b76e5be8406c7492602cb9c108ab82
 #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset
 
 
diff --git a/variants/ccx-x86_64/findutils b/variants/ccx-x86_64/findutils
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+m4.13e8f64dca14c47846841a8a697180a2fe96d777a0f56f5e52079761eb6b79aa
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+m4.3bd69e2dd42ef971ed64b42d4d396a042ea9e223d89a4ab70c526474b3383357
 #@untar:-J:sha256:1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5:.
 
 
@@ -60,10 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/flex b/variants/ccx-x86_64/flex
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+m4.13e8f64dca14c47846841a8a697180a2fe96d777a0f56f5e52079761eb6b79aa
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.b1d41648e3331f461db172fca1ad98cd8da92077bb3abb107a581f6dd2b5bbfa
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+m4.3bd69e2dd42ef971ed64b42d4d396a042ea9e223d89a4ab70c526474b3383357
 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
 
 
@@ -60,10 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/gcc b/variants/ccx-x86_64/gcc
@@ -1,13 +1,13 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nofail_digest
-#+musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
-#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
-#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
-#+musl.d828e4f6cb803b5cd778bf063a4ea6455e0eec6251844c9d88f69a3fab854167
-#+gmp.609022c8a461c7025772fffc1cf09f15317ea036990463845acbda54d7584a62
-#+mpc.d0e807c81701ac6eb90079784372dac8a73b5a939ecb0769155b1dadea29051e
-#+mpfr.de7da86a91124d5bbb0029521f3c04cce0308be77e0fde4bd81c4f17bfa48117
+#+musl-cross-make.7fc68aacf3c3af5e943bf800f4927f49f0ccf4a9bc5f424ff037ac513a258553
+#+gnu-make.2c3345112e9f2486d0d450f9f3e3da34c00d6d91d901bb8857cc2e4e75a43078
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+nawk.b1d41648e3331f461db172fca1ad98cd8da92077bb3abb107a581f6dd2b5bbfa
+#+musl.4b712e00a652ccacd250921a5a78218a958b086bb86791ccc8ec65cd67a66969
+#+gmp.391826175a329b4082a2eca878770927b073d4685d5148702babe2620670815e
+#+mpc.e2413141c799e44408c0e27f43ef0abad401ceda1733ebbed047ebdac5061d0e
+#+mpfr.7bc4d68ba93cde8c8b716a2a9327d52ef98fb5e1e9222cbcda8f673212332252
 #@sha256:62eb68290502d54b16457509aa0c3995a84116408e6b593d676b9f4c03b6b160:merged.patch
 #@untar:-J:sha256:e0dc77297625631ac8e50fa92fffefe899a4eb702592da5c32ef04e2293aca3a:.
 
@@ -15,10 +15,8 @@
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
@@ -47,10 +45,10 @@ patch -p1 <../merged.patch
 export TZ=UTC
 export SOURCE_DATE_EPOCH=1748000928
 
-mcm=/home/ccx/versions/musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
+mcm=/home/ccx/versions/musl-cross-make.7fc68aacf3c3af5e943bf800f4927f49f0ccf4a9bc5f424ff037ac513a258553
 mcm_bin=$mcm/bin/x86_64-linux-musl
-binutils_cmd=/home/ccx/versions/binutils.65dbf67be4f2300d50f411d71f488260cbcd1f9ee8e0120c6d3f2ce189c81edb
-musl=/home/ccx/versions/musl.d828e4f6cb803b5cd778bf063a4ea6455e0eec6251844c9d88f69a3fab854167
+binutils_cmd=/home/ccx/versions/binutils.8a6500689d23271c44c4597f3828d4a17919584c204e5d71085ade6f894d838d
+musl=/home/ccx/versions/musl.4b712e00a652ccacd250921a5a78218a958b086bb86791ccc8ec65cd67a66969
 build_env_static
 
 sysroot="${pthbs_workdir}/sysroot"
diff --git a/variants/ccx-x86_64/getconf b/variants/ccx-x86_64/getconf
@@ -1,43 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
 #@sha256:d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c:getconf.c
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/getent b/variants/ccx-x86_64/getent
@@ -1,43 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
 #@sha256:002c1a216f6bed0f816ab1cfebde94a0b127193ef410c36b2190599983e015b8:getent.c
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/git b/variants/ccx-x86_64/git
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+m4.13e8f64dca14c47846841a8a697180a2fe96d777a0f56f5e52079761eb6b79aa
-#+libressl.4a59407f93a86c2bab70daaed9958b39daf97f238f1e6ae269ddda85bce9fbb5
-#+curl.e37c6ee555052a6b9fcac6dceae7014ec5935e12679bc5205f109786b33c2a8e
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+m4.3bd69e2dd42ef971ed64b42d4d396a042ea9e223d89a4ab70c526474b3383357
+#+libressl.5220a49e3b686e5776e80491a62ead7cdf5a4dc4e22a1e1383724aa811826ad3
+#+curl.8e8689858e363de3ab46e8cc697da28880362625bbe498c39e62256dc9bc283d
 #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:.
 
 
diff --git a/variants/ccx-x86_64/gmp b/variants/ccx-x86_64/gmp
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
-#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
-#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+m4.d7c9e4dd9474e659d6c16f640cd2d57ac62b252b2a4bb12259dcc48d2412e402
-#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
+#+musl-cross-make.7fc68aacf3c3af5e943bf800f4927f49f0ccf4a9bc5f424ff037ac513a258553
+#+gnu-make.2c3345112e9f2486d0d450f9f3e3da34c00d6d91d901bb8857cc2e4e75a43078
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+m4.f7461c6652293037f08fb6768207644716d0111a9b8bcb7841c20f28c926da16
+#+nawk.b1d41648e3331f461db172fca1ad98cd8da92077bb3abb107a581f6dd2b5bbfa
 #@untar:-J:sha256:a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898:.
 
 
@@ -33,10 +33,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/gnu-make b/variants/ccx-x86_64/gnu-make
@@ -1,8 +1,8 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
-#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.2c3345112e9f2486d0d450f9f3e3da34c00d6d91d901bb8857cc2e4e75a43078
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+nawk.b1d41648e3331f461db172fca1ad98cd8da92077bb3abb107a581f6dd2b5bbfa
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -32,10 +32,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/gnu-make:bootstrap b/variants/ccx-x86_64/gnu-make:bootstrap
@@ -1,8 +1,8 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
 #@pragma:nopath
-#+musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
-#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
+#+musl-cross-make.7fc68aacf3c3af5e943bf800f4927f49f0ccf4a9bc5f424ff037ac513a258553
+#+nawk.b1d41648e3331f461db172fca1ad98cd8da92077bb3abb107a581f6dd2b5bbfa
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -37,7 +37,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'make-4.4.1'
 
 
-mcm=/home/ccx/versions/musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
+mcm=/home/ccx/versions/musl-cross-make.7fc68aacf3c3af5e943bf800f4927f49f0ccf4a9bc5f424ff037ac513a258553
 
 export CC="$mcm/bin/x86_64-linux-musl-gcc"
 export CXX="$mcm/bin/x86_64-linux-musl-g++"
diff --git a/variants/ccx-x86_64/gnu-make:old b/variants/ccx-x86_64/gnu-make:old
@@ -1,8 +1,8 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.e6726ea29e8b7fe316c8a30b8a500f73aab8cf8c862a1bcd575d50b3265dd793
-#+gnu-make.b7cde92a7edabca3a8e00739fed6aaa5533d94f74d290dff8ce739ffef9171b5
-#+busybox.3cee246e09c72f86b6e714fb4b4557dc2f9ee571084f716bbcb612fa8ebd3deb
-#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
+#+musl-cross-make.881a7e5ccca8d906a570a92378e03d43b936a4f9ca607adf8bfc8255fdc341f3
+#+gnu-make.a3596a3a78160446705972f45fdfefa8b7529275cd23e67891db41713c920975
+#+busybox.f26f17d6b39529e6faba81d3296ee8b543f18f1d6417de3fb643b497f9f7dbca
+#+nawk.b1d41648e3331f461db172fca1ad98cd8da92077bb3abb107a581f6dd2b5bbfa
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
diff --git a/variants/ccx-x86_64/gnu-make:oldbootstrap b/variants/ccx-x86_64/gnu-make:oldbootstrap
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
 #@pragma:nopath
-#+musl-cross-make.a92bd0a73a662b4ebb61cd88fa1f6d034a327326d3a9d0f0040cc87ed97e5cb3
+#+musl-cross-make.d903f7566ce74e61dc3c4873651fe5f229f21b7b98426c73a8918b5e9d68324c
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -30,7 +30,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'make-4.4.1'
 
 
-mcm=/home/ccx/versions/musl-cross-make.a92bd0a73a662b4ebb61cd88fa1f6d034a327326d3a9d0f0040cc87ed97e5cb3
+mcm=/home/ccx/versions/musl-cross-make.d903f7566ce74e61dc3c4873651fe5f229f21b7b98426c73a8918b5e9d68324c
 
 export PATH="$mcm/command:$PATH"
 export CC="$mcm/command/x86_64-linux-musl-gcc"
diff --git a/variants/ccx-x86_64/gperf b/variants/ccx-x86_64/gperf
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+m4.13e8f64dca14c47846841a8a697180a2fe96d777a0f56f5e52079761eb6b79aa
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+m4.3bd69e2dd42ef971ed64b42d4d396a042ea9e223d89a4ab70c526474b3383357
 #@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:.
 
 
@@ -60,10 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/iconv b/variants/ccx-x86_64/iconv
@@ -1,43 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
 #@sha256:f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7:iconv.c
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/kbd b/variants/ccx-x86_64/kbd
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+m4.13e8f64dca14c47846841a8a697180a2fe96d777a0f56f5e52079761eb6b79aa
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+m4.3bd69e2dd42ef971ed64b42d4d396a042ea9e223d89a4ab70c526474b3383357
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 
@@ -61,10 +61,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
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.2146f6782e67214c7ad7ee82b2c006ba2f2cd852ed4df91c86decd5c41d0e7ae
-#+busybox.c6b6443b5623b38e0a8ecc5840aabdf6abfb2163181801f84f344072c0386312-
\ No newline at end of file
+#+linux-qemu-guest.777a0ba4f6890b1584fd940d2ed5af6e34a390518c7e1b459ab1b5e3a931f8b8
+#+busybox.7d6fa3654618b0a2d27c9b173c6c4b73edbe793a3c2ef3a9536924751758c8de+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/libarchive b/variants/ccx-x86_64/libarchive
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+m4.13e8f64dca14c47846841a8a697180a2fe96d777a0f56f5e52079761eb6b79aa
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+m4.3bd69e2dd42ef971ed64b42d4d396a042ea9e223d89a4ab70c526474b3383357
 #@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:.
 
 
@@ -60,10 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/libbsd b/variants/ccx-x86_64/libbsd
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+m4.13e8f64dca14c47846841a8a697180a2fe96d777a0f56f5e52079761eb6b79aa
-#+libmd.020df208b31ba90ca1f56fb1270e329cead224286bd4ca8f9942140159f5e6e1
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+m4.3bd69e2dd42ef971ed64b42d4d396a042ea9e223d89a4ab70c526474b3383357
+#+libmd.59f4120b13d7b1450a415673672a59e54b7578db9f3416d03ccaf84174741ae1
 #@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:.
 
 
@@ -61,10 +61,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/libcap b/variants/ccx-x86_64/libcap
@@ -1,46 +1,44 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+pkgconf-pkg-config.746069f838745544ee4125e5e77822aad9f95bad2e65b6be5bb94091d0d70ec6
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+pkgconf-pkg-config.6e835df6aed5c8ad6cea2774f013b169b0d16b07b84112809ed145cb6a3bd7d4
 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/libcap:bootstrap b/variants/ccx-x86_64/libcap:bootstrap
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
-#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
-#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
+#+musl-cross-make.7fc68aacf3c3af5e943bf800f4927f49f0ccf4a9bc5f424ff037ac513a258553
+#+gnu-make.2c3345112e9f2486d0d450f9f3e3da34c00d6d91d901bb8857cc2e4e75a43078
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+nawk.b1d41648e3331f461db172fca1ad98cd8da92077bb3abb107a581f6dd2b5bbfa
 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:.
 
 
diff --git a/variants/ccx-x86_64/libcgroup b/variants/ccx-x86_64/libcgroup
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+m4.13e8f64dca14c47846841a8a697180a2fe96d777a0f56f5e52079761eb6b79aa
-#+flex.b91fd0bbc76abf76c0368bf4f5b4b19c3a643eb531725abdbe295e4f78d5d471
-#+bison.38041d5aa8dabf9daf6903deb39cef07a6cbcce24000a78f274198ce32d303fc
-#+musl-fts.0680013f1ff5884baa89fb6b07d4c6609591bee27f54178a77facb6713fae316
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+m4.3bd69e2dd42ef971ed64b42d4d396a042ea9e223d89a4ab70c526474b3383357
+#+flex.3a3870e15fbc145f3cfb7d5e3040078bfaa096010de16a41fa34be6f6bfde1be
+#+bison.2a6ac34959b39dd064f3e376e1228a841202df5a91f96922ea613a12e4e34067
+#+musl-fts.f0f7fccb362cd7b16ef851a13728e87569d0c13ec485738e05ab42001b264264
 #@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:.
 
 
@@ -63,10 +63,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/libelf b/variants/ccx-x86_64/libelf
@@ -1,46 +1,44 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+zstd.8bd51affe68613292d100159bd8a6c511a3baa7667d329be44ab6a017107c7b8
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+zstd.bf9212fdc735903c1ef7409a8f4e0639faf27b9aff11feca6e35f4f84b0710c9
 #@git:288355d104ff9930520c0283fe82556c6cc5c16f:libelf
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/libmd b/variants/ccx-x86_64/libmd
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+m4.13e8f64dca14c47846841a8a697180a2fe96d777a0f56f5e52079761eb6b79aa
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+m4.3bd69e2dd42ef971ed64b42d4d396a042ea9e223d89a4ab70c526474b3383357
 #@untar:-J:sha256:1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332:.
 
 
@@ -60,10 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/libressl b/variants/ccx-x86_64/libressl
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+m4.13e8f64dca14c47846841a8a697180a2fe96d777a0f56f5e52079761eb6b79aa
-#+ca-certificates-wip-donotuse.c6c159c30313341544d981a4228a261acd3c3daa51af8df182cfd1f9b878e379
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+m4.3bd69e2dd42ef971ed64b42d4d396a042ea9e223d89a4ab70c526474b3383357
+#+ca-certificates-wip-donotuse.03d64632f4ae1c13a2c743ac6f740224c83891d5ab5c6ea6d9594a3d0be411af
 #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c
 #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:.
 
@@ -62,10 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
@@ -101,7 +99,7 @@ make DESTDIR="$pthbs_destdir" install
 
 cd ..
 gcc ./c_rehash.c -o c_rehash --static -static -I"$pthbs_destdir/$prefix/include" -L"$pthbs_destdir/$prefix/library" -lssl -lcrypto
-cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.c6c159c30313341544d981a4228a261acd3c3daa51af8df182cfd1f9b878e379/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
+cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.03d64632f4ae1c13a2c743ac6f740224c83891d5ab5c6ea6d9594a3d0be411af/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
 ./c_rehash  "$pthbs_destdir/$prefix/config/ssl/certs/"
 cd  "$pthbs_destdir/$prefix/config/ssl/"
 mv cert.pem libressl-cert.pem
diff --git a/variants/ccx-x86_64/libseccomp b/variants/ccx-x86_64/libseccomp
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+m4.13e8f64dca14c47846841a8a697180a2fe96d777a0f56f5e52079761eb6b79aa
-#+pkgconf-pkg-config.746069f838745544ee4125e5e77822aad9f95bad2e65b6be5bb94091d0d70ec6
-#+gperf.14b1efefe252dc728bae312697f5b9167773a50a1734150594132ba3fde37d07
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+m4.3bd69e2dd42ef971ed64b42d4d396a042ea9e223d89a4ab70c526474b3383357
+#+pkgconf-pkg-config.6e835df6aed5c8ad6cea2774f013b169b0d16b07b84112809ed145cb6a3bd7d4
+#+gperf.0f908da74271eb85084026f9204862e31cfc5936071f1c1de808fe17f9e06417
 #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:.
 
 
@@ -62,10 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/libunwind b/variants/ccx-x86_64/libunwind
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+m4.13e8f64dca14c47846841a8a697180a2fe96d777a0f56f5e52079761eb6b79aa
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+m4.3bd69e2dd42ef971ed64b42d4d396a042ea9e223d89a4ab70c526474b3383357
 #@untar:-z:sha256:ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157:.
 
 
@@ -60,10 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/linux b/variants/ccx-x86_64/linux
@@ -1,44 +1,44 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nofail_digest
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-modutils.29ec750862280b84bd0ff1663965d1ccce8edb0a66b2abaed6bb770cc8cd6ee4
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+findutils.a29215d76b3963477109d40bddac471025f3a033c6d5b7c7941b44cb52e0ef91
-#+diffutils.b4a300af866981068118991b7efd5d100083350978a91dd7a30d0352a63c3967
-#+patch.930184dce3e1dbdfbf8ac1ccbcb3ab728cc22196e7459af586877968909a0543
-#+flex.b91fd0bbc76abf76c0368bf4f5b4b19c3a643eb531725abdbe295e4f78d5d471
-#+bison.38041d5aa8dabf9daf6903deb39cef07a6cbcce24000a78f274198ce32d303fc
-#+rsync.31f320cbeaff5420d78cb5dd43af6670a003ad3527bff54127d8e4b9a361860c
-#+zstd.8bd51affe68613292d100159bd8a6c511a3baa7667d329be44ab6a017107c7b8
-#+libelf.cb4e01781b20f39fdf73c1b7f3dce4ae999118010a0f43980f58a97837332a1b
-#+pkgconf-pkg-config.746069f838745544ee4125e5e77822aad9f95bad2e65b6be5bb94091d0d70ec6
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-modutils.2020ceb8a8a84c98de17c05a2312018f624a0c18d0fcf56d47c85b245128258c
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+findutils.4ca372c5806e835fbb83d9e18972ebed2934bda510401bd2f457222de1892290
+#+diffutils.2609f4ea58052c7e64af9aa6798a2b3a8a201ab3289c7f48676c85e36c9fbfe0
+#+patch.f9af9058385753a59f5f726db36eb7a83c7693dd3f87907691614dd77f622534
+#+flex.3a3870e15fbc145f3cfb7d5e3040078bfaa096010de16a41fa34be6f6bfde1be
+#+bison.2a6ac34959b39dd064f3e376e1228a841202df5a91f96922ea613a12e4e34067
+#+rsync.7aa279b369e7b8c6f1cdf6717c0935314361130c5df23b732a25882e439880e0
+#+zstd.bf9212fdc735903c1ef7409a8f4e0639faf27b9aff11feca6e35f4f84b0710c9
+#+libelf.452c7233e35cfa4f5596129284442301b18feb1e5cda95cb93e85c70e4caa275
+#+pkgconf-pkg-config.6e835df6aed5c8ad6cea2774f013b169b0d16b07b84112809ed145cb6a3bd7d4
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
 #@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:.
 #@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz
 #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config
diff --git a/variants/ccx-x86_64/linux-qemu-guest b/variants/ccx-x86_64/linux-qemu-guest
@@ -1,44 +1,44 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nofail_digest
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-modutils.29ec750862280b84bd0ff1663965d1ccce8edb0a66b2abaed6bb770cc8cd6ee4
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+findutils.a29215d76b3963477109d40bddac471025f3a033c6d5b7c7941b44cb52e0ef91
-#+diffutils.b4a300af866981068118991b7efd5d100083350978a91dd7a30d0352a63c3967
-#+patch.930184dce3e1dbdfbf8ac1ccbcb3ab728cc22196e7459af586877968909a0543
-#+flex.b91fd0bbc76abf76c0368bf4f5b4b19c3a643eb531725abdbe295e4f78d5d471
-#+bison.38041d5aa8dabf9daf6903deb39cef07a6cbcce24000a78f274198ce32d303fc
-#+rsync.31f320cbeaff5420d78cb5dd43af6670a003ad3527bff54127d8e4b9a361860c
-#+zstd.8bd51affe68613292d100159bd8a6c511a3baa7667d329be44ab6a017107c7b8
-#+libelf.cb4e01781b20f39fdf73c1b7f3dce4ae999118010a0f43980f58a97837332a1b
-#+pkgconf-pkg-config.746069f838745544ee4125e5e77822aad9f95bad2e65b6be5bb94091d0d70ec6
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-modutils.2020ceb8a8a84c98de17c05a2312018f624a0c18d0fcf56d47c85b245128258c
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+findutils.4ca372c5806e835fbb83d9e18972ebed2934bda510401bd2f457222de1892290
+#+diffutils.2609f4ea58052c7e64af9aa6798a2b3a8a201ab3289c7f48676c85e36c9fbfe0
+#+patch.f9af9058385753a59f5f726db36eb7a83c7693dd3f87907691614dd77f622534
+#+flex.3a3870e15fbc145f3cfb7d5e3040078bfaa096010de16a41fa34be6f6bfde1be
+#+bison.2a6ac34959b39dd064f3e376e1228a841202df5a91f96922ea613a12e4e34067
+#+rsync.7aa279b369e7b8c6f1cdf6717c0935314361130c5df23b732a25882e439880e0
+#+zstd.bf9212fdc735903c1ef7409a8f4e0639faf27b9aff11feca6e35f4f84b0710c9
+#+libelf.452c7233e35cfa4f5596129284442301b18feb1e5cda95cb93e85c70e4caa275
+#+pkgconf-pkg-config.6e835df6aed5c8ad6cea2774f013b169b0d16b07b84112809ed145cb6a3bd7d4
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
 #@untar:-J:sha256:7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764:.
 #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config
 #@sha256:ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417:noobjtool.patch
diff --git a/variants/ccx-x86_64/lnstools:bootstrap b/variants/ccx-x86_64/lnstools:bootstrap
@@ -1,12 +1,12 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
-#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
-#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
-#+skalibs.d1ff8cdcea9d046498fa6d934eac84fb74629f477532b3480ad1b38b794db050
-#+execline.dcc4d1547d9927e4a41bc28ae51ac1667791a3cb51a3d4e210e7bc0e4ec9328f
-#+libcap.44be1577840dbfe3c66cae428fb1a5779605df9865e11648facb9b18596ac686
+#+musl-cross-make.7fc68aacf3c3af5e943bf800f4927f49f0ccf4a9bc5f424ff037ac513a258553
+#+gnu-make.2c3345112e9f2486d0d450f9f3e3da34c00d6d91d901bb8857cc2e4e75a43078
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+nawk.b1d41648e3331f461db172fca1ad98cd8da92077bb3abb107a581f6dd2b5bbfa
+#+skalibs.a8a00a264036f872341516bbcba7047e02664ec28a6c610f432c571b446ea720
+#+execline.2075994f3301cddd481893f1b4d42b819cc263684d20748db55ceb5463dc3800
+#+libcap.3813bfa68184375e0cca48e8ccbb495e51f7cab23ea7b09442fd6de9cef2bce4
 #@git:eef7fb4a9532fd0a9f6c23af5f20196c465df1b6:lnstools
 
 
diff --git a/variants/ccx-x86_64/logincaps b/variants/ccx-x86_64/logincaps
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+zsh.fcfc54f4ac311f948cfc2406559ef99ab8dac08eb0beed43b9b337082535bb97
-#+pthbs-banginstall.f1d73070c78f925ef111e3802e934ca20663bfd59af29c362fcf3e8e7b437312
-#+execline.9a580cb41e897f8c4616ced5d0341954fadb2dd4a5b514934616c5c503fc082d
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+ccx-utils.6a649c5a8cafa805be7b50623c4d96b074f33c280aba7e94cdd53a1f8690bfa1
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+zsh.2cb2e0585ce2058c4cf69794bd14e9d84c9f93437a1fc66cdaf3c2e396e37cd8
+#+pthbs-banginstall.8746c2e75c56ad9ad12a0a5951c510bb34b76e5be8406c7492602cb9c108ab82
+#+execline.8015583ca9fa606067d748c308753b8d9caaa1f4d78bb8a48d17346362b6c7c7
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+ccx-utils.7593c2009473425dd152e2650d4b47b72005dff3aafcb1cc9bedb62adae8af99
 #@git:409db79b3e7e5fc6b73305471d9bbb6ac5c14036:logincaps
 
 
diff --git a/variants/ccx-x86_64/m4 b/variants/ccx-x86_64/m4
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+nawk.b1d41648e3331f461db172fca1ad98cd8da92077bb3abb107a581f6dd2b5bbfa
 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
 
 
@@ -59,10 +59,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/m4:bootstrap b/variants/ccx-x86_64/m4:bootstrap
@@ -1,8 +1,8 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
-#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
-#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
+#+musl-cross-make.7fc68aacf3c3af5e943bf800f4927f49f0ccf4a9bc5f424ff037ac513a258553
+#+gnu-make.2c3345112e9f2486d0d450f9f3e3da34c00d6d91d901bb8857cc2e4e75a43078
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+nawk.b1d41648e3331f461db172fca1ad98cd8da92077bb3abb107a581f6dd2b5bbfa
 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
 
 
@@ -32,10 +32,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/mandoc b/variants/ccx-x86_64/mandoc
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
 #@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.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+zsh.fcfc54f4ac311f948cfc2406559ef99ab8dac08eb0beed43b9b337082535bb97
-#+pthbs-banginstall.f1d73070c78f925ef111e3802e934ca20663bfd59af29c362fcf3e8e7b437312
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+zsh.2cb2e0585ce2058c4cf69794bd14e9d84c9f93437a1fc66cdaf3c2e396e37cd8
+#+pthbs-banginstall.8746c2e75c56ad9ad12a0a5951c510bb34b76e5be8406c7492602cb9c108ab82
 #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts
 
 
diff --git a/variants/ccx-x86_64/mdevd b/variants/ccx-x86_64/mdevd
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+skalibs.7f2610571321bf6ff32187e4720b1f4d7bdeab2163da455e07e75549b216fbe8
-#+execline.9a580cb41e897f8c4616ced5d0341954fadb2dd4a5b514934616c5c503fc082d
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+skalibs.513c9f46b250859f980edc5e4ab5de6aac0497533a1644f8f70c2c1afc815eb6
+#+execline.8015583ca9fa606067d748c308753b8d9caaa1f4d78bb8a48d17346362b6c7c7
 #@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd
 
 
@@ -47,7 +47,7 @@ cd 'mdevd'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.7f2610571321bf6ff32187e4720b1f4d7bdeab2163da455e07e75549b216fbe8/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.513c9f46b250859f980edc5e4ab5de6aac0497533a1644f8f70c2c1afc815eb6/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.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-dosfstools.9b3057bd3af0689982eeeeafd40976da6de22eb582f2a3113d7d40cbaed47387
-#+busybox-e2fsprogs.ed89377fdda3b4950ccbb22377346f587ae861c320318d2818a6d9bfe8c2fd7c
-#+busybox-iproute2.42cdfdcc9c3785b3005d73132f3186d37a75a6c0238b1abba2702a30186846a1
-#+busybox-iputils.aea3097879e47c1808fe7cec01f6aaaa0cf18f47e5218755697682af064f1a32
-#+busybox-net-misc.ccb6419806ff5bb640d862cc6d91b2c5c11c586e2b60e5b6cf9cc5e2ae3c7fbb
-#+busybox-net-tools.fdeca83091d03c43b9951558f0df781b9be09e166be6c601ffcc80547855dca3
-#+busybox-traceroute.9cc6e884e825a2e1447cf5488411a1a5f7d7a9435dc5d9a61a2640ad3824ed0f
-#+busybox-wget.8b4a52293c1e9437934f47ce634ef8698c1137d922111cab5ac56759d6180947
-#+busybox-chpst.69b7af983aa39943d7050c9c4e32ccf75687ba2002bbdb1b8d433ff1ab25e9e8
-#+busybox-console.7a0d8889d218addd1685e9b8a2437cadde35698c8e186bae9478424d62c14774
-#+busybox-getty.2c2f385504144928a2624a9e53c0851a5404627280fcc2b335af279ad8a155d1
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-dosfstools.0511d5c82da793363dcb0e46e42a266c2b7d1c337f361446a1c7c960951efd38
+#+busybox-e2fsprogs.42cd012d3b2b80507a138d59f23a83b3f1fa05861cffd479626d123d7e263a4d
+#+busybox-iproute2.350839a016a508830f23c6d06d1cceeb913d6ac735216ce48a4e7e5508c36b57
+#+busybox-iputils.8124e5a0cd596e3f4cac4e75f8e319c457b96ad423550ea4b30d2199cd7ef1b9
+#+busybox-net-misc.06a71e639b39b572bf62cdaf7f924df4a0a98cf54756121f5877bb3d7d18b674
+#+busybox-net-tools.693d34ee5d3d30af40fd6d778618d63cca52e898d3e37bcc7214896bd68c6933
+#+busybox-traceroute.b16257a0cb0d0e8eaf67f1058f8828ad2264217e3883e82d509e84a102a2bc26
+#+busybox-wget.63aea650c8ec578590609ec90516a948a9596866c99237c13d3adf11e45d1cc1
+#+busybox-chpst.bd2cbd7fb8931418573d407e76bd0788a668ec9537d365fc0f7cbdb6e98c8476
+#+busybox-console.a19d5faff0a876c303cd60021283a14a0244a7212ea09cd91e92fb6dd27353ab
+#+busybox-getty.f5432b352d1835f45f2e15df4c09116a7551163891d148fd07f79af034bbddc7
 
-#+busybox-linux-extra.9a986cfce35706fc44a78b86ffba66eb2e7970512ecb90a4fe5adc935db2cbf7
-#+busybox-mtd-utils.37b9aa531f31ef29cacd4a2f44760986bc407aeb2fcc563b169300746605cf7a
-#+busybox-shadow.5505514d1291925f05d21e765451c06c91362afa571e9ff4d6aff1ec94bca161
-#+busybox-su.d583ac9e406459e8ca84c788770a6d9aa3f8dc94b353b3d05016ae437341b780
-#+busybox-util-linux-priv.385943a04498e4d2f929f7f354cf2233694b0794e63e9cd7ce57632f5143acd5
-#+busybox-logging.160c10a45c118945fbaa98289b93fa07ef32a24ff3997693f8d2027247b7f352
-#+busybox-cron.3831dc78a22400d6c5c9375955bd4e347ec269d52771209c2fe5e2ad17a6f67a
-#+execline.9a580cb41e897f8c4616ced5d0341954fadb2dd4a5b514934616c5c503fc082d
-#+s6.c57430ab256e3869863e62c5bb25648fedcd64f7f7c7457dbac241125ada2f7a
-#+mdev-scripts.304a5958d65344645f7648c4c18da06d4f0a809b6aaa62f4dd01ebe5371ec438
-#+mdevd.b79b7bebdd6ad63d1c8d55835f21727f1074ce56b0ef6cb1923eae49f3fb3554
-#+busybox.c6b6443b5623b38e0a8ecc5840aabdf6abfb2163181801f84f344072c0386312-
\ No newline at end of file
+#+busybox-linux-extra.38485b5c5a4f61f328032d0e01a2dbe62e863d1c1da7f8f0a6d1769929ced1f2
+#+busybox-mtd-utils.ef4e23042fc20a1c2f33b521310f9a520afa3baf8584f55b2340a876fc822a6b
+#+busybox-shadow.c1755eb505cfb497436463fcbf63ce0847c770d6d6694a0ff569b1ba1a59ca62
+#+busybox-su.6b08d544f03c997e05bd58336ec3214f94bf3f7d144d2f430fb30a5238c69343
+#+busybox-util-linux-priv.dfe1bb37dcd5a3e7b29f6e0d9733ece5eba031249453f29d8e6a56af4055da52
+#+busybox-logging.8964b9d3e85a11ed014de8db28128272a44b8790bb32ef517161be263a2bf3f6
+#+busybox-cron.662bf9740d863cb722d6c23b293a45815c071708e0e43aa0959def005916e66d
+#+execline.8015583ca9fa606067d748c308753b8d9caaa1f4d78bb8a48d17346362b6c7c7
+#+s6.bf276ad2b4dffc5d18ec04cb80e448f9bf1e59d99803e840b450c8fda7b99e3f
+#+mdev-scripts.0a7ba39563675b80869fb3d19914111394ca801f632b03a7063db1e68ba9c93d
+#+mdevd.218bf6fd3b48c0d6fb430ace17cabaa19add5d98479ec2f80a17a26ab5a6cd7e
+#+busybox.7d6fa3654618b0a2d27c9b173c6c4b73edbe793a3c2ef3a9536924751758c8de+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/mlog b/variants/ccx-x86_64/mlog
@@ -1,44 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
 #@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/mpc b/variants/ccx-x86_64/mpc
@@ -1,11 +1,11 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
-#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
-#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+m4.d7c9e4dd9474e659d6c16f640cd2d57ac62b252b2a4bb12259dcc48d2412e402
-#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
-#+gmp.609022c8a461c7025772fffc1cf09f15317ea036990463845acbda54d7584a62
-#+mpfr.de7da86a91124d5bbb0029521f3c04cce0308be77e0fde4bd81c4f17bfa48117
+#+musl-cross-make.7fc68aacf3c3af5e943bf800f4927f49f0ccf4a9bc5f424ff037ac513a258553
+#+gnu-make.2c3345112e9f2486d0d450f9f3e3da34c00d6d91d901bb8857cc2e4e75a43078
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+m4.f7461c6652293037f08fb6768207644716d0111a9b8bcb7841c20f28c926da16
+#+nawk.b1d41648e3331f461db172fca1ad98cd8da92077bb3abb107a581f6dd2b5bbfa
+#+gmp.391826175a329b4082a2eca878770927b073d4685d5148702babe2620670815e
+#+mpfr.7bc4d68ba93cde8c8b716a2a9327d52ef98fb5e1e9222cbcda8f673212332252
 #@untar:-z:sha256:ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8:.
 
 
@@ -35,10 +35,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/mpfr b/variants/ccx-x86_64/mpfr
@@ -1,10 +1,10 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
-#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
-#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+m4.d7c9e4dd9474e659d6c16f640cd2d57ac62b252b2a4bb12259dcc48d2412e402
-#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
-#+gmp.609022c8a461c7025772fffc1cf09f15317ea036990463845acbda54d7584a62
+#+musl-cross-make.7fc68aacf3c3af5e943bf800f4927f49f0ccf4a9bc5f424ff037ac513a258553
+#+gnu-make.2c3345112e9f2486d0d450f9f3e3da34c00d6d91d901bb8857cc2e4e75a43078
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+m4.f7461c6652293037f08fb6768207644716d0111a9b8bcb7841c20f28c926da16
+#+nawk.b1d41648e3331f461db172fca1ad98cd8da92077bb3abb107a581f6dd2b5bbfa
+#+gmp.391826175a329b4082a2eca878770927b073d4685d5148702babe2620670815e
 #@untar:-J:sha256:b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01:.
 
 
@@ -34,10 +34,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/musl b/variants/ccx-x86_64/musl
@@ -1,8 +1,8 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
-#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
-#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
+#+musl-cross-make.7fc68aacf3c3af5e943bf800f4927f49f0ccf4a9bc5f424ff037ac513a258553
+#+gnu-make.2c3345112e9f2486d0d450f9f3e3da34c00d6d91d901bb8857cc2e4e75a43078
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+nawk.b1d41648e3331f461db172fca1ad98cd8da92077bb3abb107a581f6dd2b5bbfa
 #@sha256:a21336df3bc3b267fbda940d9f533f66b0eacb520b8421cca3ddc943f620a791:merged.patch
 #@untar:-z:sha256:a9a118bbe84d8764da0ea0d28b3ab3fae8477fc7e4085d90102b8596fc7c75e4:.
 
@@ -16,7 +16,7 @@ cd 'musl-1.2.5'
 patch -p1 <../merged.patch
 
 
-mcm=/home/ccx/versions/musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
+mcm=/home/ccx/versions/musl-cross-make.7fc68aacf3c3af5e943bf800f4927f49f0ccf4a9bc5f424ff037ac513a258553
 
 ./configure \
 	--prefix="$prefix" \
diff --git a/variants/ccx-x86_64/musl-cross-make b/variants/ccx-x86_64/musl-cross-make
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nofail_digest
-#+musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
-#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
-#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
+#+musl-cross-make.7fc68aacf3c3af5e943bf800f4927f49f0ccf4a9bc5f424ff037ac513a258553
+#+gnu-make.2c3345112e9f2486d0d450f9f3e3da34c00d6d91d901bb8857cc2e4e75a43078
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+nawk.b1d41648e3331f461db172fca1ad98cd8da92077bb3abb107a581f6dd2b5bbfa
 #@sha256:0cdd76777a0dfd3dd3a63f215f030208ddb91c2361d2bcc02acec0f1c16b6a2e:musl-cross-make/sources/binutils-2.44.tar.gz
 #@sha256:a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898:musl-cross-make/sources/gmp-6.3.0.tar.xz
 #@sha256:b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01:musl-cross-make/sources/mpfr-4.2.2.tar.xz
@@ -112,6 +112,18 @@ fi
 
 
 
+mkdir -p "$dest/library.so" "$dest/.env-template"
+printf '%s' >"$dest/.env-template/CPATH" @ENVROOT@/'include'
+printf '%s' >"$dest/.env-template/LIBRARY_PATH" @ENVROOT@/'library'
+printf '%s' >"$dest/.env-template/LD_LIBRARY_PATH" @ENVROOT@/'library.so'
+
+dynlib_to_top="$(printf "%s\n" 'library.so' | sed -Ee "s!^\./!!; s![^/]+!..!g")"
+printf >>link_to_dynlib '%s\n' 'ln -s "'$dynlib_to_top'${1#.}" ''library.so'/
+( cd "$dest" && find "./lib" "./x86_64-linux-musl" \
+	\( -type f -o -type l \) \( -name '*.so' -o -name '*.so.*' \) \
+	-exec sh -xe "$pthbs_workdir/link_to_dynlib" '{}' ';'
+)
+
 pkgs="gmp mpc mpfr zlib"
 #pkgs="$pkgs libbacktrace libcc1 libcpp libdecnumber libiberty lto-plugin"
 
@@ -156,6 +168,10 @@ BEGIN {
 	x["./lib/libmpfr.a"]=1
 	x["./lib/libz.a"]=1
 
+	x["./x86_64-linux-musl/lib/libc.so"]=1
+	x["./x86_64-linux-musl/lib/libgcc_s.so"]=1
+	x["./x86_64-linux-musl/lib/libstdc++.so"]=1
+
 	x["./include/gmp.h"]=1
 	x["./include/mpc.h"]=1
 	x["./include/mpf2mpfr.h"]=1
diff --git a/variants/ccx-x86_64/musl-cross-make:bootstrap-1 b/variants/ccx-x86_64/musl-cross-make:bootstrap-1
@@ -3,7 +3,7 @@
 #@pragma:nosandbox
 #@pragma:nopath
 #+musl-cross-make.dc23291d60d6ae9ba52830824a87e0bddefbe427dbe4452419d4fedabf465cfd
-#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
+#+nawk.b1d41648e3331f461db172fca1ad98cd8da92077bb3abb107a581f6dd2b5bbfa
 #@sha256:0cdd76777a0dfd3dd3a63f215f030208ddb91c2361d2bcc02acec0f1c16b6a2e:musl-cross-make/sources/binutils-2.44.tar.gz
 #@sha256:a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898:musl-cross-make/sources/gmp-6.3.0.tar.xz
 #@sha256:b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01:musl-cross-make/sources/mpfr-4.2.2.tar.xz
diff --git a/variants/ccx-x86_64/musl-cross-make:old b/variants/ccx-x86_64/musl-cross-make:old
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nofail_digest
-#+musl-cross-make.a92bd0a73a662b4ebb61cd88fa1f6d034a327326d3a9d0f0040cc87ed97e5cb3
-#+gnu-make.b7cde92a7edabca3a8e00739fed6aaa5533d94f74d290dff8ce739ffef9171b5
-#+busybox.3cee246e09c72f86b6e714fb4b4557dc2f9ee571084f716bbcb612fa8ebd3deb
-#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
+#+musl-cross-make.d903f7566ce74e61dc3c4873651fe5f229f21b7b98426c73a8918b5e9d68324c
+#+gnu-make.a3596a3a78160446705972f45fdfefa8b7529275cd23e67891db41713c920975
+#+busybox.f26f17d6b39529e6faba81d3296ee8b543f18f1d6417de3fb643b497f9f7dbca
+#+nawk.b1d41648e3331f461db172fca1ad98cd8da92077bb3abb107a581f6dd2b5bbfa
 #@sha256:0cdd76777a0dfd3dd3a63f215f030208ddb91c2361d2bcc02acec0f1c16b6a2e:musl-cross-make/sources/binutils-2.44.tar.gz
 #@sha256:a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898:musl-cross-make/sources/gmp-6.3.0.tar.xz
 #@sha256:b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01:musl-cross-make/sources/mpfr-4.2.2.tar.xz
diff --git a/variants/ccx-x86_64/musl-cross-make:oldbootstrap-1 b/variants/ccx-x86_64/musl-cross-make:oldbootstrap-1
@@ -3,7 +3,7 @@
 #@pragma:nosandbox
 #@pragma:nopath
 #+musl-cross-make.dc23291d60d6ae9ba52830824a87e0bddefbe427dbe4452419d4fedabf465cfd
-#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
+#+nawk.b1d41648e3331f461db172fca1ad98cd8da92077bb3abb107a581f6dd2b5bbfa
 #@sha256:0cdd76777a0dfd3dd3a63f215f030208ddb91c2361d2bcc02acec0f1c16b6a2e:musl-cross-make/sources/binutils-2.44.tar.gz
 #@sha256:a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898:musl-cross-make/sources/gmp-6.3.0.tar.xz
 #@sha256:b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01:musl-cross-make/sources/mpfr-4.2.2.tar.xz
diff --git a/variants/ccx-x86_64/musl-fts b/variants/ccx-x86_64/musl-fts
@@ -1,44 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
 #@untar:-z:sha256:49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/nawk b/variants/ccx-x86_64/nawk
@@ -1,45 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
-#+bison.38041d5aa8dabf9daf6903deb39cef07a6cbcce24000a78f274198ce32d303fc
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.b1d41648e3331f461db172fca1ad98cd8da92077bb3abb107a581f6dd2b5bbfa
+#+bison.2a6ac34959b39dd064f3e376e1228a841202df5a91f96922ea613a12e4e34067
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
 #@untar:-z:sha256:e031b1e1d2b230f276f975bffb923f0ea15f798c839d15a3f26a1a39448e32d7:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/nawk:bootstrap b/variants/ccx-x86_64/nawk:bootstrap
@@ -11,10 +11,8 @@
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/netbsd-curses b/variants/ccx-x86_64/netbsd-curses
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
 #@git:51d179dad861640caeb76674b5908ccd79f04fae:netbsd-curses
 
 
diff --git a/variants/ccx-x86_64/nvi b/variants/ccx-x86_64/nvi
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+m4.13e8f64dca14c47846841a8a697180a2fe96d777a0f56f5e52079761eb6b79aa
-#+netbsd-curses.e6b1c154d24c1cf1781cf720256a4184804e971c6073afacddc92c7caa52a5d2
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+m4.3bd69e2dd42ef971ed64b42d4d396a042ea9e223d89a4ab70c526474b3383357
+#+netbsd-curses.bf4eecfaddc5b1d3e169b3263d19694230c7606aa4e969f60a19084363c042bf
 #@untar:-z:sha256:755b87aa1e25c24c4c1668de5573d7d9a327b529423ce3ad9ee753bfb2296e33:.
 
 
@@ -61,10 +61,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/ocaml-astring b/variants/ccx-x86_64/ocaml-astring
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+ocaml.819d781b7986f8a3af9d9cb3060b5cf1321208b6740d9d03edd97f0596c89621
-#+ocaml-findlib.d77882ca74d1e97ca0c6c4c3c7618b642d4000139e1599187f2fe5566ea592ae
-#+ocamlbuild.d94ae3a7969b014bd36247760ec95bf43c7505731854454c7e86c69e28058fdb
-#+opam.d7d5991863f5d361dd2d4708c604e2c8f4dbee0e38d4b0c37c357767ef0d670c
-#+ocaml-topkg.71d55d6fa8cec24438dfd604a1369bfc8241a5dea8d410b8699138c992be64c6
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+ocaml.e01c6e7cb1ca624bacac03edc55c55b9a6304219ae3ada6e8934d363f10ac8a1
+#+ocaml-findlib.0419a1313d543dabb8667b35f836aa831e282cefda4053d4d3dca6b6fc14ecc8
+#+ocamlbuild.0ce66d65ef6f663cecd639341bc9f8bbf01dcb9bfc0c06161125a2bcc86871b1
+#+opam.6f598d4565a48a1ca0806a96ec96f42d0a2dc24df8a1a747a9bae527278c7830
+#+ocaml-topkg.a38a67ad47473118bc992499e25ee1f6a28fa7ca058f5b24c5d703365bcc68d3
 #@untar:-j:sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-base b/variants/ccx-x86_64/ocaml-base
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+ocaml.819d781b7986f8a3af9d9cb3060b5cf1321208b6740d9d03edd97f0596c89621
-#+dune.07c387be10443c98f2c7c36eefcbec5c1a42297780842f9ef38224543f148efd
-#+ocaml_intrinsics_kernel.5576bc18cfc3935c40fc2f7e7df1f7be24466d73bd986eaac2a5aa716d83d5aa
-#+ocaml-sexplib0.22f238dc32e9b0012c988abfe8a2573f67d4a2e0bd2c3e810133e7ba3e84831c
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+ocaml.e01c6e7cb1ca624bacac03edc55c55b9a6304219ae3ada6e8934d363f10ac8a1
+#+dune.efab6b289de62f7228914ec2549a47eb38890a64155b48e7ba452a359850e0d8
+#+ocaml_intrinsics_kernel.097b028b4502cc7c3360579456921ed8ccc17d9e8ee2f6323f6c02a53e1e165e
+#+ocaml-sexplib0.c8a4364d34980f6d157c6804150cb79abc16387499049b17ea3627ab13bef4a2
 #@untar:-z:sha256:3f3f64789ab25bb5cb7f5f907dd651dec9cc9440981822fe75df6b94344b7208:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-bos b/variants/ccx-x86_64/ocaml-bos
@@ -1,45 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+ocaml.819d781b7986f8a3af9d9cb3060b5cf1321208b6740d9d03edd97f0596c89621
-#+ocaml-findlib.d77882ca74d1e97ca0c6c4c3c7618b642d4000139e1599187f2fe5566ea592ae
-#+ocamlbuild.d94ae3a7969b014bd36247760ec95bf43c7505731854454c7e86c69e28058fdb
-#+opam.d7d5991863f5d361dd2d4708c604e2c8f4dbee0e38d4b0c37c357767ef0d670c
-#+ocaml-topkg.71d55d6fa8cec24438dfd604a1369bfc8241a5dea8d410b8699138c992be64c6
-#+ocaml-astring.c044a84ccd61a03909641109fcee246e9ffd728716b7934738aca4e2349f5bad
-#+ocaml-fpath.b8f7a0f426a3b87a5d02f1e1d8bc10592b3567fdb74fb43a2f7fc1c96860d10d
-#+ocaml-rresult.372b8185e437df31e0faea06d81c0a1a6e66f497e81b29875843f5e6c84b5e19
-#+ocaml-fmt.fcaff54a36e62e3641e2c35e9a12aea37072f5ee95b698a35d0a57bd208e31be
-#+ocaml-logs.a2d7a98c53d2fc339357feb4663888fef433f1908b77b21ae08ae8085990879d
-#+ocaml-mtime.a0f9dc0ecc4c6f2cc1dc67c4b6c3f0cefdeda601fc6aac5aef8cde8d55778b2f
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+ocaml.e01c6e7cb1ca624bacac03edc55c55b9a6304219ae3ada6e8934d363f10ac8a1
+#+ocaml-findlib.0419a1313d543dabb8667b35f836aa831e282cefda4053d4d3dca6b6fc14ecc8
+#+ocamlbuild.0ce66d65ef6f663cecd639341bc9f8bbf01dcb9bfc0c06161125a2bcc86871b1
+#+opam.6f598d4565a48a1ca0806a96ec96f42d0a2dc24df8a1a747a9bae527278c7830
+#+ocaml-topkg.a38a67ad47473118bc992499e25ee1f6a28fa7ca058f5b24c5d703365bcc68d3
+#+ocaml-astring.b1e69e91e2f1e0b8be2b9bccc2d55b24c0a0f8cd84581fcb1cc3a4a42176ddff
+#+ocaml-fpath.47f901e8974b976c4f05f87fec5aeb4c9757fc107b5d1e234e8fc981f1ba06aa
+#+ocaml-rresult.794df88480bab180b89a0786e4214115e7c280818967974081078251f8406e9e
+#+ocaml-fmt.2e8687a4a408d6ff5cfd236c18f090896c1c2bf12f9ac2c6dc0b970c7e09a721
+#+ocaml-logs.73d69a90aee4a33c6d1c57a783c019018e673f494dc2e4166ba7689862980855
+#+ocaml-mtime.94363d62cec112a10379f99d192c6d33ea5118f611a26e912a343e9617788828
 #@untar:-j:sha256:d8d62e786b10d697e0457205a8eedeaa27ebcc90f1855f18df190cac2e3d8f37:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-cmdliner b/variants/ccx-x86_64/ocaml-cmdliner
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+ocaml.819d781b7986f8a3af9d9cb3060b5cf1321208b6740d9d03edd97f0596c89621
-#+ocaml-findlib.d77882ca74d1e97ca0c6c4c3c7618b642d4000139e1599187f2fe5566ea592ae
-#+ocamlbuild.d94ae3a7969b014bd36247760ec95bf43c7505731854454c7e86c69e28058fdb
-#+opam.d7d5991863f5d361dd2d4708c604e2c8f4dbee0e38d4b0c37c357767ef0d670c
-#+ocaml-topkg.71d55d6fa8cec24438dfd604a1369bfc8241a5dea8d410b8699138c992be64c6
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+ocaml.e01c6e7cb1ca624bacac03edc55c55b9a6304219ae3ada6e8934d363f10ac8a1
+#+ocaml-findlib.0419a1313d543dabb8667b35f836aa831e282cefda4053d4d3dca6b6fc14ecc8
+#+ocamlbuild.0ce66d65ef6f663cecd639341bc9f8bbf01dcb9bfc0c06161125a2bcc86871b1
+#+opam.6f598d4565a48a1ca0806a96ec96f42d0a2dc24df8a1a747a9bae527278c7830
+#+ocaml-topkg.a38a67ad47473118bc992499e25ee1f6a28fa7ca058f5b24c5d703365bcc68d3
 #@untar:-j:sha256:4e547a631c36fbaadff60d3bd7724eb3f83ba274e92fb725950bae7868378582:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-compiler-libs b/variants/ccx-x86_64/ocaml-compiler-libs
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+ocaml.819d781b7986f8a3af9d9cb3060b5cf1321208b6740d9d03edd97f0596c89621
-#+dune.07c387be10443c98f2c7c36eefcbec5c1a42297780842f9ef38224543f148efd
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+ocaml.e01c6e7cb1ca624bacac03edc55c55b9a6304219ae3ada6e8934d363f10ac8a1
+#+dune.efab6b289de62f7228914ec2549a47eb38890a64155b48e7ba452a359850e0d8
 #@untar:-z:sha256:9b9644d7351db699e57ddba7c767bb4153e6e988ccf45ead2fb238a3bd75cdc7:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-cppo b/variants/ccx-x86_64/ocaml-cppo
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+ocaml.819d781b7986f8a3af9d9cb3060b5cf1321208b6740d9d03edd97f0596c89621
-#+dune.07c387be10443c98f2c7c36eefcbec5c1a42297780842f9ef38224543f148efd
-#+ocamlbuild.d94ae3a7969b014bd36247760ec95bf43c7505731854454c7e86c69e28058fdb
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+ocaml.e01c6e7cb1ca624bacac03edc55c55b9a6304219ae3ada6e8934d363f10ac8a1
+#+dune.efab6b289de62f7228914ec2549a47eb38890a64155b48e7ba452a359850e0d8
+#+ocamlbuild.0ce66d65ef6f663cecd639341bc9f8bbf01dcb9bfc0c06161125a2bcc86871b1
 #@untar:-z:sha256:6e62a8ee0217c9cc38d5860110eb18eb8d89c05c420353d298e1431fe8bac00f:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-findlib b/variants/ccx-x86_64/ocaml-findlib
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+m4.13e8f64dca14c47846841a8a697180a2fe96d777a0f56f5e52079761eb6b79aa
-#+netbsd-curses.e6b1c154d24c1cf1781cf720256a4184804e971c6073afacddc92c7caa52a5d2
-#+ocaml.819d781b7986f8a3af9d9cb3060b5cf1321208b6740d9d03edd97f0596c89621
-#+ocamlbuild.d94ae3a7969b014bd36247760ec95bf43c7505731854454c7e86c69e28058fdb
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+m4.3bd69e2dd42ef971ed64b42d4d396a042ea9e223d89a4ab70c526474b3383357
+#+netbsd-curses.bf4eecfaddc5b1d3e169b3263d19694230c7606aa4e969f60a19084363c042bf
+#+ocaml.e01c6e7cb1ca624bacac03edc55c55b9a6304219ae3ada6e8934d363f10ac8a1
+#+ocamlbuild.0ce66d65ef6f663cecd639341bc9f8bbf01dcb9bfc0c06161125a2bcc86871b1
 #@untar:-z:sha256:662c910f774e9fee3a19c4e057f380581ab2fc4ee52da4761304ac9c31b8869d:.
 
 
@@ -53,7 +53,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/home/ccx/versions/musl.d828e4f6cb803b5cd778bf063a4ea6455e0eec6251844c9d88f69a3fab854167/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/home/ccx/versions/musl.4b712e00a652ccacd250921a5a78218a958b086bb86791ccc8ec65cd67a66969/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
 			return 0
 			;;
 		(*)
@@ -79,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.819d781b7986f8a3af9d9cb3060b5cf1321208b6740d9d03edd97f0596c89621"
+stdlib="$pthbs_destdir/home/ccx/versions/ocaml.e01c6e7cb1ca624bacac03edc55c55b9a6304219ae3ada6e8934d363f10ac8a1"
 mkdir -p "${stdlib%/*}"
 ln -s "$pthbs_package" "$stdlib"
 make install prefix="$pthbs_destdir"
diff --git a/variants/ccx-x86_64/ocaml-fmt b/variants/ccx-x86_64/ocaml-fmt
@@ -1,40 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+ocaml.819d781b7986f8a3af9d9cb3060b5cf1321208b6740d9d03edd97f0596c89621
-#+ocaml-findlib.d77882ca74d1e97ca0c6c4c3c7618b642d4000139e1599187f2fe5566ea592ae
-#+ocamlbuild.d94ae3a7969b014bd36247760ec95bf43c7505731854454c7e86c69e28058fdb
-#+opam.d7d5991863f5d361dd2d4708c604e2c8f4dbee0e38d4b0c37c357767ef0d670c
-#+ocaml-topkg.71d55d6fa8cec24438dfd604a1369bfc8241a5dea8d410b8699138c992be64c6
-#+ocaml-cmdliner.92737db390965bd7fe0c40def6cb2251eda1a019f3376cb334d2abf51285ed25
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+ocaml.e01c6e7cb1ca624bacac03edc55c55b9a6304219ae3ada6e8934d363f10ac8a1
+#+ocaml-findlib.0419a1313d543dabb8667b35f836aa831e282cefda4053d4d3dca6b6fc14ecc8
+#+ocamlbuild.0ce66d65ef6f663cecd639341bc9f8bbf01dcb9bfc0c06161125a2bcc86871b1
+#+opam.6f598d4565a48a1ca0806a96ec96f42d0a2dc24df8a1a747a9bae527278c7830
+#+ocaml-topkg.a38a67ad47473118bc992499e25ee1f6a28fa7ca058f5b24c5d703365bcc68d3
+#+ocaml-cmdliner.460132bcbfaa2cd6295fde6597838e2cd90a3e7eae2cb288ab588479e5800a0c
 #@untar:-j:sha256:857cfd47a54b52429cd9b3e2665e44173cd1bd3b435bece7172f984ad5376a1b:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-fpath b/variants/ccx-x86_64/ocaml-fpath
@@ -1,40 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+ocaml.819d781b7986f8a3af9d9cb3060b5cf1321208b6740d9d03edd97f0596c89621
-#+ocaml-findlib.d77882ca74d1e97ca0c6c4c3c7618b642d4000139e1599187f2fe5566ea592ae
-#+ocamlbuild.d94ae3a7969b014bd36247760ec95bf43c7505731854454c7e86c69e28058fdb
-#+opam.d7d5991863f5d361dd2d4708c604e2c8f4dbee0e38d4b0c37c357767ef0d670c
-#+ocaml-topkg.71d55d6fa8cec24438dfd604a1369bfc8241a5dea8d410b8699138c992be64c6
-#+ocaml-astring.c044a84ccd61a03909641109fcee246e9ffd728716b7934738aca4e2349f5bad
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+ocaml.e01c6e7cb1ca624bacac03edc55c55b9a6304219ae3ada6e8934d363f10ac8a1
+#+ocaml-findlib.0419a1313d543dabb8667b35f836aa831e282cefda4053d4d3dca6b6fc14ecc8
+#+ocamlbuild.0ce66d65ef6f663cecd639341bc9f8bbf01dcb9bfc0c06161125a2bcc86871b1
+#+opam.6f598d4565a48a1ca0806a96ec96f42d0a2dc24df8a1a747a9bae527278c7830
+#+ocaml-topkg.a38a67ad47473118bc992499e25ee1f6a28fa7ca058f5b24c5d703365bcc68d3
+#+ocaml-astring.b1e69e91e2f1e0b8be2b9bccc2d55b24c0a0f8cd84581fcb1cc3a4a42176ddff
 #@untar:-j:sha256:12b08ff192d037d9b6d69e9ca19d1d385184f20b3237c27231e437ac81ace70f:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-logs b/variants/ccx-x86_64/ocaml-logs
@@ -1,42 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+ocaml.819d781b7986f8a3af9d9cb3060b5cf1321208b6740d9d03edd97f0596c89621
-#+ocaml-findlib.d77882ca74d1e97ca0c6c4c3c7618b642d4000139e1599187f2fe5566ea592ae
-#+ocamlbuild.d94ae3a7969b014bd36247760ec95bf43c7505731854454c7e86c69e28058fdb
-#+opam.d7d5991863f5d361dd2d4708c604e2c8f4dbee0e38d4b0c37c357767ef0d670c
-#+ocaml-topkg.71d55d6fa8cec24438dfd604a1369bfc8241a5dea8d410b8699138c992be64c6
-#+ocaml-mtime.a0f9dc0ecc4c6f2cc1dc67c4b6c3f0cefdeda601fc6aac5aef8cde8d55778b2f
-#+ocaml-cmdliner.92737db390965bd7fe0c40def6cb2251eda1a019f3376cb334d2abf51285ed25
-#+ocaml-fmt.fcaff54a36e62e3641e2c35e9a12aea37072f5ee95b698a35d0a57bd208e31be
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+ocaml.e01c6e7cb1ca624bacac03edc55c55b9a6304219ae3ada6e8934d363f10ac8a1
+#+ocaml-findlib.0419a1313d543dabb8667b35f836aa831e282cefda4053d4d3dca6b6fc14ecc8
+#+ocamlbuild.0ce66d65ef6f663cecd639341bc9f8bbf01dcb9bfc0c06161125a2bcc86871b1
+#+opam.6f598d4565a48a1ca0806a96ec96f42d0a2dc24df8a1a747a9bae527278c7830
+#+ocaml-topkg.a38a67ad47473118bc992499e25ee1f6a28fa7ca058f5b24c5d703365bcc68d3
+#+ocaml-mtime.94363d62cec112a10379f99d192c6d33ea5118f611a26e912a343e9617788828
+#+ocaml-cmdliner.460132bcbfaa2cd6295fde6597838e2cd90a3e7eae2cb288ab588479e5800a0c
+#+ocaml-fmt.2e8687a4a408d6ff5cfd236c18f090896c1c2bf12f9ac2c6dc0b970c7e09a721
 #@untar:-j:sha256:ee97065ba41ce28f19dea9453c6bec4e0ef26165ad7394c4131ea0c65c0f06d5:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-lun b/variants/ccx-x86_64/ocaml-lun
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+ocaml.819d781b7986f8a3af9d9cb3060b5cf1321208b6740d9d03edd97f0596c89621
-#+dune.07c387be10443c98f2c7c36eefcbec5c1a42297780842f9ef38224543f148efd
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+ocaml.e01c6e7cb1ca624bacac03edc55c55b9a6304219ae3ada6e8934d363f10ac8a1
+#+dune.efab6b289de62f7228914ec2549a47eb38890a64155b48e7ba452a359850e0d8
 #@untar:-j:sha256:cca8badff83b470fdcfb1840116f8e8a6f2cb86cde2f44ed28cf26cbf692a793:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-mtime b/variants/ccx-x86_64/ocaml-mtime
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+ocaml.819d781b7986f8a3af9d9cb3060b5cf1321208b6740d9d03edd97f0596c89621
-#+ocaml-findlib.d77882ca74d1e97ca0c6c4c3c7618b642d4000139e1599187f2fe5566ea592ae
-#+ocamlbuild.d94ae3a7969b014bd36247760ec95bf43c7505731854454c7e86c69e28058fdb
-#+opam.d7d5991863f5d361dd2d4708c604e2c8f4dbee0e38d4b0c37c357767ef0d670c
-#+ocaml-topkg.71d55d6fa8cec24438dfd604a1369bfc8241a5dea8d410b8699138c992be64c6
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+ocaml.e01c6e7cb1ca624bacac03edc55c55b9a6304219ae3ada6e8934d363f10ac8a1
+#+ocaml-findlib.0419a1313d543dabb8667b35f836aa831e282cefda4053d4d3dca6b6fc14ecc8
+#+ocamlbuild.0ce66d65ef6f663cecd639341bc9f8bbf01dcb9bfc0c06161125a2bcc86871b1
+#+opam.6f598d4565a48a1ca0806a96ec96f42d0a2dc24df8a1a747a9bae527278c7830
+#+ocaml-topkg.a38a67ad47473118bc992499e25ee1f6a28fa7ca058f5b24c5d703365bcc68d3
 #@untar:-j:sha256:097cb2802e3701ead9572e1b483d5a28c6e2f0a39449faaf9b44ad8a89834d88:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-ppx_derivers b/variants/ccx-x86_64/ocaml-ppx_derivers
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+ocaml.819d781b7986f8a3af9d9cb3060b5cf1321208b6740d9d03edd97f0596c89621
-#+dune.07c387be10443c98f2c7c36eefcbec5c1a42297780842f9ef38224543f148efd
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+ocaml.e01c6e7cb1ca624bacac03edc55c55b9a6304219ae3ada6e8934d363f10ac8a1
+#+dune.efab6b289de62f7228914ec2549a47eb38890a64155b48e7ba452a359850e0d8
 #@untar:-z:sha256:b6595ee187dea792b31fc54a0e1524ab1e48bc6068d3066c45215a138cc73b95:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-ppx_deriving b/variants/ccx-x86_64/ocaml-ppx_deriving
@@ -1,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+ocaml.819d781b7986f8a3af9d9cb3060b5cf1321208b6740d9d03edd97f0596c89621
-#+dune.07c387be10443c98f2c7c36eefcbec5c1a42297780842f9ef38224543f148efd
-#+ocaml-compiler-libs.517cb333370862e627b7203057bcfbbfd025b5672e56041ae1458df48ccb4b59
-#+ocaml-cppo.bd8a02089c2dc53ffc2f3f4792eecd32e415c802dc25d735d67ab69de100fd8a
-#+ocaml-findlib.d77882ca74d1e97ca0c6c4c3c7618b642d4000139e1599187f2fe5566ea592ae
-#+ocaml-ppx_derivers.864c322ddfa27674093dc36edc370d99e9e43e2fd333887ef075215c6a156efd
-#+ocaml-ppxlib.eba577c6f7d5ec6ba3e75d68303c9e7cd46ab8f941990599d433b0cef87a134a
-#+ocaml-sexplib0.22f238dc32e9b0012c988abfe8a2573f67d4a2e0bd2c3e810133e7ba3e84831c
-#+ocaml-stdlib-shims.7b2069cac9bf660ddffb83716ef0fde78a53b3fc61b75d378f23e425668ef0c0
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+ocaml.e01c6e7cb1ca624bacac03edc55c55b9a6304219ae3ada6e8934d363f10ac8a1
+#+dune.efab6b289de62f7228914ec2549a47eb38890a64155b48e7ba452a359850e0d8
+#+ocaml-compiler-libs.9d68cfe208948618ffbd13846ca0ebbae160d785afbe1f4639e924043f88aca6
+#+ocaml-cppo.402d24f431118782c9a8533d7707ded5b30f6c0a59cd55da69e7a26fd34cc338
+#+ocaml-findlib.0419a1313d543dabb8667b35f836aa831e282cefda4053d4d3dca6b6fc14ecc8
+#+ocaml-ppx_derivers.06bacc045542905f99b35ba74ccc668b5cb809032eac6ef03c0346468eabb3ba
+#+ocaml-ppxlib.248d7ae91e428833fc1a9a032be6cfc8c3e933101949a2bf2fc0258fd04cc67f
+#+ocaml-sexplib0.c8a4364d34980f6d157c6804150cb79abc16387499049b17ea3627ab13bef4a2
+#+ocaml-stdlib-shims.c1b5b673b6cd8ecdd8e326589da917763d454871a45ecba0d25105fa68fd0668
 #@untar:-z:sha256:c91d1ea5e15e6928a2f8947dbd135b9f765cc0e2d72be271427981afcd350c24:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-ppxlib b/variants/ccx-x86_64/ocaml-ppxlib
@@ -1,40 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+ocaml.819d781b7986f8a3af9d9cb3060b5cf1321208b6740d9d03edd97f0596c89621
-#+dune.07c387be10443c98f2c7c36eefcbec5c1a42297780842f9ef38224543f148efd
-#+ocaml-compiler-libs.517cb333370862e627b7203057bcfbbfd025b5672e56041ae1458df48ccb4b59
-#+ocaml-ppx_derivers.864c322ddfa27674093dc36edc370d99e9e43e2fd333887ef075215c6a156efd
-#+ocaml-sexplib0.22f238dc32e9b0012c988abfe8a2573f67d4a2e0bd2c3e810133e7ba3e84831c
-#+ocaml-stdlib-shims.7b2069cac9bf660ddffb83716ef0fde78a53b3fc61b75d378f23e425668ef0c0
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+ocaml.e01c6e7cb1ca624bacac03edc55c55b9a6304219ae3ada6e8934d363f10ac8a1
+#+dune.efab6b289de62f7228914ec2549a47eb38890a64155b48e7ba452a359850e0d8
+#+ocaml-compiler-libs.9d68cfe208948618ffbd13846ca0ebbae160d785afbe1f4639e924043f88aca6
+#+ocaml-ppx_derivers.06bacc045542905f99b35ba74ccc668b5cb809032eac6ef03c0346468eabb3ba
+#+ocaml-sexplib0.c8a4364d34980f6d157c6804150cb79abc16387499049b17ea3627ab13bef4a2
+#+ocaml-stdlib-shims.c1b5b673b6cd8ecdd8e326589da917763d454871a45ecba0d25105fa68fd0668
 #@untar:-j:sha256:2e223837e7cecc3bc84a432432c0a72f4e1d5be9165c9c33772f156db85db0b3:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-rresult b/variants/ccx-x86_64/ocaml-rresult
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+ocaml.819d781b7986f8a3af9d9cb3060b5cf1321208b6740d9d03edd97f0596c89621
-#+ocaml-findlib.d77882ca74d1e97ca0c6c4c3c7618b642d4000139e1599187f2fe5566ea592ae
-#+ocamlbuild.d94ae3a7969b014bd36247760ec95bf43c7505731854454c7e86c69e28058fdb
-#+opam.d7d5991863f5d361dd2d4708c604e2c8f4dbee0e38d4b0c37c357767ef0d670c
-#+ocaml-topkg.71d55d6fa8cec24438dfd604a1369bfc8241a5dea8d410b8699138c992be64c6
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+ocaml.e01c6e7cb1ca624bacac03edc55c55b9a6304219ae3ada6e8934d363f10ac8a1
+#+ocaml-findlib.0419a1313d543dabb8667b35f836aa831e282cefda4053d4d3dca6b6fc14ecc8
+#+ocamlbuild.0ce66d65ef6f663cecd639341bc9f8bbf01dcb9bfc0c06161125a2bcc86871b1
+#+opam.6f598d4565a48a1ca0806a96ec96f42d0a2dc24df8a1a747a9bae527278c7830
+#+ocaml-topkg.a38a67ad47473118bc992499e25ee1f6a28fa7ca058f5b24c5d703365bcc68d3
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-sexplib0 b/variants/ccx-x86_64/ocaml-sexplib0
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+ocaml.819d781b7986f8a3af9d9cb3060b5cf1321208b6740d9d03edd97f0596c89621
-#+dune.07c387be10443c98f2c7c36eefcbec5c1a42297780842f9ef38224543f148efd
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+ocaml.e01c6e7cb1ca624bacac03edc55c55b9a6304219ae3ada6e8934d363f10ac8a1
+#+dune.efab6b289de62f7228914ec2549a47eb38890a64155b48e7ba452a359850e0d8
 #@untar:-z:sha256:86dba26468194512f789f2fb709063515a9cb4e5c4461c021c239a369590701d:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-stdlib-shims b/variants/ccx-x86_64/ocaml-stdlib-shims
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+ocaml.819d781b7986f8a3af9d9cb3060b5cf1321208b6740d9d03edd97f0596c89621
-#+dune.07c387be10443c98f2c7c36eefcbec5c1a42297780842f9ef38224543f148efd
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+ocaml.e01c6e7cb1ca624bacac03edc55c55b9a6304219ae3ada6e8934d363f10ac8a1
+#+dune.efab6b289de62f7228914ec2549a47eb38890a64155b48e7ba452a359850e0d8
 #@untar:-j:sha256:babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-topkg b/variants/ccx-x86_64/ocaml-topkg
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+ocaml.819d781b7986f8a3af9d9cb3060b5cf1321208b6740d9d03edd97f0596c89621
-#+ocaml-findlib.d77882ca74d1e97ca0c6c4c3c7618b642d4000139e1599187f2fe5566ea592ae
-#+ocamlbuild.d94ae3a7969b014bd36247760ec95bf43c7505731854454c7e86c69e28058fdb
-#+opam.d7d5991863f5d361dd2d4708c604e2c8f4dbee0e38d4b0c37c357767ef0d670c
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+ocaml.e01c6e7cb1ca624bacac03edc55c55b9a6304219ae3ada6e8934d363f10ac8a1
+#+ocaml-findlib.0419a1313d543dabb8667b35f836aa831e282cefda4053d4d3dca6b6fc14ecc8
+#+ocamlbuild.0ce66d65ef6f663cecd639341bc9f8bbf01dcb9bfc0c06161125a2bcc86871b1
+#+opam.6f598d4565a48a1ca0806a96ec96f42d0a2dc24df8a1a747a9bae527278c7830
 #@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.819d781b7986f8a3af9d9cb3060b5cf1321208b6740d9d03edd97f0596c89621
-#+dune.07c387be10443c98f2c7c36eefcbec5c1a42297780842f9ef38224543f148efd
-#+ocamlbuild.d94ae3a7969b014bd36247760ec95bf43c7505731854454c7e86c69e28058fdb
-#+ocaml-base.e2d5a70ac56557f4c03b691d27581b8575c8085112a1527f5319103ab6403b5c
-#+opam.d7d5991863f5d361dd2d4708c604e2c8f4dbee0e38d4b0c37c357767ef0d670c
-#+ocaml-bos.e59c1c9b19bf9fab7d25aeff065f703d5a30424370de7a52907f28771db1d5a8
-#+ocaml-lun.3b4b8174dd22a58b0764632af89aa9b81d1f632faae6999d07a5187023ab1aa9
-#+ocaml-ppx_deriving.9551a6621239a207915eb2e0fff4649364377b1d2c60167f066b20abd73816cb-
\ No newline at end of file
+#+ocaml.e01c6e7cb1ca624bacac03edc55c55b9a6304219ae3ada6e8934d363f10ac8a1
+#+dune.efab6b289de62f7228914ec2549a47eb38890a64155b48e7ba452a359850e0d8
+#+ocamlbuild.0ce66d65ef6f663cecd639341bc9f8bbf01dcb9bfc0c06161125a2bcc86871b1
+#+ocaml-base.cd39e270d304c6a27f41243c0b076f6687586afa0ae0d8ae7c3b38f28a4e590f
+#+opam.6f598d4565a48a1ca0806a96ec96f42d0a2dc24df8a1a747a9bae527278c7830
+#+ocaml-bos.16a85635bfaf1d5c4845839828dd5751dc93f30c395173300faca83ed4073180
+#+ocaml-lun.736cbf653af3bcfe796cd542d35340536ad5136d15b8bef383199727495503b7
+#+ocaml-ppx_deriving.761f3b2360bfd161cdf05f269cc415970637f398a635c1c2845e536a8edf4ca3+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/ocaml:dynlink b/variants/ccx-x86_64/ocaml:dynlink
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+m4.13e8f64dca14c47846841a8a697180a2fe96d777a0f56f5e52079761eb6b79aa
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+m4.3bd69e2dd42ef971ed64b42d4d396a042ea9e223d89a4ab70c526474b3383357
 #@untar:-J:sha256:dfaa8a2e11c799bc1765d8bef44911406ee5f4803027190382a939f88c912266:.
 
 
@@ -62,9 +62,10 @@ autotools_config_static() {
 build_env_dynamic() {
 	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
 	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library.so"
 	export CPATH="$pthbs_build_environment/include"
 	export LDFLAGS="-L$pthbs_build_environment/library.so $LDFLAGS"
+	export LIBRARY_PATH="$pthbs_build_environment/library.so:$LIBRARY_PATH"
+	LIBRARY_PATH=${LIBRARY_PATH%:}
 }
 
 prefix=/home/ccx/versions/$pthbs_package
diff --git a/variants/ccx-x86_64/ocaml_intrinsics_kernel b/variants/ccx-x86_64/ocaml_intrinsics_kernel
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+ocaml.819d781b7986f8a3af9d9cb3060b5cf1321208b6740d9d03edd97f0596c89621
-#+dune.07c387be10443c98f2c7c36eefcbec5c1a42297780842f9ef38224543f148efd
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+ocaml.e01c6e7cb1ca624bacac03edc55c55b9a6304219ae3ada6e8934d363f10ac8a1
+#+dune.efab6b289de62f7228914ec2549a47eb38890a64155b48e7ba452a359850e0d8
 #@untar:-z:sha256:c988b7769a59749631c3c98ba5edd1d2fe91f5dc380b5e0593c073c92f4bee01:.
 
 
diff --git a/variants/ccx-x86_64/ocamlbuild b/variants/ccx-x86_64/ocamlbuild
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+m4.13e8f64dca14c47846841a8a697180a2fe96d777a0f56f5e52079761eb6b79aa
-#+ocaml.819d781b7986f8a3af9d9cb3060b5cf1321208b6740d9d03edd97f0596c89621
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+m4.3bd69e2dd42ef971ed64b42d4d396a042ea9e223d89a4ab70c526474b3383357
+#+ocaml.e01c6e7cb1ca624bacac03edc55c55b9a6304219ae3ada6e8934d363f10ac8a1
 #@untar:-z:sha256:2ba6857f2991b7f69368e8db818b163d31cf5a367f15f5953bf8f01a77b3d4fc:.
 
 
@@ -51,7 +51,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/home/ccx/versions/musl.d828e4f6cb803b5cd778bf063a4ea6455e0eec6251844c9d88f69a3fab854167/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/home/ccx/versions/musl.4b712e00a652ccacd250921a5a78218a958b086bb86791ccc8ec65cd67a66969/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
 			return 0
 			;;
 		(*)
@@ -75,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.819d781b7986f8a3af9d9cb3060b5cf1321208b6740d9d03edd97f0596c89621"
+stdlib="$pthbs_destdir/home/ccx/versions/ocaml.e01c6e7cb1ca624bacac03edc55c55b9a6304219ae3ada6e8934d363f10ac8a1"
 mkdir -p "${stdlib%/*}"
 ln -s "$pthbs_package" "$stdlib"
 
diff --git a/variants/ccx-x86_64/oldbootstrap.environment b/variants/ccx-x86_64/oldbootstrap.environment
@@ -1,5 +1,5 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3cee246e09c72f86b6e714fb4b4557dc2f9ee571084f716bbcb612fa8ebd3deb
-#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
-#+gnu-make.b7cde92a7edabca3a8e00739fed6aaa5533d94f74d290dff8ce739ffef9171b5
-#+musl-cross-make.a92bd0a73a662b4ebb61cd88fa1f6d034a327326d3a9d0f0040cc87ed97e5cb3-
\ No newline at end of file
+#+busybox.f26f17d6b39529e6faba81d3296ee8b543f18f1d6417de3fb643b497f9f7dbca
+#+nawk.b1d41648e3331f461db172fca1ad98cd8da92077bb3abb107a581f6dd2b5bbfa
+#+gnu-make.a3596a3a78160446705972f45fdfefa8b7529275cd23e67891db41713c920975
+#+musl-cross-make.d903f7566ce74e61dc3c4873651fe5f229f21b7b98426c73a8918b5e9d68324c+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/oldsystem.environment b/variants/ccx-x86_64/oldsystem.environment
@@ -1,4 +1,4 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.e6726ea29e8b7fe316c8a30b8a500f73aab8cf8c862a1bcd575d50b3265dd793
-#+busybox.03aafd6784fbaf10998bbada115afc6987a8bd0eef274b3bd154ffcbdc937789
-#+gnu-make.d59adbd7109f94fce8999fa5d07408a4f6e0a904eee0f1fb6d23063b79b5fa9c-
\ No newline at end of file
+#+musl-cross-make.881a7e5ccca8d906a570a92378e03d43b936a4f9ca607adf8bfc8255fdc341f3
+#+busybox.e28fbff834d8cfea38011161a44941e09cf4ae8225588a41b4322ebdc86c7d47
+#+gnu-make.f1f353a7999eb6a98248452ecdf2455af5c651a1fb79a0123ebca4297dc24012+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/opam b/variants/ccx-x86_64/opam
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+diffutils.b4a300af866981068118991b7efd5d100083350978a91dd7a30d0352a63c3967
-#+patch.930184dce3e1dbdfbf8ac1ccbcb3ab728cc22196e7459af586877968909a0543
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+getconf.421b3925fecf41d2e530f184ad54ad4eb74edd93f0aaab32b4712fff0c0c914d
-#+ocaml.819d781b7986f8a3af9d9cb3060b5cf1321208b6740d9d03edd97f0596c89621
-#+dune.07c387be10443c98f2c7c36eefcbec5c1a42297780842f9ef38224543f148efd
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+diffutils.2609f4ea58052c7e64af9aa6798a2b3a8a201ab3289c7f48676c85e36c9fbfe0
+#+patch.f9af9058385753a59f5f726db36eb7a83c7693dd3f87907691614dd77f622534
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+getconf.9185b07ead0b64f38c1693fe656b3e59f2408b786db5d4ad6bdc541ba1b403a6
+#+ocaml.e01c6e7cb1ca624bacac03edc55c55b9a6304219ae3ada6e8934d363f10ac8a1
+#+dune.efab6b289de62f7228914ec2549a47eb38890a64155b48e7ba452a359850e0d8
 #@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:.
 
 
@@ -72,7 +72,7 @@ export DUNE_CACHE=disabled
 	--infodir="$prefix/info" \
 	--localedir="$prefix/locale" \
 	--localstatedir='/var/pthbs' \
-	--with-dune='/home/ccx/versions/dune.07c387be10443c98f2c7c36eefcbec5c1a42297780842f9ef38224543f148efd/command/dune' \
+	--with-dune='/home/ccx/versions/dune.efab6b289de62f7228914ec2549a47eb38890a64155b48e7ba452a359850e0d8/command/dune' \
 	--with-mccs \
 	--with-vendored-deps \
 	--enable-static
diff --git a/variants/ccx-x86_64/patch b/variants/ccx-x86_64/patch
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+m4.13e8f64dca14c47846841a8a697180a2fe96d777a0f56f5e52079761eb6b79aa
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+m4.3bd69e2dd42ef971ed64b42d4d396a042ea9e223d89a4ab70c526474b3383357
 #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:.
 
 
@@ -60,10 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/pkgconf b/variants/ccx-x86_64/pkgconf
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+m4.13e8f64dca14c47846841a8a697180a2fe96d777a0f56f5e52079761eb6b79aa
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+m4.3bd69e2dd42ef971ed64b42d4d396a042ea9e223d89a4ab70c526474b3383357
 #@untar:-J:sha256:3a224f2accf091b77a5781316e27b9ee3ba82c083cc2e539e08940b68a44fec5:.
 
 
@@ -60,10 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
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.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+pkgconf.c3cd1f9116833fb97127792dd0a5b8c7dccd0c50731ddc2d11b3e609c50aceb3
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+pkgconf.8ed9be0c5b7b9e8683ed13d43e848f66159f82bb44d77b9cd2f894c0190277be
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/popt b/variants/ccx-x86_64/popt
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+m4.13e8f64dca14c47846841a8a697180a2fe96d777a0f56f5e52079761eb6b79aa
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+m4.3bd69e2dd42ef971ed64b42d4d396a042ea9e223d89a4ab70c526474b3383357
 #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:.
 
 
@@ -60,10 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
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.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+zsh.fcfc54f4ac311f948cfc2406559ef99ab8dac08eb0beed43b9b337082535bb97
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+zsh.2cb2e0585ce2058c4cf69794bd14e9d84c9f93437a1fc66cdaf3c2e396e37cd8
 #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall
 
 
diff --git a/variants/ccx-x86_64/pthbs-sandbox-rootns b/variants/ccx-x86_64/pthbs-sandbox-rootns
@@ -1,10 +1,10 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
-#+execline.dcc4d1547d9927e4a41bc28ae51ac1667791a3cb51a3d4e210e7bc0e4ec9328f
-#+lnstools.f1b8af57f9a3f0324508771413c79dfebba84f6b8503c56241af85a2bf6e81ef
-#+sandbox_rootfs.1b77f57dc69d19ee3056840b0ea5a674575a0b854b2f528d7c0f40079b5c27d7
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+nawk.b1d41648e3331f461db172fca1ad98cd8da92077bb3abb107a581f6dd2b5bbfa
+#+execline.2075994f3301cddd481893f1b4d42b819cc263684d20748db55ceb5463dc3800
+#+lnstools.251b100ce1b402437099bf7eea1a05e04cfc40887edf285e62595eeb69dd02cb
+#+sandbox_rootfs.d0ef4d2755e4998040cf18c68fd85c1003459a846d05ca952632ace8e631918e
 #@sha256:b85634a91129f85a5aad5cae51d4084dd7ce62544b5585f0899058576c16451f:abspaths.awk
 #@sha256:0fb30f66e4b58fd8ffc2027b1aae646fa7583d3d72136a7d1e7c6c498b93cf1e:sandbox-rootns.in
 
diff --git a/variants/ccx-x86_64/rsync b/variants/ccx-x86_64/rsync
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+m4.13e8f64dca14c47846841a8a697180a2fe96d777a0f56f5e52079761eb6b79aa
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+popt.e093851a56b97f927e4a978d50def07c1b893b49b80d87369e982e3bbe64378a
-#+libressl.4a59407f93a86c2bab70daaed9958b39daf97f238f1e6ae269ddda85bce9fbb5
-#+zstd.8bd51affe68613292d100159bd8a6c511a3baa7667d329be44ab6a017107c7b8
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+m4.3bd69e2dd42ef971ed64b42d4d396a042ea9e223d89a4ab70c526474b3383357
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+popt.f3993e92d1f0d34d438ba3061d6b0e791d3ea14ea8e83e54630dffd853d3bf17
+#+libressl.5220a49e3b686e5776e80491a62ead7cdf5a4dc4e22a1e1383724aa811826ad3
+#+zstd.bf9212fdc735903c1ef7409a8f4e0639faf27b9aff11feca6e35f4f84b0710c9
 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:.
 
 
@@ -63,10 +63,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/s6 b/variants/ccx-x86_64/s6
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+skalibs.7f2610571321bf6ff32187e4720b1f4d7bdeab2163da455e07e75549b216fbe8
-#+execline.9a580cb41e897f8c4616ced5d0341954fadb2dd4a5b514934616c5c503fc082d
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+skalibs.513c9f46b250859f980edc5e4ab5de6aac0497533a1644f8f70c2c1afc815eb6
+#+execline.8015583ca9fa606067d748c308753b8d9caaa1f4d78bb8a48d17346362b6c7c7
 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6
 
 
@@ -47,7 +47,7 @@ cd 's6'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.7f2610571321bf6ff32187e4720b1f4d7bdeab2163da455e07e75549b216fbe8/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.513c9f46b250859f980edc5e4ab5de6aac0497533a1644f8f70c2c1afc815eb6/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/ccx-x86_64/s6-dns b/variants/ccx-x86_64/s6-dns
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+skalibs.7f2610571321bf6ff32187e4720b1f4d7bdeab2163da455e07e75549b216fbe8
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+skalibs.513c9f46b250859f980edc5e4ab5de6aac0497533a1644f8f70c2c1afc815eb6
 #@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns
 
 
@@ -46,7 +46,7 @@ cd 's6-dns'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.7f2610571321bf6ff32187e4720b1f4d7bdeab2163da455e07e75549b216fbe8/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.513c9f46b250859f980edc5e4ab5de6aac0497533a1644f8f70c2c1afc815eb6/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/ccx-x86_64/s6-linux-init b/variants/ccx-x86_64/s6-linux-init
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+skalibs.7f2610571321bf6ff32187e4720b1f4d7bdeab2163da455e07e75549b216fbe8
-#+execline.9a580cb41e897f8c4616ced5d0341954fadb2dd4a5b514934616c5c503fc082d
-#+s6.c57430ab256e3869863e62c5bb25648fedcd64f7f7c7457dbac241125ada2f7a
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+skalibs.513c9f46b250859f980edc5e4ab5de6aac0497533a1644f8f70c2c1afc815eb6
+#+execline.8015583ca9fa606067d748c308753b8d9caaa1f4d78bb8a48d17346362b6c7c7
+#+s6.bf276ad2b4dffc5d18ec04cb80e448f9bf1e59d99803e840b450c8fda7b99e3f
 #@git:b298e515efe16210048e504e3aec89ea1e627b73:s6-linux-init
 
 
@@ -48,7 +48,7 @@ cd 's6-linux-init'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.7f2610571321bf6ff32187e4720b1f4d7bdeab2163da455e07e75549b216fbe8/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.513c9f46b250859f980edc5e4ab5de6aac0497533a1644f8f70c2c1afc815eb6/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/ccx-x86_64/s6-linux-utils b/variants/ccx-x86_64/s6-linux-utils
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+skalibs.7f2610571321bf6ff32187e4720b1f4d7bdeab2163da455e07e75549b216fbe8
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+skalibs.513c9f46b250859f980edc5e4ab5de6aac0497533a1644f8f70c2c1afc815eb6
 #@git:a9e7acac41a8854546246dd39cb4daee54ead2cb:s6-linux-utils
 
 
@@ -46,7 +46,7 @@ cd 's6-linux-utils'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.7f2610571321bf6ff32187e4720b1f4d7bdeab2163da455e07e75549b216fbe8/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.513c9f46b250859f980edc5e4ab5de6aac0497533a1644f8f70c2c1afc815eb6/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/ccx-x86_64/s6-networking b/variants/ccx-x86_64/s6-networking
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+skalibs.7f2610571321bf6ff32187e4720b1f4d7bdeab2163da455e07e75549b216fbe8
-#+execline.9a580cb41e897f8c4616ced5d0341954fadb2dd4a5b514934616c5c503fc082d
-#+s6.c57430ab256e3869863e62c5bb25648fedcd64f7f7c7457dbac241125ada2f7a
-#+s6-dns.daa5a6b2fbcfb606be9faed18ddb9a36ff9a62c5e74e579ea8094a30f93b953d
-#+libressl.4a59407f93a86c2bab70daaed9958b39daf97f238f1e6ae269ddda85bce9fbb5
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+skalibs.513c9f46b250859f980edc5e4ab5de6aac0497533a1644f8f70c2c1afc815eb6
+#+execline.8015583ca9fa606067d748c308753b8d9caaa1f4d78bb8a48d17346362b6c7c7
+#+s6.bf276ad2b4dffc5d18ec04cb80e448f9bf1e59d99803e840b450c8fda7b99e3f
+#+s6-dns.6d26c22bf69b5330a4d59cacc710c342968f2b60c9627c898383de945999f992
+#+libressl.5220a49e3b686e5776e80491a62ead7cdf5a4dc4e22a1e1383724aa811826ad3
 #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking
 
 
@@ -50,7 +50,7 @@ cd 's6-networking'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.7f2610571321bf6ff32187e4720b1f4d7bdeab2163da455e07e75549b216fbe8/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.513c9f46b250859f980edc5e4ab5de6aac0497533a1644f8f70c2c1afc815eb6/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/ccx-x86_64/s6-portable-utils b/variants/ccx-x86_64/s6-portable-utils
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+skalibs.7f2610571321bf6ff32187e4720b1f4d7bdeab2163da455e07e75549b216fbe8
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+skalibs.513c9f46b250859f980edc5e4ab5de6aac0497533a1644f8f70c2c1afc815eb6
 #@git:dc96d8a020e83b16dd7a8bd093bdb00ab2b944c0:s6-portable-utils
 
 
@@ -46,7 +46,7 @@ cd 's6-portable-utils'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.7f2610571321bf6ff32187e4720b1f4d7bdeab2163da455e07e75549b216fbe8/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.513c9f46b250859f980edc5e4ab5de6aac0497533a1644f8f70c2c1afc815eb6/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/ccx-x86_64/s6-rc b/variants/ccx-x86_64/s6-rc
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+skalibs.7f2610571321bf6ff32187e4720b1f4d7bdeab2163da455e07e75549b216fbe8
-#+execline.9a580cb41e897f8c4616ced5d0341954fadb2dd4a5b514934616c5c503fc082d
-#+s6.c57430ab256e3869863e62c5bb25648fedcd64f7f7c7457dbac241125ada2f7a
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+skalibs.513c9f46b250859f980edc5e4ab5de6aac0497533a1644f8f70c2c1afc815eb6
+#+execline.8015583ca9fa606067d748c308753b8d9caaa1f4d78bb8a48d17346362b6c7c7
+#+s6.bf276ad2b4dffc5d18ec04cb80e448f9bf1e59d99803e840b450c8fda7b99e3f
 #@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc
 
 
@@ -48,7 +48,7 @@ cd 's6-rc'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.7f2610571321bf6ff32187e4720b1f4d7bdeab2163da455e07e75549b216fbe8/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.513c9f46b250859f980edc5e4ab5de6aac0497533a1644f8f70c2c1afc815eb6/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/sandbox_rootfs b/variants/ccx-x86_64/sandbox_rootfs
@@ -1,19 +1,17 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
-#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
-#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
-#+skalibs.d1ff8cdcea9d046498fa6d934eac84fb74629f477532b3480ad1b38b794db050
+#+musl-cross-make.7fc68aacf3c3af5e943bf800f4927f49f0ccf4a9bc5f424ff037ac513a258553
+#+gnu-make.2c3345112e9f2486d0d450f9f3e3da34c00d6d91d901bb8857cc2e4e75a43078
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+nawk.b1d41648e3331f461db172fca1ad98cd8da92077bb3abb107a581f6dd2b5bbfa
+#+skalibs.a8a00a264036f872341516bbcba7047e02664ec28a6c610f432c571b446ea720
 #@sha256:8d716caa5ea940bbbb8f68ac0907cea36773c183bd4c1eebad030f6cc7deaec9:argv0exec.c
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/sandbox_rootns.environment b/variants/ccx-x86_64/sandbox_rootns.environment
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+lnstools.f1b8af57f9a3f0324508771413c79dfebba84f6b8503c56241af85a2bf6e81ef
-#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+execline.dcc4d1547d9927e4a41bc28ae51ac1667791a3cb51a3d4e210e7bc0e4ec9328f
-#+sandbox_rootfs.1b77f57dc69d19ee3056840b0ea5a674575a0b854b2f528d7c0f40079b5c27d7
-#+pthbs-sandbox-rootns.f237ee255ebb738e252fe1bd01691f3cf2eaad422a2efc67203ddda8915f6b87-
\ No newline at end of file
+#+lnstools.251b100ce1b402437099bf7eea1a05e04cfc40887edf285e62595eeb69dd02cb
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+execline.2075994f3301cddd481893f1b4d42b819cc263684d20748db55ceb5463dc3800
+#+sandbox_rootfs.d0ef4d2755e4998040cf18c68fd85c1003459a846d05ca952632ace8e631918e
+#+pthbs-sandbox-rootns.517a36bb0cfefdced9e768554d20d72e01f0cd61f6042438cda4c26cba33c482+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/skalibs b/variants/ccx-x86_64/skalibs
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
 #@git:96b537f42695da1b865588baf591fdfcae76bd41:skalibs
 
 
diff --git a/variants/ccx-x86_64/skalibs:bootstrap b/variants/ccx-x86_64/skalibs:bootstrap
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
-#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
-#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
-#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
+#+musl-cross-make.7fc68aacf3c3af5e943bf800f4927f49f0ccf4a9bc5f424ff037ac513a258553
+#+gnu-make.2c3345112e9f2486d0d450f9f3e3da34c00d6d91d901bb8857cc2e4e75a43078
+#+busybox.d698919d45c5a364a88b03c7e96273bb1396c49bb6b81ea6f9d4577cd9568667
+#+nawk.b1d41648e3331f461db172fca1ad98cd8da92077bb3abb107a581f6dd2b5bbfa
 #@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.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+zsh.fcfc54f4ac311f948cfc2406559ef99ab8dac08eb0beed43b9b337082535bb97
-#+pthbs-banginstall.f1d73070c78f925ef111e3802e934ca20663bfd59af29c362fcf3e8e7b437312
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+zsh.2cb2e0585ce2058c4cf69794bd14e9d84c9f93437a1fc66cdaf3c2e396e37cd8
+#+pthbs-banginstall.8746c2e75c56ad9ad12a0a5951c510bb34b76e5be8406c7492602cb9c108ab82
 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep
 
 
diff --git a/variants/ccx-x86_64/squashfs-tools b/variants/ccx-x86_64/squashfs-tools
@@ -1,47 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+attr.cc743930379984ea8211162cc6dc1df60701028be18d32084f3ea8120578164f
-#+zstd.8bd51affe68613292d100159bd8a6c511a3baa7667d329be44ab6a017107c7b8
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+attr.dac6f74379e4c8704c6854d770487956a0c2b8416e5fe87b0a7c34a226d8d0d7
+#+zstd.bf9212fdc735903c1ef7409a8f4e0639faf27b9aff11feca6e35f4f84b0710c9
 #@untar:-z:sha256:4672b5c47d9418d3a5ae5b243defc6d9eae8275b9771022247c6a6082c815914:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/strace b/variants/ccx-x86_64/strace
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+m4.13e8f64dca14c47846841a8a697180a2fe96d777a0f56f5e52079761eb6b79aa
-#+patch.930184dce3e1dbdfbf8ac1ccbcb3ab728cc22196e7459af586877968909a0543
-#+libunwind.da8ae3a54c4d1faf893633d6f78e7da845826b26d8714a8297101f06f199d2f6
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+m4.3bd69e2dd42ef971ed64b42d4d396a042ea9e223d89a4ab70c526474b3383357
+#+patch.f9af9058385753a59f5f726db36eb7a83c7693dd3f87907691614dd77f622534
+#+libunwind.760a174393c761e21e0452f7b7a7e19db9ad90eafdf41056c41d4977ac233b75
 #@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch
 #@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:.
 
@@ -63,10 +63,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
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.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-dosfstools.9b3057bd3af0689982eeeeafd40976da6de22eb582f2a3113d7d40cbaed47387
-#+busybox-e2fsprogs.ed89377fdda3b4950ccbb22377346f587ae861c320318d2818a6d9bfe8c2fd7c
-#+busybox-iproute2.42cdfdcc9c3785b3005d73132f3186d37a75a6c0238b1abba2702a30186846a1
-#+busybox-iputils.aea3097879e47c1808fe7cec01f6aaaa0cf18f47e5218755697682af064f1a32
-#+busybox-net-misc.ccb6419806ff5bb640d862cc6d91b2c5c11c586e2b60e5b6cf9cc5e2ae3c7fbb
-#+busybox-net-tools.fdeca83091d03c43b9951558f0df781b9be09e166be6c601ffcc80547855dca3
-#+busybox-traceroute.9cc6e884e825a2e1447cf5488411a1a5f7d7a9435dc5d9a61a2640ad3824ed0f
-#+busybox-wget.8b4a52293c1e9437934f47ce634ef8698c1137d922111cab5ac56759d6180947
-#+busybox-chpst.69b7af983aa39943d7050c9c4e32ccf75687ba2002bbdb1b8d433ff1ab25e9e8
-#+busybox-console.7a0d8889d218addd1685e9b8a2437cadde35698c8e186bae9478424d62c14774
-#+busybox-getty.2c2f385504144928a2624a9e53c0851a5404627280fcc2b335af279ad8a155d1
-
-#+busybox-linux-extra.9a986cfce35706fc44a78b86ffba66eb2e7970512ecb90a4fe5adc935db2cbf7
-#+busybox-mtd-utils.37b9aa531f31ef29cacd4a2f44760986bc407aeb2fcc563b169300746605cf7a
-#+busybox-shadow.5505514d1291925f05d21e765451c06c91362afa571e9ff4d6aff1ec94bca161
-#+busybox-su.d583ac9e406459e8ca84c788770a6d9aa3f8dc94b353b3d05016ae437341b780
-#+busybox-util-linux-priv.385943a04498e4d2f929f7f354cf2233694b0794e63e9cd7ce57632f5143acd5
-#+busybox-logging.160c10a45c118945fbaa98289b93fa07ef32a24ff3997693f8d2027247b7f352
-#+busybox-cron.3831dc78a22400d6c5c9375955bd4e347ec269d52771209c2fe5e2ad17a6f67a
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+diffutils.b4a300af866981068118991b7efd5d100083350978a91dd7a30d0352a63c3967
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+aat.df4591e3e70168d854451ab3cfbfd995b2a6d36869c403c9377604b9660c907b
-#+fileset.bcb24cd2f464a965593d550faa9b0332b348465485c9e04bc18ec5d8d4c408c9
-#+rsync.31f320cbeaff5420d78cb5dd43af6670a003ad3527bff54127d8e4b9a361860c
-#+execline.9a580cb41e897f8c4616ced5d0341954fadb2dd4a5b514934616c5c503fc082d
-#+kbd.33a84d699390a01841425081cef62f4e27c77ade33819c3d6f962d29e9d69a37
-#+mdevd.b79b7bebdd6ad63d1c8d55835f21727f1074ce56b0ef6cb1923eae49f3fb3554
-#+s6-linux-utils.d9bd02a7e3f804e52f5c9633ef27e7907c90e2eb7f9a72616d0128864fc84b05
-#+s6-rc.f8fbc4b3393b1dd7815e91805063c8df18a4d572f2a067a7b7fb2f11190526cc
-#+s6.c57430ab256e3869863e62c5bb25648fedcd64f7f7c7457dbac241125ada2f7a
-#+zsh.fcfc54f4ac311f948cfc2406559ef99ab8dac08eb0beed43b9b337082535bb97
-#+libcgroup.07a386da05ea2b6a38054c74a0f5aeb62b75482ae1940c4b8b7033eab8f4a290
-#+system-config-scripts.a3110e35cac245ded94e710295f9cfc51150beae495bbd0ef270544c64726146
-#+logincaps.c5c16c0ac4a0503c0143f0c383434e635e16586dcbe2bf78bc25c66d8e281421
-#+busybox.c6b6443b5623b38e0a8ecc5840aabdf6abfb2163181801f84f344072c0386312
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-dosfstools.0511d5c82da793363dcb0e46e42a266c2b7d1c337f361446a1c7c960951efd38
+#+busybox-e2fsprogs.42cd012d3b2b80507a138d59f23a83b3f1fa05861cffd479626d123d7e263a4d
+#+busybox-iproute2.350839a016a508830f23c6d06d1cceeb913d6ac735216ce48a4e7e5508c36b57
+#+busybox-iputils.8124e5a0cd596e3f4cac4e75f8e319c457b96ad423550ea4b30d2199cd7ef1b9
+#+busybox-net-misc.06a71e639b39b572bf62cdaf7f924df4a0a98cf54756121f5877bb3d7d18b674
+#+busybox-net-tools.693d34ee5d3d30af40fd6d778618d63cca52e898d3e37bcc7214896bd68c6933
+#+busybox-traceroute.b16257a0cb0d0e8eaf67f1058f8828ad2264217e3883e82d509e84a102a2bc26
+#+busybox-wget.63aea650c8ec578590609ec90516a948a9596866c99237c13d3adf11e45d1cc1
+#+busybox-chpst.bd2cbd7fb8931418573d407e76bd0788a668ec9537d365fc0f7cbdb6e98c8476
+#+busybox-console.a19d5faff0a876c303cd60021283a14a0244a7212ea09cd91e92fb6dd27353ab
+#+busybox-getty.f5432b352d1835f45f2e15df4c09116a7551163891d148fd07f79af034bbddc7
+
+#+busybox-linux-extra.38485b5c5a4f61f328032d0e01a2dbe62e863d1c1da7f8f0a6d1769929ced1f2
+#+busybox-mtd-utils.ef4e23042fc20a1c2f33b521310f9a520afa3baf8584f55b2340a876fc822a6b
+#+busybox-shadow.c1755eb505cfb497436463fcbf63ce0847c770d6d6694a0ff569b1ba1a59ca62
+#+busybox-su.6b08d544f03c997e05bd58336ec3214f94bf3f7d144d2f430fb30a5238c69343
+#+busybox-util-linux-priv.dfe1bb37dcd5a3e7b29f6e0d9733ece5eba031249453f29d8e6a56af4055da52
+#+busybox-logging.8964b9d3e85a11ed014de8db28128272a44b8790bb32ef517161be263a2bf3f6
+#+busybox-cron.662bf9740d863cb722d6c23b293a45815c071708e0e43aa0959def005916e66d
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+diffutils.2609f4ea58052c7e64af9aa6798a2b3a8a201ab3289c7f48676c85e36c9fbfe0
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+aat.78fc4dcc45dc49b8392491ed8579d15437eb800fbca1ebb5a2084c7b604c7cca
+#+fileset.5f1592137625bcdbd74e791d49ae603899537c5c27f1f71b3fe2aed7c6e47295
+#+rsync.7aa279b369e7b8c6f1cdf6717c0935314361130c5df23b732a25882e439880e0
+#+execline.8015583ca9fa606067d748c308753b8d9caaa1f4d78bb8a48d17346362b6c7c7
+#+kbd.b2b201014481fd3a74bfd2af36d396e2063614104c56cb0b542f34db8de65467
+#+mdevd.218bf6fd3b48c0d6fb430ace17cabaa19add5d98479ec2f80a17a26ab5a6cd7e
+#+s6-linux-utils.794cb960490318677884fd5bc560d35a15d413c51bfff2617f24adfe244bbb4d
+#+s6-rc.f43022841ced67ea526b0c40649b5e9a9c00c7e769a8f5158a98824ea9ae15cd
+#+s6.bf276ad2b4dffc5d18ec04cb80e448f9bf1e59d99803e840b450c8fda7b99e3f
+#+zsh.2cb2e0585ce2058c4cf69794bd14e9d84c9f93437a1fc66cdaf3c2e396e37cd8
+#+libcgroup.c4f51204c6f1cd3b894aac47197ee2438071ccce94935e68e3699f62b3f6ec95
+#+system-config-scripts.d12c5dcb3d8c52356e47177a5cce88f61d47406eb657e30a18b8107a914a2f4a
+#+logincaps.8b2fa97a7dd2f849df85f44aa0d88abd22ec65960177eba575fd8fa4f05ea056
+#+busybox.7d6fa3654618b0a2d27c9b173c6c4b73edbe793a3c2ef3a9536924751758c8de
 #@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.32f77d2783130f2c2dc1f19824f64f26c65c3a75e98a1a408cc0a8d4013632f4' \
-	'pthbs_path_mdevd=/home/ccx/versions/env.ecbc61ab8ddf0737769c2d71139aa51727552156e579653036df3c5fbb6b697b' \
+	'pthbs_path_containers=/home/ccx/versions/env.bb9cfb423933802c47b437fa2e931054e632c2e42dbe7260b962de75d0c9e105' \
+	'pthbs_path_mdevd=/home/ccx/versions/env.4aa5e7d17650d96f50da23f1862d7d495b94f2f1e9e8df1b05ca2091d45a53af' \
 	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.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-dosfstools.9b3057bd3af0689982eeeeafd40976da6de22eb582f2a3113d7d40cbaed47387
-#+busybox-e2fsprogs.ed89377fdda3b4950ccbb22377346f587ae861c320318d2818a6d9bfe8c2fd7c
-#+busybox-iproute2.42cdfdcc9c3785b3005d73132f3186d37a75a6c0238b1abba2702a30186846a1
-#+busybox-iputils.aea3097879e47c1808fe7cec01f6aaaa0cf18f47e5218755697682af064f1a32
-#+busybox-net-misc.ccb6419806ff5bb640d862cc6d91b2c5c11c586e2b60e5b6cf9cc5e2ae3c7fbb
-#+busybox-net-tools.fdeca83091d03c43b9951558f0df781b9be09e166be6c601ffcc80547855dca3
-#+busybox-traceroute.9cc6e884e825a2e1447cf5488411a1a5f7d7a9435dc5d9a61a2640ad3824ed0f
-#+busybox-wget.8b4a52293c1e9437934f47ce634ef8698c1137d922111cab5ac56759d6180947
-#+busybox-chpst.69b7af983aa39943d7050c9c4e32ccf75687ba2002bbdb1b8d433ff1ab25e9e8
-#+busybox-console.7a0d8889d218addd1685e9b8a2437cadde35698c8e186bae9478424d62c14774
-#+busybox-getty.2c2f385504144928a2624a9e53c0851a5404627280fcc2b335af279ad8a155d1
-
-#+busybox-linux-extra.9a986cfce35706fc44a78b86ffba66eb2e7970512ecb90a4fe5adc935db2cbf7
-#+busybox-mtd-utils.37b9aa531f31ef29cacd4a2f44760986bc407aeb2fcc563b169300746605cf7a
-#+busybox-shadow.5505514d1291925f05d21e765451c06c91362afa571e9ff4d6aff1ec94bca161
-#+busybox-su.d583ac9e406459e8ca84c788770a6d9aa3f8dc94b353b3d05016ae437341b780
-#+busybox-util-linux-priv.385943a04498e4d2f929f7f354cf2233694b0794e63e9cd7ce57632f5143acd5
-#+busybox-logging.160c10a45c118945fbaa98289b93fa07ef32a24ff3997693f8d2027247b7f352
-#+busybox-cron.3831dc78a22400d6c5c9375955bd4e347ec269d52771209c2fe5e2ad17a6f67a
-#+s6.c57430ab256e3869863e62c5bb25648fedcd64f7f7c7457dbac241125ada2f7a
-#+s6-rc.f8fbc4b3393b1dd7815e91805063c8df18a4d572f2a067a7b7fb2f11190526cc
-#+s6-portable-utils.c8c1f0dff642bcbbc1bb07bc0bed9f642344bcc85c3ac3eb67c081c1342dc1b1
-#+s6-linux-init.ad954e5fd8d69ae5b5d88312cc6d91b06bddee80444aa0dd3cb59358ebee6c61
-#+execline.9a580cb41e897f8c4616ced5d0341954fadb2dd4a5b514934616c5c503fc082d
-#+system-config-rc.f6ae1e98cc8b0b2d0832376a251b5f0d3f2ee8eaca2de93980c1c3144ee9ac07
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-dosfstools.0511d5c82da793363dcb0e46e42a266c2b7d1c337f361446a1c7c960951efd38
+#+busybox-e2fsprogs.42cd012d3b2b80507a138d59f23a83b3f1fa05861cffd479626d123d7e263a4d
+#+busybox-iproute2.350839a016a508830f23c6d06d1cceeb913d6ac735216ce48a4e7e5508c36b57
+#+busybox-iputils.8124e5a0cd596e3f4cac4e75f8e319c457b96ad423550ea4b30d2199cd7ef1b9
+#+busybox-net-misc.06a71e639b39b572bf62cdaf7f924df4a0a98cf54756121f5877bb3d7d18b674
+#+busybox-net-tools.693d34ee5d3d30af40fd6d778618d63cca52e898d3e37bcc7214896bd68c6933
+#+busybox-traceroute.b16257a0cb0d0e8eaf67f1058f8828ad2264217e3883e82d509e84a102a2bc26
+#+busybox-wget.63aea650c8ec578590609ec90516a948a9596866c99237c13d3adf11e45d1cc1
+#+busybox-chpst.bd2cbd7fb8931418573d407e76bd0788a668ec9537d365fc0f7cbdb6e98c8476
+#+busybox-console.a19d5faff0a876c303cd60021283a14a0244a7212ea09cd91e92fb6dd27353ab
+#+busybox-getty.f5432b352d1835f45f2e15df4c09116a7551163891d148fd07f79af034bbddc7
+
+#+busybox-linux-extra.38485b5c5a4f61f328032d0e01a2dbe62e863d1c1da7f8f0a6d1769929ced1f2
+#+busybox-mtd-utils.ef4e23042fc20a1c2f33b521310f9a520afa3baf8584f55b2340a876fc822a6b
+#+busybox-shadow.c1755eb505cfb497436463fcbf63ce0847c770d6d6694a0ff569b1ba1a59ca62
+#+busybox-su.6b08d544f03c997e05bd58336ec3214f94bf3f7d144d2f430fb30a5238c69343
+#+busybox-util-linux-priv.dfe1bb37dcd5a3e7b29f6e0d9733ece5eba031249453f29d8e6a56af4055da52
+#+busybox-logging.8964b9d3e85a11ed014de8db28128272a44b8790bb32ef517161be263a2bf3f6
+#+busybox-cron.662bf9740d863cb722d6c23b293a45815c071708e0e43aa0959def005916e66d
+#+s6.bf276ad2b4dffc5d18ec04cb80e448f9bf1e59d99803e840b450c8fda7b99e3f
+#+s6-rc.f43022841ced67ea526b0c40649b5e9a9c00c7e769a8f5158a98824ea9ae15cd
+#+s6-portable-utils.6a2e677060877bab203317a15f71dde089bf2a0af12bb32fd59486ff0dd6b7ff
+#+s6-linux-init.81dd822df62f7156893815f0565bcd218763e19ab598ebe83ccdfd63acf94631
+#+execline.8015583ca9fa606067d748c308753b8d9caaa1f4d78bb8a48d17346362b6c7c7
+#+system-config-rc.e809b942b02a39158a1a97c03035d96bf46e1e8490a2c78903a488f22624032d
 
 
 # - build script start -
@@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-s6rcdb=/home/ccx/versions/system-config-rc.f6ae1e98cc8b0b2d0832376a251b5f0d3f2ee8eaca2de93980c1c3144ee9ac07/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.e809b942b02a39158a1a97c03035d96bf46e1e8490a2c78903a488f22624032d/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.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+s6-rc.f8fbc4b3393b1dd7815e91805063c8df18a4d572f2a067a7b7fb2f11190526cc
-#+fileset.bcb24cd2f464a965593d550faa9b0332b348465485c9e04bc18ec5d8d4c408c9
-#+system-config.66975cf360621a11c95e95daf32201fcd7ff9b23d5cf158a8395443b8418b6f1
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+s6-rc.f43022841ced67ea526b0c40649b5e9a9c00c7e769a8f5158a98824ea9ae15cd
+#+fileset.5f1592137625bcdbd74e791d49ae603899537c5c27f1f71b3fe2aed7c6e47295
+#+system-config.9dd621f06e1de18617c10f1847a26fef6df2ef306474cb305b55c7ed432ed6b8
 
 
 # - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-src=/home/ccx/versions/system-config.66975cf360621a11c95e95daf32201fcd7ff9b23d5cf158a8395443b8418b6f1/config/s6-rc-source
+src=/home/ccx/versions/system-config.9dd621f06e1de18617c10f1847a26fef6df2ef306474cb305b55c7ed432ed6b8/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.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+zsh.fcfc54f4ac311f948cfc2406559ef99ab8dac08eb0beed43b9b337082535bb97
-#+pthbs-banginstall.f1d73070c78f925ef111e3802e934ca20663bfd59af29c362fcf3e8e7b437312
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+zsh.2cb2e0585ce2058c4cf69794bd14e9d84c9f93437a1fc66cdaf3c2e396e37cd8
+#+pthbs-banginstall.8746c2e75c56ad9ad12a0a5951c510bb34b76e5be8406c7492602cb9c108ab82
 #@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.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+zsh.fcfc54f4ac311f948cfc2406559ef99ab8dac08eb0beed43b9b337082535bb97
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+zsh.2cb2e0585ce2058c4cf69794bd14e9d84c9f93437a1fc66cdaf3c2e396e37cd8
 #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh
 
 
diff --git a/variants/ccx-x86_64/tinyssh b/variants/ccx-x86_64/tinyssh
@@ -1,45 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
 #@untar:-z:sha256:f3ae622c765db4e0d791ea90a9feba39d7f693ef9cb949a797f7ad6b404a2d61:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/toolchain.environment b/variants/ccx-x86_64/toolchain.environment
@@ -1,4 +1,4 @@
 #!/usr/bin/env pthbs-build
-#+musl.d828e4f6cb803b5cd778bf063a4ea6455e0eec6251844c9d88f69a3fab854167
-#+gcc.c3f94cf4e0f94f41a7eedde398b97f44313b54c79897d3aecbc69ba0bc9aea5f
-#+binutils.65dbf67be4f2300d50f411d71f488260cbcd1f9ee8e0120c6d3f2ce189c81edb-
\ No newline at end of file
+#+musl.4b712e00a652ccacd250921a5a78218a958b086bb86791ccc8ec65cd67a66969
+#+gcc.e3e7331a4724016f587eadd32d9aa9d5bb534593f087650310fcebd85c81e371
+#+binutils.8a6500689d23271c44c4597f3828d4a17919584c204e5d71085ade6f894d838d+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/user-env b/variants/ccx-x86_64/user-env
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+execline.9a580cb41e897f8c4616ced5d0341954fadb2dd4a5b514934616c5c503fc082d
-#+pthbs-banginstall.f1d73070c78f925ef111e3802e934ca20663bfd59af29c362fcf3e8e7b437312
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+execline.8015583ca9fa606067d748c308753b8d9caaa1f4d78bb8a48d17346362b6c7c7
+#+pthbs-banginstall.8746c2e75c56ad9ad12a0a5951c510bb34b76e5be8406c7492602cb9c108ab82
 #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env
 
 
diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment
@@ -1,91 +1,91 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-dosfstools.9b3057bd3af0689982eeeeafd40976da6de22eb582f2a3113d7d40cbaed47387
-#+busybox-e2fsprogs.ed89377fdda3b4950ccbb22377346f587ae861c320318d2818a6d9bfe8c2fd7c
-#+busybox-iproute2.42cdfdcc9c3785b3005d73132f3186d37a75a6c0238b1abba2702a30186846a1
-#+busybox-iputils.aea3097879e47c1808fe7cec01f6aaaa0cf18f47e5218755697682af064f1a32
-#+busybox-net-misc.ccb6419806ff5bb640d862cc6d91b2c5c11c586e2b60e5b6cf9cc5e2ae3c7fbb
-#+busybox-net-tools.fdeca83091d03c43b9951558f0df781b9be09e166be6c601ffcc80547855dca3
-#+busybox-traceroute.9cc6e884e825a2e1447cf5488411a1a5f7d7a9435dc5d9a61a2640ad3824ed0f
-#+busybox-wget.8b4a52293c1e9437934f47ce634ef8698c1137d922111cab5ac56759d6180947
-#+busybox-chpst.69b7af983aa39943d7050c9c4e32ccf75687ba2002bbdb1b8d433ff1ab25e9e8
-#+busybox-console.7a0d8889d218addd1685e9b8a2437cadde35698c8e186bae9478424d62c14774
-#+busybox-getty.2c2f385504144928a2624a9e53c0851a5404627280fcc2b335af279ad8a155d1
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-dosfstools.0511d5c82da793363dcb0e46e42a266c2b7d1c337f361446a1c7c960951efd38
+#+busybox-e2fsprogs.42cd012d3b2b80507a138d59f23a83b3f1fa05861cffd479626d123d7e263a4d
+#+busybox-iproute2.350839a016a508830f23c6d06d1cceeb913d6ac735216ce48a4e7e5508c36b57
+#+busybox-iputils.8124e5a0cd596e3f4cac4e75f8e319c457b96ad423550ea4b30d2199cd7ef1b9
+#+busybox-net-misc.06a71e639b39b572bf62cdaf7f924df4a0a98cf54756121f5877bb3d7d18b674
+#+busybox-net-tools.693d34ee5d3d30af40fd6d778618d63cca52e898d3e37bcc7214896bd68c6933
+#+busybox-traceroute.b16257a0cb0d0e8eaf67f1058f8828ad2264217e3883e82d509e84a102a2bc26
+#+busybox-wget.63aea650c8ec578590609ec90516a948a9596866c99237c13d3adf11e45d1cc1
+#+busybox-chpst.bd2cbd7fb8931418573d407e76bd0788a668ec9537d365fc0f7cbdb6e98c8476
+#+busybox-console.a19d5faff0a876c303cd60021283a14a0244a7212ea09cd91e92fb6dd27353ab
+#+busybox-getty.f5432b352d1835f45f2e15df4c09116a7551163891d148fd07f79af034bbddc7
 
-#+busybox-linux-extra.9a986cfce35706fc44a78b86ffba66eb2e7970512ecb90a4fe5adc935db2cbf7
-#+busybox-mtd-utils.37b9aa531f31ef29cacd4a2f44760986bc407aeb2fcc563b169300746605cf7a
-#+busybox-shadow.5505514d1291925f05d21e765451c06c91362afa571e9ff4d6aff1ec94bca161
-#+busybox-su.d583ac9e406459e8ca84c788770a6d9aa3f8dc94b353b3d05016ae437341b780
-#+busybox-util-linux-priv.385943a04498e4d2f929f7f354cf2233694b0794e63e9cd7ce57632f5143acd5
-#+busybox-logging.160c10a45c118945fbaa98289b93fa07ef32a24ff3997693f8d2027247b7f352
-#+busybox-cron.3831dc78a22400d6c5c9375955bd4e347ec269d52771209c2fe5e2ad17a6f67a
-#+attr.cc743930379984ea8211162cc6dc1df60701028be18d32084f3ea8120578164f
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+diffutils.b4a300af866981068118991b7efd5d100083350978a91dd7a30d0352a63c3967
-#+patch.930184dce3e1dbdfbf8ac1ccbcb3ab728cc22196e7459af586877968909a0543
-#+flex.b91fd0bbc76abf76c0368bf4f5b4b19c3a643eb531725abdbe295e4f78d5d471
-#+bison.38041d5aa8dabf9daf6903deb39cef07a6cbcce24000a78f274198ce32d303fc
-#+rsync.31f320cbeaff5420d78cb5dd43af6670a003ad3527bff54127d8e4b9a361860c
-#+execline.9a580cb41e897f8c4616ced5d0341954fadb2dd4a5b514934616c5c503fc082d
-#+s6.c57430ab256e3869863e62c5bb25648fedcd64f7f7c7457dbac241125ada2f7a
-#+s6-rc.f8fbc4b3393b1dd7815e91805063c8df18a4d572f2a067a7b7fb2f11190526cc
-#+s6-portable-utils.c8c1f0dff642bcbbc1bb07bc0bed9f642344bcc85c3ac3eb67c081c1342dc1b1
-#+s6-linux-utils.d9bd02a7e3f804e52f5c9633ef27e7907c90e2eb7f9a72616d0128864fc84b05
-#+s6-linux-init.ad954e5fd8d69ae5b5d88312cc6d91b06bddee80444aa0dd3cb59358ebee6c61
-#+mdevd.b79b7bebdd6ad63d1c8d55835f21727f1074ce56b0ef6cb1923eae49f3fb3554
-#+s6-dns.daa5a6b2fbcfb606be9faed18ddb9a36ff9a62c5e74e579ea8094a30f93b953d
-#+libressl.4a59407f93a86c2bab70daaed9958b39daf97f238f1e6ae269ddda85bce9fbb5
-#+s6-networking.4619cbf31883f0eb83f2284060752de4be472181e5eced9f7c3e053de817f23f
-#+zsh.fcfc54f4ac311f948cfc2406559ef99ab8dac08eb0beed43b9b337082535bb97
-#+pthbs-banginstall.f1d73070c78f925ef111e3802e934ca20663bfd59af29c362fcf3e8e7b437312
-#+aat.df4591e3e70168d854451ab3cfbfd995b2a6d36869c403c9377604b9660c907b
-#+confz.3298fbb58ac255be5f137645e88568ca62cbb26f7fbe53b57d52486728211352
-#+containers.208229e381817d6203fb5a9ec96bf658ba3d4c7e90f0dbe22feeaac876b30858
-#+fileset.bcb24cd2f464a965593d550faa9b0332b348465485c9e04bc18ec5d8d4c408c9
-#+logincaps.c5c16c0ac4a0503c0143f0c383434e635e16586dcbe2bf78bc25c66d8e281421
-#+snaprep.0757ca3b09fceb5866ce1529fc789bd7338a864ad0eb6f00604ca5cf3b7a8f50
-#+curl.e37c6ee555052a6b9fcac6dceae7014ec5935e12679bc5205f109786b33c2a8e
-#+git.86ba30522dba0c89b33e3c26bd9ec0bc642016a59295778f9e915d05ccd24ba7
-#+xbps.aa21c50c81629365c03a2529a67af5b03d3dad9eb4a511575009c5f0447a6722
-#+apk-tools.f9406c59592f516d703fe7270a0c7e9d7aea762c4af215d21df42e721a954f51
-#+getent.995a31c4652f3450cc7d1a1cd118576157c7cd4e79485a69438df17c48e70810
-#+getconf.421b3925fecf41d2e530f184ad54ad4eb74edd93f0aaab32b4712fff0c0c914d
-#+iconv.181dd6d5d32da8501a6bc3064e51f66948015a53b6f668bb4ccd9aeccda0e0f0
-#+libcap.8b9b94ff01e70717816b90ca878449aab38863bfcda5eb041e16b143c9ef9a77
-#+applyuidgid-caps.1fe7ed735185f4d206f3a1a4311118e0767bea2dd731b59ebf50da4be2daf690
-#+ccx-utils.6a649c5a8cafa805be7b50623c4d96b074f33c280aba7e94cdd53a1f8690bfa1
-#+user-env.a5bbf392f749cdb3f7991400b37721a2fba43a0599450b3e47f4956ed404c501
-#+strace.77d07a44faa33b457e3dfa3837d1ead59a88afb323737c6e0960c954c84af8a3
-#+mlog.70368f1db8153bccb367e479ebafcd2dc664ba61858e119ababf71f2d7433790
-#+findutils.a29215d76b3963477109d40bddac471025f3a033c6d5b7c7941b44cb52e0ef91
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+nvi.b0a4e25d19d47bb783232f159e124829f25247c89214ab6c448c24758e641dda
-#+squashfs-tools.c35a0cc584090c3ae9002843fc43240f0427510227fdf32a16678c304878ef41
-#+mandoc.64ae1562733424384c284ea7c2c40017addb442421c82768aac558dabca72e08
-#+tinyssh.bd0d6c58bb164b98bcb01f8766fef6c327659a627985c910f49b8f2e7f091562-
\ No newline at end of file
+#+busybox-linux-extra.38485b5c5a4f61f328032d0e01a2dbe62e863d1c1da7f8f0a6d1769929ced1f2
+#+busybox-mtd-utils.ef4e23042fc20a1c2f33b521310f9a520afa3baf8584f55b2340a876fc822a6b
+#+busybox-shadow.c1755eb505cfb497436463fcbf63ce0847c770d6d6694a0ff569b1ba1a59ca62
+#+busybox-su.6b08d544f03c997e05bd58336ec3214f94bf3f7d144d2f430fb30a5238c69343
+#+busybox-util-linux-priv.dfe1bb37dcd5a3e7b29f6e0d9733ece5eba031249453f29d8e6a56af4055da52
+#+busybox-logging.8964b9d3e85a11ed014de8db28128272a44b8790bb32ef517161be263a2bf3f6
+#+busybox-cron.662bf9740d863cb722d6c23b293a45815c071708e0e43aa0959def005916e66d
+#+attr.dac6f74379e4c8704c6854d770487956a0c2b8416e5fe87b0a7c34a226d8d0d7
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+diffutils.2609f4ea58052c7e64af9aa6798a2b3a8a201ab3289c7f48676c85e36c9fbfe0
+#+patch.f9af9058385753a59f5f726db36eb7a83c7693dd3f87907691614dd77f622534
+#+flex.3a3870e15fbc145f3cfb7d5e3040078bfaa096010de16a41fa34be6f6bfde1be
+#+bison.2a6ac34959b39dd064f3e376e1228a841202df5a91f96922ea613a12e4e34067
+#+rsync.7aa279b369e7b8c6f1cdf6717c0935314361130c5df23b732a25882e439880e0
+#+execline.8015583ca9fa606067d748c308753b8d9caaa1f4d78bb8a48d17346362b6c7c7
+#+s6.bf276ad2b4dffc5d18ec04cb80e448f9bf1e59d99803e840b450c8fda7b99e3f
+#+s6-rc.f43022841ced67ea526b0c40649b5e9a9c00c7e769a8f5158a98824ea9ae15cd
+#+s6-portable-utils.6a2e677060877bab203317a15f71dde089bf2a0af12bb32fd59486ff0dd6b7ff
+#+s6-linux-utils.794cb960490318677884fd5bc560d35a15d413c51bfff2617f24adfe244bbb4d
+#+s6-linux-init.81dd822df62f7156893815f0565bcd218763e19ab598ebe83ccdfd63acf94631
+#+mdevd.218bf6fd3b48c0d6fb430ace17cabaa19add5d98479ec2f80a17a26ab5a6cd7e
+#+s6-dns.6d26c22bf69b5330a4d59cacc710c342968f2b60c9627c898383de945999f992
+#+libressl.5220a49e3b686e5776e80491a62ead7cdf5a4dc4e22a1e1383724aa811826ad3
+#+s6-networking.e5b0465819f7a94fc9f6cbc435fbd1f06e4c72fda8389e426c370bfcdae153df
+#+zsh.2cb2e0585ce2058c4cf69794bd14e9d84c9f93437a1fc66cdaf3c2e396e37cd8
+#+pthbs-banginstall.8746c2e75c56ad9ad12a0a5951c510bb34b76e5be8406c7492602cb9c108ab82
+#+aat.78fc4dcc45dc49b8392491ed8579d15437eb800fbca1ebb5a2084c7b604c7cca
+#+confz.8a2e2f9a346883877ffaf0ae1b971be83f7156ccd519f8e3d9d3784504bcbd30
+#+containers.f9ff6f6dc3340ddba74ad26235fd751cd45d2a60e6e49eca1b0ec43fa70b8081
+#+fileset.5f1592137625bcdbd74e791d49ae603899537c5c27f1f71b3fe2aed7c6e47295
+#+logincaps.8b2fa97a7dd2f849df85f44aa0d88abd22ec65960177eba575fd8fa4f05ea056
+#+snaprep.84cf5ac359f3aa70b7a563da9615fe35954619d455913002e9ce7580893c7da9
+#+curl.8e8689858e363de3ab46e8cc697da28880362625bbe498c39e62256dc9bc283d
+#+git.4609b5df59652f9080cc83cfb6b56f56e7817c49fe7e8f24f57c5ac4bbcb9ef3
+#+xbps.ae5801a73321f497b8a78aed24a7393e6635e2296368775e3cd1159bf73a981e
+#+apk-tools.913fb14f40043443c483e9c646882a47b7140f60b6cc9733f5ff6c88851c720d
+#+getent.afee1956bd0a747252b23100c2482116df257c5234cf4590cd5a6a36d2d65fe3
+#+getconf.9185b07ead0b64f38c1693fe656b3e59f2408b786db5d4ad6bdc541ba1b403a6
+#+iconv.c50b208b1a9b65e30e2a66a172e79973a43e153d851e5492bb191eba5539d514
+#+libcap.444bdff77be4de9afde0a7185ff76fd5ff1ed6b1ad640657a4774b8d246a69c9
+#+applyuidgid-caps.5db44969e03e24c29cfe955ca8650ad5d695820e42d91c2038850cf1bda8afe6
+#+ccx-utils.7593c2009473425dd152e2650d4b47b72005dff3aafcb1cc9bedb62adae8af99
+#+user-env.9a6b627b848a333c299dfb3ca86370179cef083124e3c8f0b369d1f279bb086b
+#+strace.8de292185446141c8b47194c4702dae9d74a39ca2be1843992d256bd419b2429
+#+mlog.5ee3104939dd62b85be02700a126e2001543e59c0c668c97c56bfc381190f4d0
+#+findutils.4ca372c5806e835fbb83d9e18972ebed2934bda510401bd2f457222de1892290
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+nvi.7090d6104ce2ab0bb5941c49727796ffb766fd3781454f588ba5b8c5900804d2
+#+squashfs-tools.31c3f975cdbf2297537b1c18a85dd03f75aa769f9e9c9d5c9d1f7dca9a7522d4
+#+mandoc.19a422cd88c7c5ed6e9bcf330aa8e634590df2ad8a1aac1521dac0552f2612df
+#+tinyssh.741229eaaa26db3e95d54a0b69e06579bb896e786a32e93f0789adfd8695675e+
\ 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.2146f6782e67214c7ad7ee82b2c006ba2f2cd852ed4df91c86decd5c41d0e7ae-
\ No newline at end of file
+#+linux-qemu-guest.777a0ba4f6890b1584fd940d2ed5af6e34a390518c7e1b459ab1b5e3a931f8b8+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/xbps b/variants/ccx-x86_64/xbps
@@ -1,47 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+libarchive.0664fb4cd4f59be83b503558d44a1376ec0a2a2bb039c25c447bfacbe1d391e7
-#+libressl.4a59407f93a86c2bab70daaed9958b39daf97f238f1e6ae269ddda85bce9fbb5
-#+pkgconf-pkg-config.746069f838745544ee4125e5e77822aad9f95bad2e65b6be5bb94091d0d70ec6
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+libarchive.c46796dd9ddd90a30b5be821cdd5675ba7d22a1507eabd2aaab7280a1c69b54e
+#+libressl.5220a49e3b686e5776e80491a62ead7cdf5a4dc4e22a1e1383724aa811826ad3
+#+pkgconf-pkg-config.6e835df6aed5c8ad6cea2774f013b169b0d16b07b84112809ed145cb6a3bd7d4
 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/ccx-x86_64/zsh b/variants/ccx-x86_64/zsh
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+m4.13e8f64dca14c47846841a8a697180a2fe96d777a0f56f5e52079761eb6b79aa
-#+netbsd-curses.e6b1c154d24c1cf1781cf720256a4184804e971c6073afacddc92c7caa52a5d2
-#+libbsd.000e5ae05b16275e478cc4907998c98a21cda3cb1c08287c2ecd916684a242be
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+m4.3bd69e2dd42ef971ed64b42d4d396a042ea9e223d89a4ab70c526474b3383357
+#+netbsd-curses.bf4eecfaddc5b1d3e169b3263d19694230c7606aa4e969f60a19084363c042bf
+#+libbsd.fa0683df3ed452bcf343411bcd93ea84c63a183934e3d5a6eaca85965318d2ef
 #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config
 #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:.
 
@@ -63,10 +63,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
@@ -90,6 +88,10 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'zsh-5.9'
 
 
+export CPATH=$pthbs_build_environment/'include'
+export LIBRARY_PATH=$pthbs_build_environment/'library'
+export LD_LIBRARY_PATH=$pthbs_build_environment/'library.so'
+build_env_static
 autotools_config \
 	--enable-datadir="${prefix}" \
 	--enable-datarootdir="${prefix}" \
diff --git a/variants/ccx-x86_64/zstd b/variants/ccx-x86_64/zstd
@@ -1,45 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
-#+busybox-bzip2.20f3978a70f9cae09424a01b80a3b38b110ac011ae565293c36ea7225a94cd60
-#+busybox-gzip.6fa44f4d1e0d207fbedb16233a3cc7b3d853ea0c03c85cfef1902a43f5a686f3
-#+busybox-lzop.01ebe8c7ffd6ee2f7d1ef231adccced175b810bd7ffb10e67c4a32456b85036a
-#+busybox-unzip.42eca3fd7c3992f20eb71d459c1282f40418eefc85424f4a0d31419777205320
-#+busybox-xz.f98aa94a6f86cb56693651392d8b2a3c62bfb99078c97cf75735437a53496589
-#+busybox-cpio.1b53a21f0343c85f1e2e091a1c9adbf9b6e7abadf466499fa08b018ffe99e028
-#+busybox-dpkg.9186f0cd5780689f278fdbc3d35e34fd9310ccc131432da591890e8e5ab83a25
-#+busybox-rpm.d249d82d30d35b94e1b211f5c2bb85f8d38005172ef774f1cf7e7e2136f3f423
-#+busybox-tar.42f1dfcb0f164dfe617c60892bf057f043a82991ab2eba0af7465daeeb7c6df4
-#+busybox-ed.6e3441fbebdc26780adcddecbc709c13b301263efc338cdd2d162d1dc00adb1b
-#+busybox-sed.5ac4b08ff11a5200ed23dca2522def8d15df7aa34140dce3134f31f524ee6c55
-#+busybox-vi.82666bfb3824ec6b03f3d4b26787f1c021ccf81fc261cd59f363ee9644050be1
-#+busybox-xxd.17f1b696388a076cc2bb8e3fa99cc920ee4872ec8411cc4709a196c3136a2a75
-#+busybox-process-extra.793dba853d45d3740688b35b1cffce4aaa55023e5c06b6a89d432a769804287e
-#+busybox-procps.906482b3347e891e8d71b74c5b0b046fc3b0c5de8fe95b2c106f0bddcc8a3f71
-#+busybox-psmisc.22b03b147b2c1cf7de6630792e625dc2b06ea1e443396e70df8162b5b6d86789
-#+busybox-ash.c9ddc3cbba92297d5677114574726efdc94926a4019b34627e7470c92a7af147
-#+busybox-bc.1a94151ae26a93943d1cceb3e6233fb59ca9922f268eff967a8587d8bf3e0443
-#+busybox-coreutils.75cad69a34056e5a270cec8c3eb18265406b921341f11d293dc0af263785d6c2
-#+busybox-coreutils-extra.0945ae53122c3ec7d06203a30d12b585c304ecaade69fde18afd3cad33ec8312
-#+busybox-daemontools.65376a9315008f9d1fda1b43687a095fdf78ec6a9c307d1c65390f93f4a80eb5
-#+busybox-grep.25565e0d2e517a0b8e4cb4319e367fe88ca58870f889c32c57fe9342d1279df3
-#+busybox-misc.1156d48df4f381cc0b5ca7b53a3a9c9caf722ff4ed69852097d9309c56e599a4
-#+busybox-sh.6f4b8733bd762925694227d9b5e081d3464be3a8f2df3291c5ee72ae763eec5c
-#+busybox-util-linux-unpriv.195715c7c1834fc3527899c33cfcccd0c1184aef366a77e42df108528bbef23d
-#+busybox-findutils.66bca60ac3a4d4fe5d269eca3bfa816690b6229c8f3e3492e65246f5f036d0c3
-#+nawk.1e206f2db3b1a33e5f48cc280a7c9f257fb27ee3b02a3532fee1de125a9d8c36
-#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
-#+gnu-make.da3d47e9582e780ee919966cf9fb59cb109c39957d0f2200e466f858487918ac
-#+busybox-diffutils.bc47c38f3cd9b16296b340ec86c0d80499c1e59b1aaa9d48073122f3d5b1966b
+#+busybox.09ff51f16016a2f866147461d4b3a64b81604a3a3470b8b817bd08a643b8515e
+#+busybox-bzip2.724239134117448352b9ec02559b51330a33c310ba851cdafbe86ac224fc03c1
+#+busybox-gzip.16a2f140e75bbfe4804a56102f6a37b13636f2ada8d395da8f9fe1746ad8eb43
+#+busybox-lzop.2ab5ec689bcdbeb9f4f086b5cce86fbb581b10e5aaf01788e1f3e13b16b4ff18
+#+busybox-unzip.7ecbf06199760c1217da2e4483ec65c0ebd6f3c125245c3d0ba9de6ab1f684fe
+#+busybox-xz.08e235aeb7fd19ce0032a7fe88ba786aa18c9271ceb395a0d09e8d4701c650f9
+#+busybox-cpio.abeae7318413ffe24333c04a7641e0f11017da6081fe54e54ce45073cb6cd3dc
+#+busybox-dpkg.b32edf11b54e6acb08bab742bfd511f957bea3bf98646ea6e442d75eb00354f0
+#+busybox-rpm.9a0446f7350181ad12e541ce6529d0e0e43afe16a36f31a2f7e8695c558eefb5
+#+busybox-tar.0f33914b7116bb9fa63141cbceeeae38a9b8d53026259269d47e20133012e2a8
+#+busybox-ed.e3d2e651fcc2841c15f9bd09061b085afde9f98adb62173beec8e8bc1e310f65
+#+busybox-sed.a3f81fb41b568ffe90c6b0f7a8cb782ad0d595c35049c18947c369af826f9771
+#+busybox-vi.d5248797cb46b7ab55a647da8c7712f3f0b9131b40df6aeff8f421694f93b3f1
+#+busybox-xxd.ebbe50c8ba0eb76fe45889db4857b43742ad7c96daaec8d2669da782d81846fa
+#+busybox-process-extra.0c706890d359342b427a6f5a2c2cbcbbfec1dbc9dca1e47257d894b4527969ae
+#+busybox-procps.b0240b00c290c38a240da96acf8243ba4e37dd2c4b9c31632a42277a924f8787
+#+busybox-psmisc.c1ab7ec4f86bd9d772869e97174e9095f99326a155b31ecbade9c8e994cee758
+#+busybox-ash.0e52dac32a0296d04fc78cac9f1499642f25a59fa746a4809981610f523f17ed
+#+busybox-bc.d59ef525520ee95137e8c9deac74f4542be816764a151548dd6f8b74a0ba95ac
+#+busybox-coreutils.d6fef21c4eb6d45f1202f2596bc3e48d1f42c1ad17c9ea667251d79593a89bd9
+#+busybox-coreutils-extra.327ebfdc4f5151ee82188fa07b708fcfae33b2fa6ce126d709a1230f822c407d
+#+busybox-daemontools.ccc048c215aed6eefb3ed921d5e3e4e3419f8c890bd0822431fdef245221e9c1
+#+busybox-grep.33fa65de6d8d0f02555ff6ed8f06a4504a1515d26ffe3a291418c4298d02dbea
+#+busybox-misc.8167fdfa3541b955ebc6fb612043c72d24197492c49de3e310204b8f200ef9bc
+#+busybox-sh.42c039b8d92509c8aa06ec8c03f6eb1d299c24f56d5b1ed826270a1a25ed7b29
+#+busybox-util-linux-unpriv.ddc94e65aabf2954d57f62fcbf1f6aa25155fa950a674429b68054c17f6d7b10
+#+busybox-findutils.38dc820e1c62fc11203c68c8f2ab86e6ef4361f201a0976d2076507691c59f47
+#+nawk.5b7125f68bbe78f3867476f7bcea0ff4c86fe7f135ac97bb8e42a98972741e01
+#+musl-cross-make.b9eb3710c44f0cd81255d09c6c972165ad194a84e48bc633613713b13b5f6c4f
+#+gnu-make.f34fb29d18b08505b6016d9075dade06a3cd4766cf99899638649cfdc28f812e
+#+busybox-diffutils.228d43cc00fde9948ae6260eaad7fa86be6b19998bee7fca3e579bb419897764
 #@untar:-z:sha256:98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/aat b/variants/root-x86_64/aat
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+zsh.395877b10c2159be5ce294fdc0850eac86945d98cc77d48f1f0aaf8593880f0b
-#+pthbs-banginstall.56164df1e8e5fee562e9e72b767fd849d7e67f903182e6a1da7844d2bb23152f
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+zsh.160a511e8dc1104420ffc16e0075e189211ef86b2b546f3e11b3d91e77ee7d91
+#+pthbs-banginstall.97d3b141fd70e66fc59912a95a8ef790d6fd1e3ec5a79972e4cba2a31c62f929
 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat
 
 
diff --git a/variants/root-x86_64/abduco b/variants/root-x86_64/abduco
@@ -1,45 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
 #@git:8c32909a159aaa9484c82b71f05b7a73321eb491:abduco
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
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.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
 #@git:c7b36ed27103ee3f9aa01905ba1fac2d606079cf:alpine-keys
 
 
diff --git a/variants/root-x86_64/apk-tools b/variants/root-x86_64/apk-tools
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+patch.cc1f34666bc1f927fcd2d263904e72cd858aa27c0e8127458b58f0bc97d1e211
-#+libressl.2e473e902dfa0bb7b1d907fdbdb35fb1a59afbfaf749cae6fb1fda22005a3edb
-#+zstd.d0ea2968e51590efb9b5cc00720992ee080a90bcc057dd91b42dbba09aedf488
-#+pkgconf-pkg-config.e94944954818a6069f4d643a0d98553596df133ac8ccd5bc26e1140ce4f45bc2
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+patch.f5939c6363d5747ea877353651eb4a9e5533e2e7471ed211cf69624f32b6fadf
+#+libressl.5f6ce78a162c0f2f1a6ccdf81d96ef3861194e6f0b7543f244c67f709183e058
+#+zstd.d808a868880fd7a702a898794c87cadf8523ef55a88bec1ac34d43088238877b
+#+pkgconf-pkg-config.81a2e86557c7f29747c5e0710f9a59912bded92551099c2720b17ebe1ceb9704
 #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch
 #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools
 
@@ -41,10 +41,8 @@
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/applyuidgid-caps b/variants/root-x86_64/applyuidgid-caps
@@ -1,45 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+skalibs.8f3de7084813874998086223e969bb8bac426263e91a38ef555eaf0ad86f4a26
-#+libcap.cb2eed4fbad8a7fbfd1489ae621cee4e5d847e11f7e09377053cd65730b7e699
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+skalibs.32f1433808cbc3408f6fd02d58a48f36e9a8824c267984a7398bd73d2fbe55aa
+#+libcap.8174e0d858087c367ab06231281ca1edef5354ad701504ac4e3bd27c2c31c0ad
 #@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/argp-standalone b/variants/root-x86_64/argp-standalone
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+m4.40d83d50f329cfe11bfeb914c554b41bbe66538ee7aaa4380d5d19e8f33be5bb
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+m4.54fcb13ff827ab832cd4845f2f252d6283e377b58c2803ba46fc2862aa422d33
 #@untar:-z:sha256:c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6:.
 #@untar::sha256:a4facc0856b512ad8ab5aed7b07e14a9629aaf042b1e92377ba22fcfc4c4205b:argp-standalone-1.5.0
 
diff --git a/variants/root-x86_64/attr b/variants/root-x86_64/attr
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+m4.40d83d50f329cfe11bfeb914c554b41bbe66538ee7aaa4380d5d19e8f33be5bb
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+m4.54fcb13ff827ab832cd4845f2f252d6283e377b58c2803ba46fc2862aa422d33
 #@untar:-z:sha256:39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87:.
 
 
@@ -60,10 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/binutils b/variants/root-x86_64/binutils
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
-#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
-#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+m4.d058098030688ce2ed0667b44392bd4ad76c2701f6574040bd81c43e0fab6ffe
-#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
+#+musl-cross-make.a231f50ea0bb1cf8f34f63b6b2d02a4a0d2035fc520be7af77e830cf7129fa86
+#+gnu-make.963377e3ce4a91501593ace2c5fd368e5b4faf22405934aa9bebba9e2f85dc2c
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+m4.cc39ade96e472af8d1d4b6ddc9be3a6e7857e62d89babfb5dad2d4fa6d951fcb
+#+nawk.3212c1f5782e03c10b90e72e5b510953274da54de73319493ffbf0653bfa51c6
 #@sha256:a119e7e50cae23feaad160a533d69a90073a519521924da56abc74724cec65c6:merged.patch
 #@untar:-z:sha256:0cdd76777a0dfd3dd3a63f215f030208ddb91c2361d2bcc02acec0f1c16b6a2e:.
 
@@ -34,10 +34,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/bison b/variants/root-x86_64/bison
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+m4.40d83d50f329cfe11bfeb914c554b41bbe66538ee7aaa4380d5d19e8f33be5bb
-#+flex.e74780d4a218bf4ce34228e9e5b6c33beb9f40a5220fa15d25a9fd586382f8fc
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.3212c1f5782e03c10b90e72e5b510953274da54de73319493ffbf0653bfa51c6
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+m4.54fcb13ff827ab832cd4845f2f252d6283e377b58c2803ba46fc2862aa422d33
+#+flex.dc317eaae721db029d4114e05212cac1e8891266100e882399d19113c03b1451
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 
@@ -62,10 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/bootstrap.environment b/variants/root-x86_64/bootstrap.environment
@@ -1,4 +1,4 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
-#+musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27-
\ No newline at end of file
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+gnu-make.963377e3ce4a91501593ace2c5fd368e5b4faf22405934aa9bebba9e2f85dc2c
+#+musl-cross-make.a231f50ea0bb1cf8f34f63b6b2d02a4a0d2035fc520be7af77e830cf7129fa86+
\ No newline at end of file
diff --git a/variants/root-x86_64/busybox b/variants/root-x86_64/busybox
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
-#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.963377e3ce4a91501593ace2c5fd368e5b4faf22405934aa9bebba9e2f85dc2c
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
 #@sha256:cf378a58f842c7a06997afc04d614912f2f8068d8a8f74ca4ec636bdf1adeba9:busybox/.config
 #@git:3621595939e43a831d66f6b757d4f410029bff95:busybox
 
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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 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.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox:bootstrap b/variants/root-x86_64/busybox:bootstrap
@@ -1,15 +1,15 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
 #@pragma:nopath
-#+musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
-#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
-#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
+#+musl-cross-make.a231f50ea0bb1cf8f34f63b6b2d02a4a0d2035fc520be7af77e830cf7129fa86
+#+gnu-make.963377e3ce4a91501593ace2c5fd368e5b4faf22405934aa9bebba9e2f85dc2c
+#+nawk.3212c1f5782e03c10b90e72e5b510953274da54de73319493ffbf0653bfa51c6
 #@git:8d7ae80eda7e08ee361f8793683ae58216caf720:busybox
 #@sha256:13ed92216aef70e6fc431b2e66a9b20a71b5f4b69a3d7a84acbc4d1210d6ea6a:busybox/.config
 
 PATH="$pthbs_build_environment/command:$PATH"
-mcm=/versions/musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
-make=/versions/gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
+mcm=/versions/musl-cross-make.a231f50ea0bb1cf8f34f63b6b2d02a4a0d2035fc520be7af77e830cf7129fa86
+make=/versions/gnu-make.963377e3ce4a91501593ace2c5fd368e5b4faf22405934aa9bebba9e2f85dc2c
 
 export CC="x86_64-linux-musl-gcc"
 export CFLAGS="-D_GNU_SOURCE"
diff --git a/variants/root-x86_64/busybox:old b/variants/root-x86_64/busybox:old
@@ -1,8 +1,8 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.f8a57d7546c64c62e14d1d4b4a09fd10dc77cfc4a37744b75fac6bb5b8bdcb72
-#+gnu-make.99fe3011f86e41833c1116b7b47d2c478ecbacb4f09734045b71df5d0c99534f
-#+busybox.9624330e831e939cd8c151ee92f591249d816c6ccac4d4bcfeaf1ec34c83a4c8
-#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
+#+musl-cross-make.9de60918044d345b88094f1b9766d241a248d8c4ca467269ef8e6291fd1e3899
+#+gnu-make.dd1c52e264308b09b3f7c57a46d1169e66fb9912ef94a03a5737665b5ea10125
+#+busybox.5e31f0f0327b157c167e4177de5a74415b31c690046fd2fdcc51ea2be14a4dc9
+#+nawk.3212c1f5782e03c10b90e72e5b510953274da54de73319493ffbf0653bfa51c6
 #@sha256:31b8f61d2173fa36d4409e8e91f52088691d6ba4db13efe19ea7ae7512e64275:busybox/.config
 #@git:3621595939e43a831d66f6b757d4f410029bff95:busybox
 
diff --git a/variants/root-x86_64/busybox:oldbootstrap b/variants/root-x86_64/busybox:oldbootstrap
@@ -1,13 +1,13 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
 #@pragma:nopath
-#+musl-cross-make.3a7d0ecaebf339449fdbcf279f0e7a0af8562f98e5d2f4384136f29afa0a0d52
-#+gnu-make.99fe3011f86e41833c1116b7b47d2c478ecbacb4f09734045b71df5d0c99534f
+#+musl-cross-make.19ac8f28b3c5bea3bf3f8cdc16c03da22a6841210159cbfc406af8f411c87a34
+#+gnu-make.dd1c52e264308b09b3f7c57a46d1169e66fb9912ef94a03a5737665b5ea10125
 #@git:8d7ae80eda7e08ee361f8793683ae58216caf720:busybox
 #@sha256:13ed92216aef70e6fc431b2e66a9b20a71b5f4b69a3d7a84acbc4d1210d6ea6a:busybox/.config
 
-mcm=/versions/musl-cross-make.3a7d0ecaebf339449fdbcf279f0e7a0af8562f98e5d2f4384136f29afa0a0d52
-make=/versions/gnu-make.99fe3011f86e41833c1116b7b47d2c478ecbacb4f09734045b71df5d0c99534f
+mcm=/versions/musl-cross-make.19ac8f28b3c5bea3bf3f8cdc16c03da22a6841210159cbfc406af8f411c87a34
+make=/versions/gnu-make.dd1c52e264308b09b3f7c57a46d1169e66fb9912ef94a03a5737665b5ea10125
 
 export PATH="$mcm/command:$make/command:$PATH"
 export CC="$mcm/command/x86_64-linux-musl-gcc"
diff --git a/variants/root-x86_64/ca-certificates-wip-donotuse b/variants/root-x86_64/ca-certificates-wip-donotuse
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+certdata2pem.813269f8cbe27b4982800880eaff1506d411c96be5c3e3b6b2cdfdc9243b92eb
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+certdata2pem.c76d9c743a963ea5fa15862d75e5d12f62eeaeae61b56ce969e810ef081221f7
 #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:.
 
 
diff --git a/variants/root-x86_64/ccx-utils b/variants/root-x86_64/ccx-utils
@@ -1,46 +1,44 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+skalibs.8f3de7084813874998086223e969bb8bac426263e91a38ef555eaf0ad86f4a26
-#+s6.7f7a7a7fb3647c28a7ad7253b3e9970c1cd091c6fadd755f9577562494e382cc
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+skalibs.32f1433808cbc3408f6fd02d58a48f36e9a8824c267984a7398bd73d2fbe55aa
+#+s6.4ba820562a6a96f108135acc5bbc99ca193e16890ff8f7d1cd71f8abb1cd0a1a
 #@git:461a9ec198c1e2b9c39a34e21786747dbb8671b4:ccx-utils
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/certdata2pem b/variants/root-x86_64/certdata2pem
@@ -1,43 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
 #@sha256:064f7d41106cd9efa08b9e68cf049f44e3be55666bd2ab96d02c508293b8dce7:certdata2pem.c
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/confz b/variants/root-x86_64/confz
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+zsh.395877b10c2159be5ce294fdc0850eac86945d98cc77d48f1f0aaf8593880f0b
-#+pthbs-banginstall.56164df1e8e5fee562e9e72b767fd849d7e67f903182e6a1da7844d2bb23152f
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+zsh.160a511e8dc1104420ffc16e0075e189211ef86b2b546f3e11b3d91e77ee7d91
+#+pthbs-banginstall.97d3b141fd70e66fc59912a95a8ef790d6fd1e3ec5a79972e4cba2a31c62f929
 #@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.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-dosfstools.17418e245a79d9725a6ae2a304e8980e8d02766ab4224191de9c8d3923588b99
-#+busybox-e2fsprogs.3fed30e21aaebe97507cdd92dd433ba6c6e7a855bf557f7351d8702ae45880a8
-#+busybox-iproute2.a9cacc297d75738f0a814a984f4041c6772341f1a9ba1303771e24bc2feaf04e
-#+busybox-iputils.0b1ae18a66bf5045a3463f1f45b4518e06a912ddeec9ffbc86da30eefd79d36e
-#+busybox-net-misc.980107605e3ea5c0d52971c26d91f75bfa55d0554bcf0706580b44fcbc14ff5a
-#+busybox-net-tools.39b4b816e22b505111ca63e1bd3a0dad7b74a70dca121f2ff7c96b0d4ce2ddab
-#+busybox-traceroute.6e4cc3bdc0547aed295f908a69d25c5cff18e8ec342ff8a67dd131c2c3fb6c31
-#+busybox-wget.a5f7e43cfff655cc903dc1a233bfd94c790a291b508ef7cbc8af6e7e2811c50d
-#+busybox-chpst.985296c53e6cf78662e03bb4cc9dbcb580e8427c29929485aefd50ac475bbbc3
-#+busybox-console.49590f9bac1944990fafe5ff2f00f6ecd5aa18228af89236ad38c7e2133b7b7f
-#+busybox-getty.3a5a349030999753457a10436d5d8664968749d357e6d6f1122cd9edd6ec3cb1
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-dosfstools.840efe96ff4a2fd5e6ea201844ee069a9bfde1e57e578011f88d081922e35ea0
+#+busybox-e2fsprogs.faa0971a44cffd7bad7ba247673a28f728b4ed34b16e778f13bce0163234313b
+#+busybox-iproute2.0a789e50432c5132c76e4e54327cdd3c4fc725419effebaff03fa1afcfdddb20
+#+busybox-iputils.6b15d2fa0a002dacb68c5f05d168cd2494040894aaa7452d7c3b989b26f95dfe
+#+busybox-net-misc.4f31d3bfa9084f11f49ac9a169597ccfefd3f547e7aaa78243dfa18dd4f78179
+#+busybox-net-tools.90acb34ce84618017f7906ba371f7397e291af641ff9b5e3758377a80f6e84b0
+#+busybox-traceroute.f96679012635964f73233feccaa3aa1a853db2d1bdd1440e39762d0fb9868c3d
+#+busybox-wget.4cd596d47e7943359b171a19f33002dd7bad5608db03b5c324e1a15e445e5a5d
+#+busybox-chpst.d87c2a4fd4f0f7d104cbbc9ba58e05912237813390eefe6579761da5b01cf460
+#+busybox-console.b8f64edf384a8c977a54e349796cef3715ecc6005821bf46349f0ff08c99943b
+#+busybox-getty.460a745e392e12e0316e52a50e6c8cc6641aac12f63e6c16564c1d1335dbfdd3
 
-#+busybox-linux-extra.0a95a767387672134e1207a9314e7a5183bd00dcbc3404c3a3c02289f1b936bb
-#+busybox-mtd-utils.4047b79030c1fbfab40c3788a8ff792e26a3c7a6e0fa5b51410b4d02f2b9f9bd
-#+busybox-shadow.ac1d0f9df6782543628fe54a3aa54b58cd8b277667234fe2a0b97fc8a3363b3e
-#+busybox-su.37d0a5986b05d58d967230e94db3f50cc681477f7757d64bf597f0062012c5ad
-#+busybox-util-linux-priv.7a73598520c2b93de5291054ae77039eca2a6c99bb48c1edb1007fba5297d1bc
-#+busybox-logging.98bcaf3ee34d0ec01e1f841202ca969e1644e60629eda17e772fe49eb5beb185
-#+busybox-cron.2990cddd6816d75b12679929f7d4c17bc5f40baa1ff3223bf75682322c9b9b64
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+busybox-login.9648a43f2a233be3648b2955a602946ab79400ccce2751d0d16e1a0dc7f9003f
-#+execline.49b9333c99a58b660feb75a7598c32e9c3dfd97c16b81b7ebd4bc6bf3123f0a3
-#+s6.7f7a7a7fb3647c28a7ad7253b3e9970c1cd091c6fadd755f9577562494e382cc
-#+ccx-utils.e5fdf6dedb639eaa807c7aee61370932de3a0b382ae152855e9bb8b11f08c6c4
-#+applyuidgid-caps.79f2943f8120c3becf7f1b2524caf86bd7d07fcc18190db01f21b32241cf2a0d
-#+easyseccomp.e88f2e7c530a5b33e79704fb8e22cad1d8508363ec6165b1da5e885e668442fe
-#+mlog.6d96fa5ff07539ac681bc86e2b3715b1199affe9978defad54726111f6e665c9
-#+abduco.a838b08c8cf56578bbae6a8e9d3339cc6246abd355ce78e570d94f079e793137
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
+#+busybox-linux-extra.f9921395428e9fa8b5af16018385c92d704b2cdf7d640af91d12339eb861da7d
+#+busybox-mtd-utils.7fd114e7b6fd74fa7eca5c72a51a682ba5e0a8612c1c94fda49f05e00399c8b1
+#+busybox-shadow.e25a023c5fec5ffb50245be48589001bba2991ef5c4630dfdb2c7163045d11d2
+#+busybox-su.2ba2709e598244cae8847d472c6d75baea820aece7b47e68aa2995282dd197a0
+#+busybox-util-linux-priv.6ecfcbc54fc609ca2f78f69276a0958e35768f2f1947ba76375e99aa3746fede
+#+busybox-logging.f16e603247e9dd21d587a1b47863c4accee0405b3129a15cc2f1bc3168ac5915
+#+busybox-cron.4dffe76d11bfebbde0a1009a25512f1fe2152643eb72e579718e00d8c6ab749e
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+busybox-login.52518704dd388ebacb6c3c8a511f21f35a8e7e2e706a88503332dd81b70735db
+#+execline.c0c5f161b8a116da36ddada8138118cfe5c31a9f9f836653ce0a07d0f2f0946e
+#+s6.4ba820562a6a96f108135acc5bbc99ca193e16890ff8f7d1cd71f8abb1cd0a1a
+#+ccx-utils.f098fada9c7a39e9f64bfe84e15907a6535b1be88cd8e1b21eeeaa591f84f666
+#+applyuidgid-caps.1e7bbbb5ecd050ce3e03441e69a518a2d4b61cf2c0d21699b21a5b134be87af5
+#+easyseccomp.2bc4762fd068bef1d6fc986752dfc2297703f20247cd161a8f622cf16dbd6c8a
+#+mlog.a161df07b2dc6cccebfc092dcf3ffe90e1675c8f48eab75cc25cb6ea3489cea0
+#+abduco.9890ea2d5b41cf6b1f8c211529aa51096512cf6267c881af8945be71ba2bfa2f
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
 #@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.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+zsh.395877b10c2159be5ce294fdc0850eac86945d98cc77d48f1f0aaf8593880f0b
-#+pthbs-banginstall.56164df1e8e5fee562e9e72b767fd849d7e67f903182e6a1da7844d2bb23152f
-#+execline.49b9333c99a58b660feb75a7598c32e9c3dfd97c16b81b7ebd4bc6bf3123f0a3
-#+alpine-keys.3906069a8d4c9d871a59de81397d8b54b7f9f81dc18f73a2c705e218d056581b
-#+apk-tools.e89c2df3cf7e4d0b05594966e9170a4aa1c934ef64d0140ece7d8589a49fde20
-#+xbps.41ed375b0206ad8a1702f4acbd37a641bf0dd86874908c8450ab04a7714223e8
-#+container-bin-image.a7efa0086d1b3e0f5c709ae7a3f9e66eef706c5fb7a74cbbad39df86829c2051
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+zsh.160a511e8dc1104420ffc16e0075e189211ef86b2b546f3e11b3d91e77ee7d91
+#+pthbs-banginstall.97d3b141fd70e66fc59912a95a8ef790d6fd1e3ec5a79972e4cba2a31c62f929
+#+execline.c0c5f161b8a116da36ddada8138118cfe5c31a9f9f836653ce0a07d0f2f0946e
+#+alpine-keys.8e474179aecaa02e2a1408145b33e2164764ef63ded601a963e65f35ec220939
+#+apk-tools.c692d9b15dbcddd9667eff2f3443ea7f81d3ed8e0ef893f9bba925172a308bbe
+#+xbps.207598e2d56371c99db84493ff1b6c5e3891e0f06f91cd47f2a113e133dd7c32
+#+container-bin-image.6f6037432efff09ebdc8acd7edcbe28a9836501b4829bf6c88459c9cff244297
 #@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.e89c2df3cf7e4d0b05594966e9170a4aa1c934ef64d0140ece7d8589a49fde20/command/apk.static' "${dest}/deps/command/"
-ln -sf '/versions/xbps.41ed375b0206ad8a1702f4acbd37a641bf0dd86874908c8450ab04a7714223e8/command/xbps-install.static' "${dest}/deps/command/"
+ln -sf '/versions/apk-tools.c692d9b15dbcddd9667eff2f3443ea7f81d3ed8e0ef893f9bba925172a308bbe/command/apk.static' "${dest}/deps/command/"
+ln -sf '/versions/xbps.207598e2d56371c99db84493ff1b6c5e3891e0f06f91cd47f2a113e133dd7c32/command/xbps-install.static' "${dest}/deps/command/"
 
-for f in '/versions/alpine-keys.3906069a8d4c9d871a59de81397d8b54b7f9f81dc18f73a2c705e218d056581b'/keys/alpine/*/*; do
+for f in '/versions/alpine-keys.8e474179aecaa02e2a1408145b33e2164764ef63ded601a963e65f35ec220939'/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.3906069a8d4c9d871a59de81397d8b54b7f9f81dc18f73a2
 done
  
 mkdir -p "${dest}/deps/keys/void"
-for f in '/versions/xbps.41ed375b0206ad8a1702f4acbd37a641bf0dd86874908c8450ab04a7714223e8'/keys/void/*; do
+for f in '/versions/xbps.207598e2d56371c99db84493ff1b6c5e3891e0f06f91cd47f2a113e133dd7c32'/keys/void/*; do
 	ln -sf "$f" "${dest}/deps/keys/void/"
 done
 
-test -d '/versions/container-bin-image.a7efa0086d1b3e0f5c709ae7a3f9e66eef706c5fb7a74cbbad39df86829c2051/container-bin-image'
-test -f '/versions/container-bin-image.a7efa0086d1b3e0f5c709ae7a3f9e66eef706c5fb7a74cbbad39df86829c2051/container-bin-image/if'
-ln -sf '/versions/container-bin-image.a7efa0086d1b3e0f5c709ae7a3f9e66eef706c5fb7a74cbbad39df86829c2051/container-bin-image' "${dest}/deps/"
+test -d '/versions/container-bin-image.6f6037432efff09ebdc8acd7edcbe28a9836501b4829bf6c88459c9cff244297/container-bin-image'
+test -f '/versions/container-bin-image.6f6037432efff09ebdc8acd7edcbe28a9836501b4829bf6c88459c9cff244297/container-bin-image/if'
+ln -sf '/versions/container-bin-image.6f6037432efff09ebdc8acd7edcbe28a9836501b4829bf6c88459c9cff244297/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.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-dosfstools.17418e245a79d9725a6ae2a304e8980e8d02766ab4224191de9c8d3923588b99
-#+busybox-e2fsprogs.3fed30e21aaebe97507cdd92dd433ba6c6e7a855bf557f7351d8702ae45880a8
-#+busybox-iproute2.a9cacc297d75738f0a814a984f4041c6772341f1a9ba1303771e24bc2feaf04e
-#+busybox-iputils.0b1ae18a66bf5045a3463f1f45b4518e06a912ddeec9ffbc86da30eefd79d36e
-#+busybox-net-misc.980107605e3ea5c0d52971c26d91f75bfa55d0554bcf0706580b44fcbc14ff5a
-#+busybox-net-tools.39b4b816e22b505111ca63e1bd3a0dad7b74a70dca121f2ff7c96b0d4ce2ddab
-#+busybox-traceroute.6e4cc3bdc0547aed295f908a69d25c5cff18e8ec342ff8a67dd131c2c3fb6c31
-#+busybox-wget.a5f7e43cfff655cc903dc1a233bfd94c790a291b508ef7cbc8af6e7e2811c50d
-#+busybox-chpst.985296c53e6cf78662e03bb4cc9dbcb580e8427c29929485aefd50ac475bbbc3
-#+busybox-console.49590f9bac1944990fafe5ff2f00f6ecd5aa18228af89236ad38c7e2133b7b7f
-#+busybox-getty.3a5a349030999753457a10436d5d8664968749d357e6d6f1122cd9edd6ec3cb1
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-dosfstools.840efe96ff4a2fd5e6ea201844ee069a9bfde1e57e578011f88d081922e35ea0
+#+busybox-e2fsprogs.faa0971a44cffd7bad7ba247673a28f728b4ed34b16e778f13bce0163234313b
+#+busybox-iproute2.0a789e50432c5132c76e4e54327cdd3c4fc725419effebaff03fa1afcfdddb20
+#+busybox-iputils.6b15d2fa0a002dacb68c5f05d168cd2494040894aaa7452d7c3b989b26f95dfe
+#+busybox-net-misc.4f31d3bfa9084f11f49ac9a169597ccfefd3f547e7aaa78243dfa18dd4f78179
+#+busybox-net-tools.90acb34ce84618017f7906ba371f7397e291af641ff9b5e3758377a80f6e84b0
+#+busybox-traceroute.f96679012635964f73233feccaa3aa1a853db2d1bdd1440e39762d0fb9868c3d
+#+busybox-wget.4cd596d47e7943359b171a19f33002dd7bad5608db03b5c324e1a15e445e5a5d
+#+busybox-chpst.d87c2a4fd4f0f7d104cbbc9ba58e05912237813390eefe6579761da5b01cf460
+#+busybox-console.b8f64edf384a8c977a54e349796cef3715ecc6005821bf46349f0ff08c99943b
+#+busybox-getty.460a745e392e12e0316e52a50e6c8cc6641aac12f63e6c16564c1d1335dbfdd3
 
-#+busybox-linux-extra.0a95a767387672134e1207a9314e7a5183bd00dcbc3404c3a3c02289f1b936bb
-#+busybox-mtd-utils.4047b79030c1fbfab40c3788a8ff792e26a3c7a6e0fa5b51410b4d02f2b9f9bd
-#+busybox-shadow.ac1d0f9df6782543628fe54a3aa54b58cd8b277667234fe2a0b97fc8a3363b3e
-#+busybox-su.37d0a5986b05d58d967230e94db3f50cc681477f7757d64bf597f0062012c5ad
-#+busybox-util-linux-priv.7a73598520c2b93de5291054ae77039eca2a6c99bb48c1edb1007fba5297d1bc
-#+busybox-logging.98bcaf3ee34d0ec01e1f841202ca969e1644e60629eda17e772fe49eb5beb185
-#+busybox-cron.2990cddd6816d75b12679929f7d4c17bc5f40baa1ff3223bf75682322c9b9b64
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+execline.49b9333c99a58b660feb75a7598c32e9c3dfd97c16b81b7ebd4bc6bf3123f0a3
-#+s6.7f7a7a7fb3647c28a7ad7253b3e9970c1cd091c6fadd755f9577562494e382cc
-#+s6-portable-utils.9eb45e59d2ecd4f200d7b4132a1c712262560bb62c3e583bbae8f3fbaa16c050
-#+s6-linux-utils.68d41137286b40e77c70d997136d7aa1d26b75923d04582df5e055d3de7742b1
-#+zsh.395877b10c2159be5ce294fdc0850eac86945d98cc77d48f1f0aaf8593880f0b
-#+confz.307b96c407bf61de025eb21da7764acf5d14ed96f00d54f9c5666f73ec628577
-#+containers.6a0a97d8e1e8241b9aafbc4778c7931b16d93dd4f39e2120dc12911e8f6973d5
-#+xbps.41ed375b0206ad8a1702f4acbd37a641bf0dd86874908c8450ab04a7714223e8
-#+zstd.d0ea2968e51590efb9b5cc00720992ee080a90bcc057dd91b42dbba09aedf488
-#+apk-tools.e89c2df3cf7e4d0b05594966e9170a4aa1c934ef64d0140ece7d8589a49fde20
-#+alpine-keys.3906069a8d4c9d871a59de81397d8b54b7f9f81dc18f73a2c705e218d056581b
-#+getent.a311c732280dc93397f941c8658159a8a3d98d27b7f1c1a7a575b7e9a893a7b5
-#+fileset.48ef1c1ad9aabc68f8c01a689dda5666da222c796f80004f6c4e4805c27cfbfc
-#+ccx-utils.e5fdf6dedb639eaa807c7aee61370932de3a0b382ae152855e9bb8b11f08c6c4
-#+easyseccomp.e88f2e7c530a5b33e79704fb8e22cad1d8508363ec6165b1da5e885e668442fe
-#+findutils.546d28378fdb9da6733c82dbb35bd1568992e8da525806fda5e9ffb8fc51d98e
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520-
\ No newline at end of file
+#+busybox-linux-extra.f9921395428e9fa8b5af16018385c92d704b2cdf7d640af91d12339eb861da7d
+#+busybox-mtd-utils.7fd114e7b6fd74fa7eca5c72a51a682ba5e0a8612c1c94fda49f05e00399c8b1
+#+busybox-shadow.e25a023c5fec5ffb50245be48589001bba2991ef5c4630dfdb2c7163045d11d2
+#+busybox-su.2ba2709e598244cae8847d472c6d75baea820aece7b47e68aa2995282dd197a0
+#+busybox-util-linux-priv.6ecfcbc54fc609ca2f78f69276a0958e35768f2f1947ba76375e99aa3746fede
+#+busybox-logging.f16e603247e9dd21d587a1b47863c4accee0405b3129a15cc2f1bc3168ac5915
+#+busybox-cron.4dffe76d11bfebbde0a1009a25512f1fe2152643eb72e579718e00d8c6ab749e
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+execline.c0c5f161b8a116da36ddada8138118cfe5c31a9f9f836653ce0a07d0f2f0946e
+#+s6.4ba820562a6a96f108135acc5bbc99ca193e16890ff8f7d1cd71f8abb1cd0a1a
+#+s6-portable-utils.7c73e7826eab9aeea887b315409969c2341b2f7a7b26382074eb3bd518534482
+#+s6-linux-utils.bb25c104b641816e1f3a0270401bb7a9536d5269c124bfa88e4195cc8b8b5ab0
+#+zsh.160a511e8dc1104420ffc16e0075e189211ef86b2b546f3e11b3d91e77ee7d91
+#+confz.d00355b26c375f76967b72e160619321d4943ac1e70bda9284ea202a62149850
+#+containers.2de6283ca8c4494655e236dd819988b48a261a20dfaef886a51823689a5a89fe
+#+xbps.207598e2d56371c99db84493ff1b6c5e3891e0f06f91cd47f2a113e133dd7c32
+#+zstd.d808a868880fd7a702a898794c87cadf8523ef55a88bec1ac34d43088238877b
+#+apk-tools.c692d9b15dbcddd9667eff2f3443ea7f81d3ed8e0ef893f9bba925172a308bbe
+#+alpine-keys.8e474179aecaa02e2a1408145b33e2164764ef63ded601a963e65f35ec220939
+#+getent.93ac43fbd2153c7725631d4547f7c35ae1dc8a0eb602fb2619d3c06eb958514c
+#+fileset.8c85b6836e1d462f61be6053516d340514e45287a5cf3f6838901d3d4bf39d1d
+#+ccx-utils.f098fada9c7a39e9f64bfe84e15907a6535b1be88cd8e1b21eeeaa591f84f666
+#+easyseccomp.2bc4762fd068bef1d6fc986752dfc2297703f20247cd161a8f622cf16dbd6c8a
+#+findutils.1ca9a221cbfe034384a44d3fca0d5675f9d4294b0d0cf41b2bfee40d5dc033b1
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe+
\ No newline at end of file
diff --git a/variants/root-x86_64/curl b/variants/root-x86_64/curl
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+m4.40d83d50f329cfe11bfeb914c554b41bbe66538ee7aaa4380d5d19e8f33be5bb
-#+libressl.2e473e902dfa0bb7b1d907fdbdb35fb1a59afbfaf749cae6fb1fda22005a3edb
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+m4.54fcb13ff827ab832cd4845f2f252d6283e377b58c2803ba46fc2862aa422d33
+#+libressl.5f6ce78a162c0f2f1a6ccdf81d96ef3861194e6f0b7543f244c67f709183e058
 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:.
 
 
@@ -61,10 +61,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -1,97 +1,97 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-dosfstools.17418e245a79d9725a6ae2a304e8980e8d02766ab4224191de9c8d3923588b99
-#+busybox-e2fsprogs.3fed30e21aaebe97507cdd92dd433ba6c6e7a855bf557f7351d8702ae45880a8
-#+busybox-iproute2.a9cacc297d75738f0a814a984f4041c6772341f1a9ba1303771e24bc2feaf04e
-#+busybox-iputils.0b1ae18a66bf5045a3463f1f45b4518e06a912ddeec9ffbc86da30eefd79d36e
-#+busybox-net-misc.980107605e3ea5c0d52971c26d91f75bfa55d0554bcf0706580b44fcbc14ff5a
-#+busybox-net-tools.39b4b816e22b505111ca63e1bd3a0dad7b74a70dca121f2ff7c96b0d4ce2ddab
-#+busybox-traceroute.6e4cc3bdc0547aed295f908a69d25c5cff18e8ec342ff8a67dd131c2c3fb6c31
-#+busybox-wget.a5f7e43cfff655cc903dc1a233bfd94c790a291b508ef7cbc8af6e7e2811c50d
-#+busybox-chpst.985296c53e6cf78662e03bb4cc9dbcb580e8427c29929485aefd50ac475bbbc3
-#+busybox-console.49590f9bac1944990fafe5ff2f00f6ecd5aa18228af89236ad38c7e2133b7b7f
-#+busybox-getty.3a5a349030999753457a10436d5d8664968749d357e6d6f1122cd9edd6ec3cb1
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-dosfstools.840efe96ff4a2fd5e6ea201844ee069a9bfde1e57e578011f88d081922e35ea0
+#+busybox-e2fsprogs.faa0971a44cffd7bad7ba247673a28f728b4ed34b16e778f13bce0163234313b
+#+busybox-iproute2.0a789e50432c5132c76e4e54327cdd3c4fc725419effebaff03fa1afcfdddb20
+#+busybox-iputils.6b15d2fa0a002dacb68c5f05d168cd2494040894aaa7452d7c3b989b26f95dfe
+#+busybox-net-misc.4f31d3bfa9084f11f49ac9a169597ccfefd3f547e7aaa78243dfa18dd4f78179
+#+busybox-net-tools.90acb34ce84618017f7906ba371f7397e291af641ff9b5e3758377a80f6e84b0
+#+busybox-traceroute.f96679012635964f73233feccaa3aa1a853db2d1bdd1440e39762d0fb9868c3d
+#+busybox-wget.4cd596d47e7943359b171a19f33002dd7bad5608db03b5c324e1a15e445e5a5d
+#+busybox-chpst.d87c2a4fd4f0f7d104cbbc9ba58e05912237813390eefe6579761da5b01cf460
+#+busybox-console.b8f64edf384a8c977a54e349796cef3715ecc6005821bf46349f0ff08c99943b
+#+busybox-getty.460a745e392e12e0316e52a50e6c8cc6641aac12f63e6c16564c1d1335dbfdd3
 
-#+busybox-linux-extra.0a95a767387672134e1207a9314e7a5183bd00dcbc3404c3a3c02289f1b936bb
-#+busybox-mtd-utils.4047b79030c1fbfab40c3788a8ff792e26a3c7a6e0fa5b51410b4d02f2b9f9bd
-#+busybox-shadow.ac1d0f9df6782543628fe54a3aa54b58cd8b277667234fe2a0b97fc8a3363b3e
-#+busybox-su.37d0a5986b05d58d967230e94db3f50cc681477f7757d64bf597f0062012c5ad
-#+busybox-util-linux-priv.7a73598520c2b93de5291054ae77039eca2a6c99bb48c1edb1007fba5297d1bc
-#+busybox-logging.98bcaf3ee34d0ec01e1f841202ca969e1644e60629eda17e772fe49eb5beb185
-#+busybox-cron.2990cddd6816d75b12679929f7d4c17bc5f40baa1ff3223bf75682322c9b9b64
-#+attr.31fc88ab914a7607cee3559f356ab47ce83d4281b8137131e3f6de686dcc9a1e
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+diffutils.d0677f378a1e47808251ec0a319d7ff60c8021b57c0111e218ffefe7fc441dfa
-#+patch.cc1f34666bc1f927fcd2d263904e72cd858aa27c0e8127458b58f0bc97d1e211
-#+flex.e74780d4a218bf4ce34228e9e5b6c33beb9f40a5220fa15d25a9fd586382f8fc
-#+bison.1652f11d06c5721f3bb85a3e995ef18dccf5bf6f36081f17d7aecbcbfae5dc67
-#+rsync.1ae607f7f9e6240eaebcf006c32fc7e41d65f246f530f9403b88eca8e36ea619
-#+execline.49b9333c99a58b660feb75a7598c32e9c3dfd97c16b81b7ebd4bc6bf3123f0a3
-#+s6.7f7a7a7fb3647c28a7ad7253b3e9970c1cd091c6fadd755f9577562494e382cc
-#+s6-rc.da55f1f1d2a81068b979194233e09da3d41d723e76984e3ae364c9627c3ae5c8
-#+s6-portable-utils.9eb45e59d2ecd4f200d7b4132a1c712262560bb62c3e583bbae8f3fbaa16c050
-#+s6-linux-utils.68d41137286b40e77c70d997136d7aa1d26b75923d04582df5e055d3de7742b1
-#+s6-linux-init.2e88c8c6a67a9d70b1929cebf9a7f4d706c4ea822ec0ca77308a0871b9f04612
-#+mdevd.3d9d8063a7411360f27cd8f724b62236356870400bfe73dee4b99cbf1081a3d1
-#+s6-dns.892b83af207f7761a8bad0eb772b4b8ff51a0481dad1f49c27bba5bdf760d14e
-#+libressl.2e473e902dfa0bb7b1d907fdbdb35fb1a59afbfaf749cae6fb1fda22005a3edb
-#+s6-networking.25fd456f6586de6bcf9fa22948eb03889ab967b9f880d0849e790f2c1f86ec9a
-#+zsh.395877b10c2159be5ce294fdc0850eac86945d98cc77d48f1f0aaf8593880f0b
-#+pthbs-banginstall.56164df1e8e5fee562e9e72b767fd849d7e67f903182e6a1da7844d2bb23152f
-#+aat.861c54370957ce5fc67693cfc0201badc31872c74077a72bc82f030a9a330e3e
-#+confz.307b96c407bf61de025eb21da7764acf5d14ed96f00d54f9c5666f73ec628577
-#+containers.6a0a97d8e1e8241b9aafbc4778c7931b16d93dd4f39e2120dc12911e8f6973d5
-#+fileset.48ef1c1ad9aabc68f8c01a689dda5666da222c796f80004f6c4e4805c27cfbfc
-#+logincaps.afa9a7378b9525f9ae3732b8e13a644f8155e22120e679fc55162518b798f3b2
-#+snaprep.96439b1085b703a80c2614890e38cee665354d2ece5f0aaef28aa7b01a11146d
-#+curl.e4eb1bb9395c22548c4b042a99a3c8a3295393c8672930089d9d32e81951468b
-#+git.238db32bcc7bf8c7dff5d743aac5d7c7e33e13b60fe7444d057cf75afbfba5ad
-#+xbps.41ed375b0206ad8a1702f4acbd37a641bf0dd86874908c8450ab04a7714223e8
-#+apk-tools.e89c2df3cf7e4d0b05594966e9170a4aa1c934ef64d0140ece7d8589a49fde20
-#+getent.a311c732280dc93397f941c8658159a8a3d98d27b7f1c1a7a575b7e9a893a7b5
-#+getconf.b73339837f155ee56d4b81ee2e31e2fb67edf7b123960606e6f457a4ed9222b9
-#+iconv.73a903740e755048935f4e7e64e9145df0e11d06bf3fb04f805961573e399cfc
-#+libcap.cb2eed4fbad8a7fbfd1489ae621cee4e5d847e11f7e09377053cd65730b7e699
-#+applyuidgid-caps.79f2943f8120c3becf7f1b2524caf86bd7d07fcc18190db01f21b32241cf2a0d
-#+ccx-utils.e5fdf6dedb639eaa807c7aee61370932de3a0b382ae152855e9bb8b11f08c6c4
-#+user-env.6d0bf435cd0b221516b90de322483463977b1e4d2a16182e850b69bf17e791de
-#+strace.8c037d751cf522ccbf31bb3370a8ab0cf57f3ded1fd7d172d9ef539b0407983c
-#+mlog.6d96fa5ff07539ac681bc86e2b3715b1199affe9978defad54726111f6e665c9
-#+findutils.546d28378fdb9da6733c82dbb35bd1568992e8da525806fda5e9ffb8fc51d98e
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+nvi.0509f8f0777d38c1bec4800aa6f77876bbb9f466e1ff5ad68ef4bf0d007a7478
-#+squashfs-tools.a3e62a4f7c0c8a51df24d99e6701b29f6f46c3451dc93c0e25eac3965deb71ea
-#+mandoc.ca5f0bc2830d931f7d66c82625fb572404a19f73a6922a28b01f4b5a7665cb79
-#+tinyssh.2c25a6a0063c1e741d809094c0ccb72f2cc19b827217dd6bffb960beebcb8141
-#+system-config.91e918b82a5be7a19840fdd849061e8a812c398cfa81fd298361825e872975ef
-#+system-config-rc.7fe5365ae17253c2b6eac2fb94ec6dd9936c71f718a12eed63aa3f14ad9fe0f3
-#+system-config-scripts.079f89b23655fc9ead2d8ecfa9a898f2793516085cc878e8c6bf10c465a4efbe
-#+system-config-init.302a727ab5f005a9e99a4af481a2ef3cb6702da08bc93778fb9c9bb2bcc6bdac
-#+system-config-zsh.6caf5c7c014c51ae2d72a1bfa65622b9d24e949bb13415156c1b95688a8b1bcc
-#+busybox-modutils.80cab5cf3e6c2fe6eadfe63679c03785e8b86311508bb8071b5b17672c177ad7-
\ No newline at end of file
+#+busybox-linux-extra.f9921395428e9fa8b5af16018385c92d704b2cdf7d640af91d12339eb861da7d
+#+busybox-mtd-utils.7fd114e7b6fd74fa7eca5c72a51a682ba5e0a8612c1c94fda49f05e00399c8b1
+#+busybox-shadow.e25a023c5fec5ffb50245be48589001bba2991ef5c4630dfdb2c7163045d11d2
+#+busybox-su.2ba2709e598244cae8847d472c6d75baea820aece7b47e68aa2995282dd197a0
+#+busybox-util-linux-priv.6ecfcbc54fc609ca2f78f69276a0958e35768f2f1947ba76375e99aa3746fede
+#+busybox-logging.f16e603247e9dd21d587a1b47863c4accee0405b3129a15cc2f1bc3168ac5915
+#+busybox-cron.4dffe76d11bfebbde0a1009a25512f1fe2152643eb72e579718e00d8c6ab749e
+#+attr.8c27725b1551988d9b56622daa60834a09fe95f5ad9b66306bb3f9dcf3349009
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+diffutils.7d00c8d42e6a30553091f604d163ddf2b63704ef75af8a2bfc91348661e23ba6
+#+patch.f5939c6363d5747ea877353651eb4a9e5533e2e7471ed211cf69624f32b6fadf
+#+flex.dc317eaae721db029d4114e05212cac1e8891266100e882399d19113c03b1451
+#+bison.d2bcd8b75ff96d6becbc842039e5126c2ffa2c34c34abd623464637bad0d204f
+#+rsync.6c211909510a441cb4cee329683a81d073690a382b9ec794a63eb88660d67021
+#+execline.c0c5f161b8a116da36ddada8138118cfe5c31a9f9f836653ce0a07d0f2f0946e
+#+s6.4ba820562a6a96f108135acc5bbc99ca193e16890ff8f7d1cd71f8abb1cd0a1a
+#+s6-rc.83a65d472b3ede2ab999d9965eee87b7a0fcf853d7ee57c1bee9d71537cd99bd
+#+s6-portable-utils.7c73e7826eab9aeea887b315409969c2341b2f7a7b26382074eb3bd518534482
+#+s6-linux-utils.bb25c104b641816e1f3a0270401bb7a9536d5269c124bfa88e4195cc8b8b5ab0
+#+s6-linux-init.d397d1674f3c2437043c36b38283656f3a8b845115d3fcc4a6915281a0971b85
+#+mdevd.4db62fcc7311dd8bb11154429406f5fee75629ee4e6f0aee3fbd6b827c806d83
+#+s6-dns.bad0692e685773b32cd31cc37fe8339172e74c2ce1ab72c36a963574f1d1a380
+#+libressl.5f6ce78a162c0f2f1a6ccdf81d96ef3861194e6f0b7543f244c67f709183e058
+#+s6-networking.d9d413fcc4fae8e4ff229286f8f5403273aa44e68404111e99c802fd6e578d1e
+#+zsh.160a511e8dc1104420ffc16e0075e189211ef86b2b546f3e11b3d91e77ee7d91
+#+pthbs-banginstall.97d3b141fd70e66fc59912a95a8ef790d6fd1e3ec5a79972e4cba2a31c62f929
+#+aat.61db0dec6d83cf73bd768c9df38688526d65885f0b1866d70a9f20be91881450
+#+confz.d00355b26c375f76967b72e160619321d4943ac1e70bda9284ea202a62149850
+#+containers.2de6283ca8c4494655e236dd819988b48a261a20dfaef886a51823689a5a89fe
+#+fileset.8c85b6836e1d462f61be6053516d340514e45287a5cf3f6838901d3d4bf39d1d
+#+logincaps.c7f64df4cfe599babb406a11b1b6f0b837b332fcc73b708800883e8e9a5ddf12
+#+snaprep.00c23eda9e381f78130696f9dd2bca0e4dcfa5e968847477329a1396e5d1a458
+#+curl.d3aa78208cdef3587276d0f13b47c33e2d79250c709c6c276138a9238c4bb863
+#+git.b435ac11c0f5e3b062ac4ec0867edced8822184567f7f58001c2097577995049
+#+xbps.207598e2d56371c99db84493ff1b6c5e3891e0f06f91cd47f2a113e133dd7c32
+#+apk-tools.c692d9b15dbcddd9667eff2f3443ea7f81d3ed8e0ef893f9bba925172a308bbe
+#+getent.93ac43fbd2153c7725631d4547f7c35ae1dc8a0eb602fb2619d3c06eb958514c
+#+getconf.fc7060660a31878d8745e4c3ec021f2b647e7f249c6b051c60d7489733d03e21
+#+iconv.62ba123084e7e8ad0671112287ea5708a5fa819af2a7fec23a198c52769dd963
+#+libcap.8174e0d858087c367ab06231281ca1edef5354ad701504ac4e3bd27c2c31c0ad
+#+applyuidgid-caps.1e7bbbb5ecd050ce3e03441e69a518a2d4b61cf2c0d21699b21a5b134be87af5
+#+ccx-utils.f098fada9c7a39e9f64bfe84e15907a6535b1be88cd8e1b21eeeaa591f84f666
+#+user-env.9bf9a36e604e49aa67f676dd953ca668eb51d7dc2ad2433d9a837813edcdea7a
+#+strace.d3e314ef9dd1c87f6227eb7d18f75b5bcab8246722cc408dd45d80c4cfc33817
+#+mlog.a161df07b2dc6cccebfc092dcf3ffe90e1675c8f48eab75cc25cb6ea3489cea0
+#+findutils.1ca9a221cbfe034384a44d3fca0d5675f9d4294b0d0cf41b2bfee40d5dc033b1
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+nvi.8824e0f2864a615a169d3398acc84d6ac9b4320ab21cec444a6f01d70d01cfee
+#+squashfs-tools.9ad29f557a99efeead3e8a2406018106a1b8cbadc5e302b24d5aa3ba288c239d
+#+mandoc.318133f4b6b71ec0e61de272df3319d172837d670f8a3eb24afb1ded4e873b5b
+#+tinyssh.a7cbbdb96b73cea70514a88ad502393a088e00d8aecfca8af1b3982832d9976c
+#+system-config.cb569748518a506228436b8da52ab3894385ffdc4b5aa264a601818e00d435e6
+#+system-config-rc.61470738e6346f1501e4f0eda927c0a33162f5ae5615e39989b47cacd7a229be
+#+system-config-scripts.f0b50feed2f18fc54f37ffafb086491e233777474550e4abaa51b9a5f1855132
+#+system-config-init.454ae855bfd2724acaf91afd9872db459d69a3a56e1b979aaa7e295288a0e4e1
+#+system-config-zsh.5d7077ca7e2035500fa516da77956ed28d7622b62bf8b66e94f68d77068f411f
+#+busybox-modutils.0f21d0dc18d9f6fa69623fec39c958e3b3ccb9dff524fdd4f13b0ca7678e0087+
\ No newline at end of file
diff --git a/variants/root-x86_64/diffutils b/variants/root-x86_64/diffutils
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+m4.40d83d50f329cfe11bfeb914c554b41bbe66538ee7aaa4380d5d19e8f33be5bb
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+m4.54fcb13ff827ab832cd4845f2f252d6283e377b58c2803ba46fc2862aa422d33
 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:.
 
 
@@ -60,10 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/dune b/variants/root-x86_64/dune
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+ocaml.3cef599bb2d79ed5c803ff43addda5097f2deac41baf2541e45e6b3ed3faa7b3
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+ocaml.c47166087b73d25dd821bb4eb2c09ca2edae571fd1100f7499521c11ace98677
 #@untar:-z:sha256:579c738f8ca191ba0a9b22dbe78f1377542442c9827cf4939f8964f09f9edb28:.
 
 
@@ -49,7 +49,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/versions/musl.771c30950c892f46bf06accc9e76f3ba1d9def6aa765b8eb27b5b9bd2c173784/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/versions/musl.26a006d6cdfa57ea8a349863fbe4cf45cfb02ea7da0fc55e2dcd7f45179010dc/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
 			return 0
 			;;
 		(*)
diff --git a/variants/root-x86_64/easyseccomp b/variants/root-x86_64/easyseccomp
@@ -1,42 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+m4.40d83d50f329cfe11bfeb914c554b41bbe66538ee7aaa4380d5d19e8f33be5bb
-#+patch.cc1f34666bc1f927fcd2d263904e72cd858aa27c0e8127458b58f0bc97d1e211
-#+flex.e74780d4a218bf4ce34228e9e5b6c33beb9f40a5220fa15d25a9fd586382f8fc
-#+bison.1652f11d06c5721f3bb85a3e995ef18dccf5bf6f36081f17d7aecbcbfae5dc67
-#+libseccomp.d5abf8afbd3f53c57397466703b873d106741194e99fba76a2777c10bcb2497f
-#+error-standalone.d958c4d6b54d8e03be6ee09abd4494aff42b4aa96a0521249e12a9f143913011
-#+argp-standalone.2a3fb21a1c1b91eb9b80decd15e1e490c2b531701ec3ba09b638d8a6c8324507
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+m4.54fcb13ff827ab832cd4845f2f252d6283e377b58c2803ba46fc2862aa422d33
+#+patch.f5939c6363d5747ea877353651eb4a9e5533e2e7471ed211cf69624f32b6fadf
+#+flex.dc317eaae721db029d4114e05212cac1e8891266100e882399d19113c03b1451
+#+bison.d2bcd8b75ff96d6becbc842039e5126c2ffa2c34c34abd623464637bad0d204f
+#+libseccomp.74cd74161ef683f458e7bcf1e54024c44d543b2ff13562015ebdcd1352339552
+#+error-standalone.d61d2908d3aba063df340261080ef5d680e7f2056dcb3fb76e0762427056a9b1
+#+argp-standalone.2195dc48a8aa3af20105e0e7a584d2f9ee673c443a2671283ff07793399a4aef
 #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp
 #@sha256:eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10:easyseccomp_fix_includes.patch
 #@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
@@ -68,10 +68,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/error-standalone b/variants/root-x86_64/error-standalone
@@ -1,45 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
 #@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/execline b/variants/root-x86_64/execline
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+skalibs.8f3de7084813874998086223e969bb8bac426263e91a38ef555eaf0ad86f4a26
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+skalibs.32f1433808cbc3408f6fd02d58a48f36e9a8824c267984a7398bd73d2fbe55aa
 #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline
 
 
@@ -46,7 +46,7 @@ cd 'execline'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.8f3de7084813874998086223e969bb8bac426263e91a38ef555eaf0ad86f4a26/sysdeps' \
+	--with-sysdeps='/versions/skalibs.32f1433808cbc3408f6fd02d58a48f36e9a8824c267984a7398bd73d2fbe55aa/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/execline:bootstrap b/variants/root-x86_64/execline:bootstrap
@@ -1,10 +1,10 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
-#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
-#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
-#+skalibs.51fd2f76304c28a7c4462038e0f290fd05f2773d7d32cc74b1a96dfd9c41f95c
+#+musl-cross-make.a231f50ea0bb1cf8f34f63b6b2d02a4a0d2035fc520be7af77e830cf7129fa86
+#+gnu-make.963377e3ce4a91501593ace2c5fd368e5b4faf22405934aa9bebba9e2f85dc2c
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+nawk.3212c1f5782e03c10b90e72e5b510953274da54de73319493ffbf0653bfa51c6
+#+skalibs.56354047ce240452301a96e20b7a2cd24eaf13144525e952347460981a8a7cbd
 #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline
 
 
@@ -28,7 +28,7 @@ export CFLAGS="-O2 -ggdb"
 	--dynlibdir="${prefix}/library.so" \
 	--libdir="${prefix}/library" \
 	--includedir="${prefix}/include" \
-	--with-sysdeps='/versions/skalibs.51fd2f76304c28a7c4462038e0f290fd05f2773d7d32cc74b1a96dfd9c41f95c/sysdeps' \
+	--with-sysdeps='/versions/skalibs.56354047ce240452301a96e20b7a2cd24eaf13144525e952347460981a8a7cbd/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.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+zsh.395877b10c2159be5ce294fdc0850eac86945d98cc77d48f1f0aaf8593880f0b
-#+pthbs-banginstall.56164df1e8e5fee562e9e72b767fd849d7e67f903182e6a1da7844d2bb23152f
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+zsh.160a511e8dc1104420ffc16e0075e189211ef86b2b546f3e11b3d91e77ee7d91
+#+pthbs-banginstall.97d3b141fd70e66fc59912a95a8ef790d6fd1e3ec5a79972e4cba2a31c62f929
 #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset
 
 
diff --git a/variants/root-x86_64/findutils b/variants/root-x86_64/findutils
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+m4.40d83d50f329cfe11bfeb914c554b41bbe66538ee7aaa4380d5d19e8f33be5bb
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+m4.54fcb13ff827ab832cd4845f2f252d6283e377b58c2803ba46fc2862aa422d33
 #@untar:-J:sha256:1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5:.
 
 
@@ -60,10 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/flex b/variants/root-x86_64/flex
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+m4.40d83d50f329cfe11bfeb914c554b41bbe66538ee7aaa4380d5d19e8f33be5bb
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.3212c1f5782e03c10b90e72e5b510953274da54de73319493ffbf0653bfa51c6
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+m4.54fcb13ff827ab832cd4845f2f252d6283e377b58c2803ba46fc2862aa422d33
 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
 
 
@@ -60,10 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/gcc b/variants/root-x86_64/gcc
@@ -1,13 +1,13 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nofail_digest
-#+musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
-#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
-#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
-#+musl.771c30950c892f46bf06accc9e76f3ba1d9def6aa765b8eb27b5b9bd2c173784
-#+gmp.155e1bf4fd18a05787f8337216e8ae191649fc56bc32a9b404e8cdafaa9ea8ec
-#+mpc.af26e7419d54dde5bf39d321dfd3f596caca97c3a6c273bc56019b99c3c4a0c1
-#+mpfr.0eb8d7edd191d65c58cc1fa186d0b38d3bb3b6754876f22cb7167d29ffe3bd5f
+#+musl-cross-make.a231f50ea0bb1cf8f34f63b6b2d02a4a0d2035fc520be7af77e830cf7129fa86
+#+gnu-make.963377e3ce4a91501593ace2c5fd368e5b4faf22405934aa9bebba9e2f85dc2c
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+nawk.3212c1f5782e03c10b90e72e5b510953274da54de73319493ffbf0653bfa51c6
+#+musl.26a006d6cdfa57ea8a349863fbe4cf45cfb02ea7da0fc55e2dcd7f45179010dc
+#+gmp.4fc574fff01e7b988e91ca5ff3fed60816d04ba5d0f83c7fc6b8a18a47cbeeb2
+#+mpc.aa1c079b4f6d0aa1c94f4fe46d1bc44e34b08bfff84e19255739fecf4ebe8686
+#+mpfr.61d613f589ebca5f948194b94152807832609d12bf10e9ae2434dbf8f95ff3e3
 #@sha256:62eb68290502d54b16457509aa0c3995a84116408e6b593d676b9f4c03b6b160:merged.patch
 #@untar:-J:sha256:e0dc77297625631ac8e50fa92fffefe899a4eb702592da5c32ef04e2293aca3a:.
 
@@ -15,10 +15,8 @@
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
@@ -47,10 +45,10 @@ patch -p1 <../merged.patch
 export TZ=UTC
 export SOURCE_DATE_EPOCH=1748000928
 
-mcm=/versions/musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
+mcm=/versions/musl-cross-make.a231f50ea0bb1cf8f34f63b6b2d02a4a0d2035fc520be7af77e830cf7129fa86
 mcm_bin=$mcm/bin/x86_64-linux-musl
-binutils_cmd=/versions/binutils.3f071a6b087aef967f5924d2d214fe161bea2f1161f7b26a6641d3811dac2677
-musl=/versions/musl.771c30950c892f46bf06accc9e76f3ba1d9def6aa765b8eb27b5b9bd2c173784
+binutils_cmd=/versions/binutils.7a79e3f9d4601fba84c01d09d2c34123f4c50c9082e081beb52843cd2525ee01
+musl=/versions/musl.26a006d6cdfa57ea8a349863fbe4cf45cfb02ea7da0fc55e2dcd7f45179010dc
 build_env_static
 
 sysroot="${pthbs_workdir}/sysroot"
diff --git a/variants/root-x86_64/getconf b/variants/root-x86_64/getconf
@@ -1,43 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
 #@sha256:d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c:getconf.c
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/getent b/variants/root-x86_64/getent
@@ -1,43 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
 #@sha256:002c1a216f6bed0f816ab1cfebde94a0b127193ef410c36b2190599983e015b8:getent.c
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/git b/variants/root-x86_64/git
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+m4.40d83d50f329cfe11bfeb914c554b41bbe66538ee7aaa4380d5d19e8f33be5bb
-#+libressl.2e473e902dfa0bb7b1d907fdbdb35fb1a59afbfaf749cae6fb1fda22005a3edb
-#+curl.e4eb1bb9395c22548c4b042a99a3c8a3295393c8672930089d9d32e81951468b
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+m4.54fcb13ff827ab832cd4845f2f252d6283e377b58c2803ba46fc2862aa422d33
+#+libressl.5f6ce78a162c0f2f1a6ccdf81d96ef3861194e6f0b7543f244c67f709183e058
+#+curl.d3aa78208cdef3587276d0f13b47c33e2d79250c709c6c276138a9238c4bb863
 #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:.
 
 
diff --git a/variants/root-x86_64/gmp b/variants/root-x86_64/gmp
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
-#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
-#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+m4.d058098030688ce2ed0667b44392bd4ad76c2701f6574040bd81c43e0fab6ffe
-#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
+#+musl-cross-make.a231f50ea0bb1cf8f34f63b6b2d02a4a0d2035fc520be7af77e830cf7129fa86
+#+gnu-make.963377e3ce4a91501593ace2c5fd368e5b4faf22405934aa9bebba9e2f85dc2c
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+m4.cc39ade96e472af8d1d4b6ddc9be3a6e7857e62d89babfb5dad2d4fa6d951fcb
+#+nawk.3212c1f5782e03c10b90e72e5b510953274da54de73319493ffbf0653bfa51c6
 #@untar:-J:sha256:a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898:.
 
 
@@ -33,10 +33,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/gnu-make b/variants/root-x86_64/gnu-make
@@ -1,8 +1,8 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
-#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.963377e3ce4a91501593ace2c5fd368e5b4faf22405934aa9bebba9e2f85dc2c
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+nawk.3212c1f5782e03c10b90e72e5b510953274da54de73319493ffbf0653bfa51c6
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -32,10 +32,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/gnu-make:bootstrap b/variants/root-x86_64/gnu-make:bootstrap
@@ -1,8 +1,8 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
 #@pragma:nopath
-#+musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
-#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
+#+musl-cross-make.a231f50ea0bb1cf8f34f63b6b2d02a4a0d2035fc520be7af77e830cf7129fa86
+#+nawk.3212c1f5782e03c10b90e72e5b510953274da54de73319493ffbf0653bfa51c6
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -37,7 +37,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'make-4.4.1'
 
 
-mcm=/versions/musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
+mcm=/versions/musl-cross-make.a231f50ea0bb1cf8f34f63b6b2d02a4a0d2035fc520be7af77e830cf7129fa86
 
 export CC="$mcm/bin/x86_64-linux-musl-gcc"
 export CXX="$mcm/bin/x86_64-linux-musl-g++"
diff --git a/variants/root-x86_64/gnu-make:old b/variants/root-x86_64/gnu-make:old
@@ -1,8 +1,8 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.f8a57d7546c64c62e14d1d4b4a09fd10dc77cfc4a37744b75fac6bb5b8bdcb72
-#+gnu-make.99fe3011f86e41833c1116b7b47d2c478ecbacb4f09734045b71df5d0c99534f
-#+busybox.9624330e831e939cd8c151ee92f591249d816c6ccac4d4bcfeaf1ec34c83a4c8
-#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
+#+musl-cross-make.9de60918044d345b88094f1b9766d241a248d8c4ca467269ef8e6291fd1e3899
+#+gnu-make.dd1c52e264308b09b3f7c57a46d1169e66fb9912ef94a03a5737665b5ea10125
+#+busybox.5e31f0f0327b157c167e4177de5a74415b31c690046fd2fdcc51ea2be14a4dc9
+#+nawk.3212c1f5782e03c10b90e72e5b510953274da54de73319493ffbf0653bfa51c6
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
diff --git a/variants/root-x86_64/gnu-make:oldbootstrap b/variants/root-x86_64/gnu-make:oldbootstrap
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
 #@pragma:nopath
-#+musl-cross-make.3a7d0ecaebf339449fdbcf279f0e7a0af8562f98e5d2f4384136f29afa0a0d52
+#+musl-cross-make.19ac8f28b3c5bea3bf3f8cdc16c03da22a6841210159cbfc406af8f411c87a34
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -30,7 +30,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'make-4.4.1'
 
 
-mcm=/versions/musl-cross-make.3a7d0ecaebf339449fdbcf279f0e7a0af8562f98e5d2f4384136f29afa0a0d52
+mcm=/versions/musl-cross-make.19ac8f28b3c5bea3bf3f8cdc16c03da22a6841210159cbfc406af8f411c87a34
 
 export PATH="$mcm/command:$PATH"
 export CC="$mcm/command/x86_64-linux-musl-gcc"
diff --git a/variants/root-x86_64/gperf b/variants/root-x86_64/gperf
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+m4.40d83d50f329cfe11bfeb914c554b41bbe66538ee7aaa4380d5d19e8f33be5bb
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+m4.54fcb13ff827ab832cd4845f2f252d6283e377b58c2803ba46fc2862aa422d33
 #@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:.
 
 
@@ -60,10 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/iconv b/variants/root-x86_64/iconv
@@ -1,43 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
 #@sha256:f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7:iconv.c
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/kbd b/variants/root-x86_64/kbd
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+m4.40d83d50f329cfe11bfeb914c554b41bbe66538ee7aaa4380d5d19e8f33be5bb
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+m4.54fcb13ff827ab832cd4845f2f252d6283e377b58c2803ba46fc2862aa422d33
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 
@@ -61,10 +61,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/libarchive b/variants/root-x86_64/libarchive
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+m4.40d83d50f329cfe11bfeb914c554b41bbe66538ee7aaa4380d5d19e8f33be5bb
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+m4.54fcb13ff827ab832cd4845f2f252d6283e377b58c2803ba46fc2862aa422d33
 #@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:.
 
 
@@ -60,10 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/libbsd b/variants/root-x86_64/libbsd
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+m4.40d83d50f329cfe11bfeb914c554b41bbe66538ee7aaa4380d5d19e8f33be5bb
-#+libmd.51f1562ce51d6a3b62618ae7ea1bf90ddaa4ca414d7bef7076369c7afbaddce3
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+m4.54fcb13ff827ab832cd4845f2f252d6283e377b58c2803ba46fc2862aa422d33
+#+libmd.54db3ddbc8d7aa4c0031033b6468fbe937a6895e939e455a59dab4bb06092008
 #@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:.
 
 
@@ -61,10 +61,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/libcap b/variants/root-x86_64/libcap
@@ -1,46 +1,44 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+pkgconf-pkg-config.e94944954818a6069f4d643a0d98553596df133ac8ccd5bc26e1140ce4f45bc2
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+pkgconf-pkg-config.81a2e86557c7f29747c5e0710f9a59912bded92551099c2720b17ebe1ceb9704
 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/libcap:bootstrap b/variants/root-x86_64/libcap:bootstrap
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
-#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
-#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
+#+musl-cross-make.a231f50ea0bb1cf8f34f63b6b2d02a4a0d2035fc520be7af77e830cf7129fa86
+#+gnu-make.963377e3ce4a91501593ace2c5fd368e5b4faf22405934aa9bebba9e2f85dc2c
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+nawk.3212c1f5782e03c10b90e72e5b510953274da54de73319493ffbf0653bfa51c6
 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:.
 
 
diff --git a/variants/root-x86_64/libcgroup b/variants/root-x86_64/libcgroup
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+m4.40d83d50f329cfe11bfeb914c554b41bbe66538ee7aaa4380d5d19e8f33be5bb
-#+flex.e74780d4a218bf4ce34228e9e5b6c33beb9f40a5220fa15d25a9fd586382f8fc
-#+bison.1652f11d06c5721f3bb85a3e995ef18dccf5bf6f36081f17d7aecbcbfae5dc67
-#+musl-fts.8de31b1ac8652e67c7b34663fbd977775dbd0c7cfc455a7bbc82c8f547ef4896
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+m4.54fcb13ff827ab832cd4845f2f252d6283e377b58c2803ba46fc2862aa422d33
+#+flex.dc317eaae721db029d4114e05212cac1e8891266100e882399d19113c03b1451
+#+bison.d2bcd8b75ff96d6becbc842039e5126c2ffa2c34c34abd623464637bad0d204f
+#+musl-fts.eeb937ba6d3357cd38906f95f150bb67553900746fc383f47627088d2ca6e319
 #@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:.
 
 
@@ -63,10 +63,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/libelf b/variants/root-x86_64/libelf
@@ -1,46 +1,44 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+zstd.d0ea2968e51590efb9b5cc00720992ee080a90bcc057dd91b42dbba09aedf488
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+zstd.d808a868880fd7a702a898794c87cadf8523ef55a88bec1ac34d43088238877b
 #@git:288355d104ff9930520c0283fe82556c6cc5c16f:libelf
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/libmd b/variants/root-x86_64/libmd
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+m4.40d83d50f329cfe11bfeb914c554b41bbe66538ee7aaa4380d5d19e8f33be5bb
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+m4.54fcb13ff827ab832cd4845f2f252d6283e377b58c2803ba46fc2862aa422d33
 #@untar:-J:sha256:1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332:.
 
 
@@ -60,10 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/libressl b/variants/root-x86_64/libressl
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+m4.40d83d50f329cfe11bfeb914c554b41bbe66538ee7aaa4380d5d19e8f33be5bb
-#+ca-certificates-wip-donotuse.d3f6c89d6c1922a76d0185519377a4d5189a723ff77687cad9d374237c64e0c5
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+m4.54fcb13ff827ab832cd4845f2f252d6283e377b58c2803ba46fc2862aa422d33
+#+ca-certificates-wip-donotuse.95d6766364f0a9e83046267291697ce5dd17b5c239ecdc8dbd74c56cd3b2c228
 #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c
 #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:.
 
@@ -62,10 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
@@ -101,7 +99,7 @@ make DESTDIR="$pthbs_destdir" install
 
 cd ..
 gcc ./c_rehash.c -o c_rehash --static -static -I"$pthbs_destdir/$prefix/include" -L"$pthbs_destdir/$prefix/library" -lssl -lcrypto
-cp -vs '/versions/ca-certificates-wip-donotuse.d3f6c89d6c1922a76d0185519377a4d5189a723ff77687cad9d374237c64e0c5/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
+cp -vs '/versions/ca-certificates-wip-donotuse.95d6766364f0a9e83046267291697ce5dd17b5c239ecdc8dbd74c56cd3b2c228/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
 ./c_rehash  "$pthbs_destdir/$prefix/config/ssl/certs/"
 cd  "$pthbs_destdir/$prefix/config/ssl/"
 mv cert.pem libressl-cert.pem
diff --git a/variants/root-x86_64/libseccomp b/variants/root-x86_64/libseccomp
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+m4.40d83d50f329cfe11bfeb914c554b41bbe66538ee7aaa4380d5d19e8f33be5bb
-#+pkgconf-pkg-config.e94944954818a6069f4d643a0d98553596df133ac8ccd5bc26e1140ce4f45bc2
-#+gperf.2b2b4ed1d7296822df41334469bf5e531ee62fadb2a0e91c811228a593dfdd6b
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+m4.54fcb13ff827ab832cd4845f2f252d6283e377b58c2803ba46fc2862aa422d33
+#+pkgconf-pkg-config.81a2e86557c7f29747c5e0710f9a59912bded92551099c2720b17ebe1ceb9704
+#+gperf.296fdf9d1ba10d3a22d3c78e675d52e16977f5a1d583423f829774500585b3c5
 #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:.
 
 
@@ -62,10 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/libunwind b/variants/root-x86_64/libunwind
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+m4.40d83d50f329cfe11bfeb914c554b41bbe66538ee7aaa4380d5d19e8f33be5bb
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+m4.54fcb13ff827ab832cd4845f2f252d6283e377b58c2803ba46fc2862aa422d33
 #@untar:-z:sha256:ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157:.
 
 
@@ -60,10 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/linux-qemu-guest b/variants/root-x86_64/linux-qemu-guest
@@ -1,44 +1,44 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nofail_digest
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-modutils.80cab5cf3e6c2fe6eadfe63679c03785e8b86311508bb8071b5b17672c177ad7
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+findutils.546d28378fdb9da6733c82dbb35bd1568992e8da525806fda5e9ffb8fc51d98e
-#+diffutils.d0677f378a1e47808251ec0a319d7ff60c8021b57c0111e218ffefe7fc441dfa
-#+patch.cc1f34666bc1f927fcd2d263904e72cd858aa27c0e8127458b58f0bc97d1e211
-#+flex.e74780d4a218bf4ce34228e9e5b6c33beb9f40a5220fa15d25a9fd586382f8fc
-#+bison.1652f11d06c5721f3bb85a3e995ef18dccf5bf6f36081f17d7aecbcbfae5dc67
-#+rsync.1ae607f7f9e6240eaebcf006c32fc7e41d65f246f530f9403b88eca8e36ea619
-#+zstd.d0ea2968e51590efb9b5cc00720992ee080a90bcc057dd91b42dbba09aedf488
-#+libelf.ca27d16dc4e14208676594c6f7c520a45a98b56767faea1e1e5a27645cb8cd07
-#+pkgconf-pkg-config.e94944954818a6069f4d643a0d98553596df133ac8ccd5bc26e1140ce4f45bc2
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-modutils.0f21d0dc18d9f6fa69623fec39c958e3b3ccb9dff524fdd4f13b0ca7678e0087
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+findutils.1ca9a221cbfe034384a44d3fca0d5675f9d4294b0d0cf41b2bfee40d5dc033b1
+#+diffutils.7d00c8d42e6a30553091f604d163ddf2b63704ef75af8a2bfc91348661e23ba6
+#+patch.f5939c6363d5747ea877353651eb4a9e5533e2e7471ed211cf69624f32b6fadf
+#+flex.dc317eaae721db029d4114e05212cac1e8891266100e882399d19113c03b1451
+#+bison.d2bcd8b75ff96d6becbc842039e5126c2ffa2c34c34abd623464637bad0d204f
+#+rsync.6c211909510a441cb4cee329683a81d073690a382b9ec794a63eb88660d67021
+#+zstd.d808a868880fd7a702a898794c87cadf8523ef55a88bec1ac34d43088238877b
+#+libelf.cde5d4e43bf91f159f68fa4a347bd0e6c03b68670eee14e07b54b0ed04fa30ce
+#+pkgconf-pkg-config.81a2e86557c7f29747c5e0710f9a59912bded92551099c2720b17ebe1ceb9704
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
 #@untar:-J:sha256:7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764:.
 #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config
 #@sha256:ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417:noobjtool.patch
diff --git a/variants/root-x86_64/lnstools:bootstrap b/variants/root-x86_64/lnstools:bootstrap
@@ -1,12 +1,12 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
-#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
-#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
-#+skalibs.51fd2f76304c28a7c4462038e0f290fd05f2773d7d32cc74b1a96dfd9c41f95c
-#+execline.9daf9a7bdd9682fe29bcbfa885d1af832bc41a23ab3c03147b3f32de809bcc87
-#+libcap.13625f68ef32f55914e874346d14cf327d6cecf239850dbfd25b7f010e29796c
+#+musl-cross-make.a231f50ea0bb1cf8f34f63b6b2d02a4a0d2035fc520be7af77e830cf7129fa86
+#+gnu-make.963377e3ce4a91501593ace2c5fd368e5b4faf22405934aa9bebba9e2f85dc2c
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+nawk.3212c1f5782e03c10b90e72e5b510953274da54de73319493ffbf0653bfa51c6
+#+skalibs.56354047ce240452301a96e20b7a2cd24eaf13144525e952347460981a8a7cbd
+#+execline.45586012eb5f84d8b21d12bb6ff8b7ebe72cdabd35674b313cfae016552a25a2
+#+libcap.d84a6ceb5ca2d3094f5de51a578bb62d4817e12e39770ea1a742877b3af468ad
 #@git:eef7fb4a9532fd0a9f6c23af5f20196c465df1b6:lnstools
 
 
diff --git a/variants/root-x86_64/logincaps b/variants/root-x86_64/logincaps
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+zsh.395877b10c2159be5ce294fdc0850eac86945d98cc77d48f1f0aaf8593880f0b
-#+pthbs-banginstall.56164df1e8e5fee562e9e72b767fd849d7e67f903182e6a1da7844d2bb23152f
-#+execline.49b9333c99a58b660feb75a7598c32e9c3dfd97c16b81b7ebd4bc6bf3123f0a3
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+ccx-utils.e5fdf6dedb639eaa807c7aee61370932de3a0b382ae152855e9bb8b11f08c6c4
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+zsh.160a511e8dc1104420ffc16e0075e189211ef86b2b546f3e11b3d91e77ee7d91
+#+pthbs-banginstall.97d3b141fd70e66fc59912a95a8ef790d6fd1e3ec5a79972e4cba2a31c62f929
+#+execline.c0c5f161b8a116da36ddada8138118cfe5c31a9f9f836653ce0a07d0f2f0946e
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+ccx-utils.f098fada9c7a39e9f64bfe84e15907a6535b1be88cd8e1b21eeeaa591f84f666
 #@git:409db79b3e7e5fc6b73305471d9bbb6ac5c14036:logincaps
 
 
diff --git a/variants/root-x86_64/m4 b/variants/root-x86_64/m4
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+nawk.3212c1f5782e03c10b90e72e5b510953274da54de73319493ffbf0653bfa51c6
 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
 
 
@@ -59,10 +59,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/m4:bootstrap b/variants/root-x86_64/m4:bootstrap
@@ -1,8 +1,8 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
-#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
-#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
+#+musl-cross-make.a231f50ea0bb1cf8f34f63b6b2d02a4a0d2035fc520be7af77e830cf7129fa86
+#+gnu-make.963377e3ce4a91501593ace2c5fd368e5b4faf22405934aa9bebba9e2f85dc2c
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+nawk.3212c1f5782e03c10b90e72e5b510953274da54de73319493ffbf0653bfa51c6
 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
 
 
@@ -32,10 +32,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/mandoc b/variants/root-x86_64/mandoc
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
 #@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.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+zsh.395877b10c2159be5ce294fdc0850eac86945d98cc77d48f1f0aaf8593880f0b
-#+pthbs-banginstall.56164df1e8e5fee562e9e72b767fd849d7e67f903182e6a1da7844d2bb23152f
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+zsh.160a511e8dc1104420ffc16e0075e189211ef86b2b546f3e11b3d91e77ee7d91
+#+pthbs-banginstall.97d3b141fd70e66fc59912a95a8ef790d6fd1e3ec5a79972e4cba2a31c62f929
 #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts
 
 
diff --git a/variants/root-x86_64/mdevd b/variants/root-x86_64/mdevd
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+skalibs.8f3de7084813874998086223e969bb8bac426263e91a38ef555eaf0ad86f4a26
-#+execline.49b9333c99a58b660feb75a7598c32e9c3dfd97c16b81b7ebd4bc6bf3123f0a3
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+skalibs.32f1433808cbc3408f6fd02d58a48f36e9a8824c267984a7398bd73d2fbe55aa
+#+execline.c0c5f161b8a116da36ddada8138118cfe5c31a9f9f836653ce0a07d0f2f0946e
 #@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd
 
 
@@ -47,7 +47,7 @@ cd 'mdevd'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.8f3de7084813874998086223e969bb8bac426263e91a38ef555eaf0ad86f4a26/sysdeps' \
+	--with-sysdeps='/versions/skalibs.32f1433808cbc3408f6fd02d58a48f36e9a8824c267984a7398bd73d2fbe55aa/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.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-dosfstools.17418e245a79d9725a6ae2a304e8980e8d02766ab4224191de9c8d3923588b99
-#+busybox-e2fsprogs.3fed30e21aaebe97507cdd92dd433ba6c6e7a855bf557f7351d8702ae45880a8
-#+busybox-iproute2.a9cacc297d75738f0a814a984f4041c6772341f1a9ba1303771e24bc2feaf04e
-#+busybox-iputils.0b1ae18a66bf5045a3463f1f45b4518e06a912ddeec9ffbc86da30eefd79d36e
-#+busybox-net-misc.980107605e3ea5c0d52971c26d91f75bfa55d0554bcf0706580b44fcbc14ff5a
-#+busybox-net-tools.39b4b816e22b505111ca63e1bd3a0dad7b74a70dca121f2ff7c96b0d4ce2ddab
-#+busybox-traceroute.6e4cc3bdc0547aed295f908a69d25c5cff18e8ec342ff8a67dd131c2c3fb6c31
-#+busybox-wget.a5f7e43cfff655cc903dc1a233bfd94c790a291b508ef7cbc8af6e7e2811c50d
-#+busybox-chpst.985296c53e6cf78662e03bb4cc9dbcb580e8427c29929485aefd50ac475bbbc3
-#+busybox-console.49590f9bac1944990fafe5ff2f00f6ecd5aa18228af89236ad38c7e2133b7b7f
-#+busybox-getty.3a5a349030999753457a10436d5d8664968749d357e6d6f1122cd9edd6ec3cb1
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-dosfstools.840efe96ff4a2fd5e6ea201844ee069a9bfde1e57e578011f88d081922e35ea0
+#+busybox-e2fsprogs.faa0971a44cffd7bad7ba247673a28f728b4ed34b16e778f13bce0163234313b
+#+busybox-iproute2.0a789e50432c5132c76e4e54327cdd3c4fc725419effebaff03fa1afcfdddb20
+#+busybox-iputils.6b15d2fa0a002dacb68c5f05d168cd2494040894aaa7452d7c3b989b26f95dfe
+#+busybox-net-misc.4f31d3bfa9084f11f49ac9a169597ccfefd3f547e7aaa78243dfa18dd4f78179
+#+busybox-net-tools.90acb34ce84618017f7906ba371f7397e291af641ff9b5e3758377a80f6e84b0
+#+busybox-traceroute.f96679012635964f73233feccaa3aa1a853db2d1bdd1440e39762d0fb9868c3d
+#+busybox-wget.4cd596d47e7943359b171a19f33002dd7bad5608db03b5c324e1a15e445e5a5d
+#+busybox-chpst.d87c2a4fd4f0f7d104cbbc9ba58e05912237813390eefe6579761da5b01cf460
+#+busybox-console.b8f64edf384a8c977a54e349796cef3715ecc6005821bf46349f0ff08c99943b
+#+busybox-getty.460a745e392e12e0316e52a50e6c8cc6641aac12f63e6c16564c1d1335dbfdd3
 
-#+busybox-linux-extra.0a95a767387672134e1207a9314e7a5183bd00dcbc3404c3a3c02289f1b936bb
-#+busybox-mtd-utils.4047b79030c1fbfab40c3788a8ff792e26a3c7a6e0fa5b51410b4d02f2b9f9bd
-#+busybox-shadow.ac1d0f9df6782543628fe54a3aa54b58cd8b277667234fe2a0b97fc8a3363b3e
-#+busybox-su.37d0a5986b05d58d967230e94db3f50cc681477f7757d64bf597f0062012c5ad
-#+busybox-util-linux-priv.7a73598520c2b93de5291054ae77039eca2a6c99bb48c1edb1007fba5297d1bc
-#+busybox-logging.98bcaf3ee34d0ec01e1f841202ca969e1644e60629eda17e772fe49eb5beb185
-#+busybox-cron.2990cddd6816d75b12679929f7d4c17bc5f40baa1ff3223bf75682322c9b9b64
-#+execline.49b9333c99a58b660feb75a7598c32e9c3dfd97c16b81b7ebd4bc6bf3123f0a3
-#+s6.7f7a7a7fb3647c28a7ad7253b3e9970c1cd091c6fadd755f9577562494e382cc
-#+mdev-scripts.d3515165311f4a36fbc50cbafa27962aa73c786101af0aee6724815d478ea1c3
-#+mdevd.3d9d8063a7411360f27cd8f724b62236356870400bfe73dee4b99cbf1081a3d1
-#+busybox-modutils.80cab5cf3e6c2fe6eadfe63679c03785e8b86311508bb8071b5b17672c177ad7-
\ No newline at end of file
+#+busybox-linux-extra.f9921395428e9fa8b5af16018385c92d704b2cdf7d640af91d12339eb861da7d
+#+busybox-mtd-utils.7fd114e7b6fd74fa7eca5c72a51a682ba5e0a8612c1c94fda49f05e00399c8b1
+#+busybox-shadow.e25a023c5fec5ffb50245be48589001bba2991ef5c4630dfdb2c7163045d11d2
+#+busybox-su.2ba2709e598244cae8847d472c6d75baea820aece7b47e68aa2995282dd197a0
+#+busybox-util-linux-priv.6ecfcbc54fc609ca2f78f69276a0958e35768f2f1947ba76375e99aa3746fede
+#+busybox-logging.f16e603247e9dd21d587a1b47863c4accee0405b3129a15cc2f1bc3168ac5915
+#+busybox-cron.4dffe76d11bfebbde0a1009a25512f1fe2152643eb72e579718e00d8c6ab749e
+#+execline.c0c5f161b8a116da36ddada8138118cfe5c31a9f9f836653ce0a07d0f2f0946e
+#+s6.4ba820562a6a96f108135acc5bbc99ca193e16890ff8f7d1cd71f8abb1cd0a1a
+#+mdev-scripts.8d9f780aa5224b21080c4ae1f19ca84d15f0387fe69d9cd0e00640359c93abc9
+#+mdevd.4db62fcc7311dd8bb11154429406f5fee75629ee4e6f0aee3fbd6b827c806d83
+#+busybox-modutils.0f21d0dc18d9f6fa69623fec39c958e3b3ccb9dff524fdd4f13b0ca7678e0087+
\ No newline at end of file
diff --git a/variants/root-x86_64/mlog b/variants/root-x86_64/mlog
@@ -1,44 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
 #@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/mpc b/variants/root-x86_64/mpc
@@ -1,11 +1,11 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
-#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
-#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+m4.d058098030688ce2ed0667b44392bd4ad76c2701f6574040bd81c43e0fab6ffe
-#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
-#+gmp.155e1bf4fd18a05787f8337216e8ae191649fc56bc32a9b404e8cdafaa9ea8ec
-#+mpfr.0eb8d7edd191d65c58cc1fa186d0b38d3bb3b6754876f22cb7167d29ffe3bd5f
+#+musl-cross-make.a231f50ea0bb1cf8f34f63b6b2d02a4a0d2035fc520be7af77e830cf7129fa86
+#+gnu-make.963377e3ce4a91501593ace2c5fd368e5b4faf22405934aa9bebba9e2f85dc2c
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+m4.cc39ade96e472af8d1d4b6ddc9be3a6e7857e62d89babfb5dad2d4fa6d951fcb
+#+nawk.3212c1f5782e03c10b90e72e5b510953274da54de73319493ffbf0653bfa51c6
+#+gmp.4fc574fff01e7b988e91ca5ff3fed60816d04ba5d0f83c7fc6b8a18a47cbeeb2
+#+mpfr.61d613f589ebca5f948194b94152807832609d12bf10e9ae2434dbf8f95ff3e3
 #@untar:-z:sha256:ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8:.
 
 
@@ -35,10 +35,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/mpfr b/variants/root-x86_64/mpfr
@@ -1,10 +1,10 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
-#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
-#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+m4.d058098030688ce2ed0667b44392bd4ad76c2701f6574040bd81c43e0fab6ffe
-#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
-#+gmp.155e1bf4fd18a05787f8337216e8ae191649fc56bc32a9b404e8cdafaa9ea8ec
+#+musl-cross-make.a231f50ea0bb1cf8f34f63b6b2d02a4a0d2035fc520be7af77e830cf7129fa86
+#+gnu-make.963377e3ce4a91501593ace2c5fd368e5b4faf22405934aa9bebba9e2f85dc2c
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+m4.cc39ade96e472af8d1d4b6ddc9be3a6e7857e62d89babfb5dad2d4fa6d951fcb
+#+nawk.3212c1f5782e03c10b90e72e5b510953274da54de73319493ffbf0653bfa51c6
+#+gmp.4fc574fff01e7b988e91ca5ff3fed60816d04ba5d0f83c7fc6b8a18a47cbeeb2
 #@untar:-J:sha256:b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01:.
 
 
@@ -34,10 +34,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/musl b/variants/root-x86_64/musl
@@ -1,8 +1,8 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
-#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
-#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
+#+musl-cross-make.a231f50ea0bb1cf8f34f63b6b2d02a4a0d2035fc520be7af77e830cf7129fa86
+#+gnu-make.963377e3ce4a91501593ace2c5fd368e5b4faf22405934aa9bebba9e2f85dc2c
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+nawk.3212c1f5782e03c10b90e72e5b510953274da54de73319493ffbf0653bfa51c6
 #@sha256:a21336df3bc3b267fbda940d9f533f66b0eacb520b8421cca3ddc943f620a791:merged.patch
 #@untar:-z:sha256:a9a118bbe84d8764da0ea0d28b3ab3fae8477fc7e4085d90102b8596fc7c75e4:.
 
@@ -16,7 +16,7 @@ cd 'musl-1.2.5'
 patch -p1 <../merged.patch
 
 
-mcm=/versions/musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
+mcm=/versions/musl-cross-make.a231f50ea0bb1cf8f34f63b6b2d02a4a0d2035fc520be7af77e830cf7129fa86
 
 ./configure \
 	--prefix="$prefix" \
diff --git a/variants/root-x86_64/musl-cross-make b/variants/root-x86_64/musl-cross-make
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nofail_digest
-#+musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
-#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
-#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
+#+musl-cross-make.a231f50ea0bb1cf8f34f63b6b2d02a4a0d2035fc520be7af77e830cf7129fa86
+#+gnu-make.963377e3ce4a91501593ace2c5fd368e5b4faf22405934aa9bebba9e2f85dc2c
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+nawk.3212c1f5782e03c10b90e72e5b510953274da54de73319493ffbf0653bfa51c6
 #@sha256:0cdd76777a0dfd3dd3a63f215f030208ddb91c2361d2bcc02acec0f1c16b6a2e:musl-cross-make/sources/binutils-2.44.tar.gz
 #@sha256:a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898:musl-cross-make/sources/gmp-6.3.0.tar.xz
 #@sha256:b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01:musl-cross-make/sources/mpfr-4.2.2.tar.xz
@@ -112,6 +112,18 @@ fi
 
 
 
+mkdir -p "$dest/library.so" "$dest/.env-template"
+printf '%s' >"$dest/.env-template/CPATH" @ENVROOT@/'include'
+printf '%s' >"$dest/.env-template/LIBRARY_PATH" @ENVROOT@/'library'
+printf '%s' >"$dest/.env-template/LD_LIBRARY_PATH" @ENVROOT@/'library.so'
+
+dynlib_to_top="$(printf "%s\n" 'library.so' | sed -Ee "s!^\./!!; s![^/]+!..!g")"
+printf >>link_to_dynlib '%s\n' 'ln -s "'$dynlib_to_top'${1#.}" ''library.so'/
+( cd "$dest" && find "./lib" "./x86_64-linux-musl" \
+	\( -type f -o -type l \) \( -name '*.so' -o -name '*.so.*' \) \
+	-exec sh -xe "$pthbs_workdir/link_to_dynlib" '{}' ';'
+)
+
 pkgs="gmp mpc mpfr zlib"
 #pkgs="$pkgs libbacktrace libcc1 libcpp libdecnumber libiberty lto-plugin"
 
@@ -156,6 +168,10 @@ BEGIN {
 	x["./lib/libmpfr.a"]=1
 	x["./lib/libz.a"]=1
 
+	x["./x86_64-linux-musl/lib/libc.so"]=1
+	x["./x86_64-linux-musl/lib/libgcc_s.so"]=1
+	x["./x86_64-linux-musl/lib/libstdc++.so"]=1
+
 	x["./include/gmp.h"]=1
 	x["./include/mpc.h"]=1
 	x["./include/mpf2mpfr.h"]=1
diff --git a/variants/root-x86_64/musl-cross-make:bootstrap-1 b/variants/root-x86_64/musl-cross-make:bootstrap-1
@@ -3,7 +3,7 @@
 #@pragma:nosandbox
 #@pragma:nopath
 #+musl-cross-make.12658d2796f34f5cebd9c9df8bdf874a741ca941139e98de5a73f523b0b10645
-#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
+#+nawk.3212c1f5782e03c10b90e72e5b510953274da54de73319493ffbf0653bfa51c6
 #@sha256:0cdd76777a0dfd3dd3a63f215f030208ddb91c2361d2bcc02acec0f1c16b6a2e:musl-cross-make/sources/binutils-2.44.tar.gz
 #@sha256:a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898:musl-cross-make/sources/gmp-6.3.0.tar.xz
 #@sha256:b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01:musl-cross-make/sources/mpfr-4.2.2.tar.xz
diff --git a/variants/root-x86_64/musl-cross-make:old b/variants/root-x86_64/musl-cross-make:old
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nofail_digest
-#+musl-cross-make.3a7d0ecaebf339449fdbcf279f0e7a0af8562f98e5d2f4384136f29afa0a0d52
-#+gnu-make.99fe3011f86e41833c1116b7b47d2c478ecbacb4f09734045b71df5d0c99534f
-#+busybox.9624330e831e939cd8c151ee92f591249d816c6ccac4d4bcfeaf1ec34c83a4c8
-#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
+#+musl-cross-make.19ac8f28b3c5bea3bf3f8cdc16c03da22a6841210159cbfc406af8f411c87a34
+#+gnu-make.dd1c52e264308b09b3f7c57a46d1169e66fb9912ef94a03a5737665b5ea10125
+#+busybox.5e31f0f0327b157c167e4177de5a74415b31c690046fd2fdcc51ea2be14a4dc9
+#+nawk.3212c1f5782e03c10b90e72e5b510953274da54de73319493ffbf0653bfa51c6
 #@sha256:0cdd76777a0dfd3dd3a63f215f030208ddb91c2361d2bcc02acec0f1c16b6a2e:musl-cross-make/sources/binutils-2.44.tar.gz
 #@sha256:a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898:musl-cross-make/sources/gmp-6.3.0.tar.xz
 #@sha256:b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01:musl-cross-make/sources/mpfr-4.2.2.tar.xz
diff --git a/variants/root-x86_64/musl-cross-make:oldbootstrap-1 b/variants/root-x86_64/musl-cross-make:oldbootstrap-1
@@ -3,7 +3,7 @@
 #@pragma:nosandbox
 #@pragma:nopath
 #+musl-cross-make.12658d2796f34f5cebd9c9df8bdf874a741ca941139e98de5a73f523b0b10645
-#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
+#+nawk.3212c1f5782e03c10b90e72e5b510953274da54de73319493ffbf0653bfa51c6
 #@sha256:0cdd76777a0dfd3dd3a63f215f030208ddb91c2361d2bcc02acec0f1c16b6a2e:musl-cross-make/sources/binutils-2.44.tar.gz
 #@sha256:a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898:musl-cross-make/sources/gmp-6.3.0.tar.xz
 #@sha256:b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01:musl-cross-make/sources/mpfr-4.2.2.tar.xz
diff --git a/variants/root-x86_64/musl-fts b/variants/root-x86_64/musl-fts
@@ -1,44 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
 #@untar:-z:sha256:49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/nawk b/variants/root-x86_64/nawk
@@ -1,45 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
-#+bison.1652f11d06c5721f3bb85a3e995ef18dccf5bf6f36081f17d7aecbcbfae5dc67
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.3212c1f5782e03c10b90e72e5b510953274da54de73319493ffbf0653bfa51c6
+#+bison.d2bcd8b75ff96d6becbc842039e5126c2ffa2c34c34abd623464637bad0d204f
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
 #@untar:-z:sha256:e031b1e1d2b230f276f975bffb923f0ea15f798c839d15a3f26a1a39448e32d7:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/nawk:bootstrap b/variants/root-x86_64/nawk:bootstrap
@@ -11,10 +11,8 @@
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/netbsd-curses b/variants/root-x86_64/netbsd-curses
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
 #@git:51d179dad861640caeb76674b5908ccd79f04fae:netbsd-curses
 
 
diff --git a/variants/root-x86_64/nvi b/variants/root-x86_64/nvi
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+m4.40d83d50f329cfe11bfeb914c554b41bbe66538ee7aaa4380d5d19e8f33be5bb
-#+netbsd-curses.89d0e50461587137de691ff7d86e0ad43a460b53fa9b9e628ec736486eb51a91
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+m4.54fcb13ff827ab832cd4845f2f252d6283e377b58c2803ba46fc2862aa422d33
+#+netbsd-curses.8578184a5c4fc4c335e58d885274db099312860700445cef375937a9ec4e5dec
 #@untar:-z:sha256:755b87aa1e25c24c4c1668de5573d7d9a327b529423ce3ad9ee753bfb2296e33:.
 
 
@@ -61,10 +61,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/ocaml-astring b/variants/root-x86_64/ocaml-astring
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+ocaml.3cef599bb2d79ed5c803ff43addda5097f2deac41baf2541e45e6b3ed3faa7b3
-#+ocaml-findlib.7545960042ed23caf596775e7010ecf30ebdde99b2cabe17e72c581d4844d85b
-#+ocamlbuild.f60f824d0efa38394ed328798908b6aa9760aae86f026b75fa48192156681dc6
-#+opam.1cce70139141c265ea3bd80c20c2c2a786b78ac77370d29d2492772adadde2db
-#+ocaml-topkg.2fe0dda43065243d1f23415abfe9561d8c37b888b04aaed5ae33b58b4aaa095f
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+ocaml.c47166087b73d25dd821bb4eb2c09ca2edae571fd1100f7499521c11ace98677
+#+ocaml-findlib.cd8e40c7e695e12b148e80eb695d41430a0a249afaaefff455fd2d850a3ac7d6
+#+ocamlbuild.9ab1e3e7a5f3483e9817a13eb531249b60e97091e2af077a4a2a601854e8171c
+#+opam.410c0c38c92f2b423e00b88f154fe5eacb820345b85d7febc8532edca2d6ff24
+#+ocaml-topkg.de293f02c9d19ceb1098fd35d05af463a91d8efc164c53fa63659a3b2d49b764
 #@untar:-j:sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa:.
 
 
diff --git a/variants/root-x86_64/ocaml-base b/variants/root-x86_64/ocaml-base
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+ocaml.3cef599bb2d79ed5c803ff43addda5097f2deac41baf2541e45e6b3ed3faa7b3
-#+dune.b95531c089c7ae1ed6c8b5e2f5a7ea3643502a9e133deb3b712c185a253aac8e
-#+ocaml_intrinsics_kernel.857da28f863ed87d8a280dee6f202d429c2c54112b535447cae5791ee47b1704
-#+ocaml-sexplib0.3b69037673c719bb838d77ed5173f7ef4578b0c19179c6fd577953062de257d3
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+ocaml.c47166087b73d25dd821bb4eb2c09ca2edae571fd1100f7499521c11ace98677
+#+dune.3d25979e451621a278c889a6413c82bf9735f5f8ec9eac52cc524eef03ab755d
+#+ocaml_intrinsics_kernel.83b80ac0a964b43eb3b54408b13759e54d107fe6ef4c6cda774383e38a6894b3
+#+ocaml-sexplib0.6cf9e0fe35f3b34e5be4d9695a6edd5e92402bbd67f3711a165c63f68eeb574f
 #@untar:-z:sha256:3f3f64789ab25bb5cb7f5f907dd651dec9cc9440981822fe75df6b94344b7208:.
 
 
diff --git a/variants/root-x86_64/ocaml-bos b/variants/root-x86_64/ocaml-bos
@@ -1,45 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+ocaml.3cef599bb2d79ed5c803ff43addda5097f2deac41baf2541e45e6b3ed3faa7b3
-#+ocaml-findlib.7545960042ed23caf596775e7010ecf30ebdde99b2cabe17e72c581d4844d85b
-#+ocamlbuild.f60f824d0efa38394ed328798908b6aa9760aae86f026b75fa48192156681dc6
-#+opam.1cce70139141c265ea3bd80c20c2c2a786b78ac77370d29d2492772adadde2db
-#+ocaml-topkg.2fe0dda43065243d1f23415abfe9561d8c37b888b04aaed5ae33b58b4aaa095f
-#+ocaml-astring.e9559478e3dbac579c6700eb0ad3de61a7dcddfcea8a536638b0be1d932b9b97
-#+ocaml-fpath.6a3a5ba72e63242e844fb20b890d77caa7e7bc20d75319aa91e0ab3909912edc
-#+ocaml-rresult.95e3f33b127e36efe7690faace9c754aaff8d6b54fa0c00e58b0ea734bd8dfde
-#+ocaml-fmt.9b81d2c81f973de2749ef770505a0eb000f838420e649eb9aee5114c0e6b59d6
-#+ocaml-logs.a9a9acdaff51e5b8cfbdff1251357189cf86a2ea22856fbb261eb26c0ef9a587
-#+ocaml-mtime.8e659f3d4a5be6e4e613f161cada8ef081d177a6c50b8ca701e06fd47becfe42
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+ocaml.c47166087b73d25dd821bb4eb2c09ca2edae571fd1100f7499521c11ace98677
+#+ocaml-findlib.cd8e40c7e695e12b148e80eb695d41430a0a249afaaefff455fd2d850a3ac7d6
+#+ocamlbuild.9ab1e3e7a5f3483e9817a13eb531249b60e97091e2af077a4a2a601854e8171c
+#+opam.410c0c38c92f2b423e00b88f154fe5eacb820345b85d7febc8532edca2d6ff24
+#+ocaml-topkg.de293f02c9d19ceb1098fd35d05af463a91d8efc164c53fa63659a3b2d49b764
+#+ocaml-astring.27ac3178e4f4d2399ebb8c3e7bfe9daf6785d4fee180c63b992aa710e5510e30
+#+ocaml-fpath.3c537e0ff9ccfbb2eef87739f94f04002fbacffedaab180b6b3b3ca5ed313ca7
+#+ocaml-rresult.2125c2c9319ca6747c88897ebd0b961d1cf49d50d28afe7220bf5cbc2cbf0dbe
+#+ocaml-fmt.eecce58b2e176900c553819a035ab0fa6a329035a8dc0b7617534a9b1620e115
+#+ocaml-logs.ecbaf3ad490000b60bb4b5f792dd12a116d78189a33a1acb49a7c78e740c6478
+#+ocaml-mtime.0dbe706fcfb8c64e222b3009908e15393984678b7f68aefc11e0cab2d2398f01
 #@untar:-j:sha256:d8d62e786b10d697e0457205a8eedeaa27ebcc90f1855f18df190cac2e3d8f37:.
 
 
diff --git a/variants/root-x86_64/ocaml-cmdliner b/variants/root-x86_64/ocaml-cmdliner
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+ocaml.3cef599bb2d79ed5c803ff43addda5097f2deac41baf2541e45e6b3ed3faa7b3
-#+ocaml-findlib.7545960042ed23caf596775e7010ecf30ebdde99b2cabe17e72c581d4844d85b
-#+ocamlbuild.f60f824d0efa38394ed328798908b6aa9760aae86f026b75fa48192156681dc6
-#+opam.1cce70139141c265ea3bd80c20c2c2a786b78ac77370d29d2492772adadde2db
-#+ocaml-topkg.2fe0dda43065243d1f23415abfe9561d8c37b888b04aaed5ae33b58b4aaa095f
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+ocaml.c47166087b73d25dd821bb4eb2c09ca2edae571fd1100f7499521c11ace98677
+#+ocaml-findlib.cd8e40c7e695e12b148e80eb695d41430a0a249afaaefff455fd2d850a3ac7d6
+#+ocamlbuild.9ab1e3e7a5f3483e9817a13eb531249b60e97091e2af077a4a2a601854e8171c
+#+opam.410c0c38c92f2b423e00b88f154fe5eacb820345b85d7febc8532edca2d6ff24
+#+ocaml-topkg.de293f02c9d19ceb1098fd35d05af463a91d8efc164c53fa63659a3b2d49b764
 #@untar:-j:sha256:4e547a631c36fbaadff60d3bd7724eb3f83ba274e92fb725950bae7868378582:.
 
 
diff --git a/variants/root-x86_64/ocaml-compiler-libs b/variants/root-x86_64/ocaml-compiler-libs
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+ocaml.3cef599bb2d79ed5c803ff43addda5097f2deac41baf2541e45e6b3ed3faa7b3
-#+dune.b95531c089c7ae1ed6c8b5e2f5a7ea3643502a9e133deb3b712c185a253aac8e
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+ocaml.c47166087b73d25dd821bb4eb2c09ca2edae571fd1100f7499521c11ace98677
+#+dune.3d25979e451621a278c889a6413c82bf9735f5f8ec9eac52cc524eef03ab755d
 #@untar:-z:sha256:9b9644d7351db699e57ddba7c767bb4153e6e988ccf45ead2fb238a3bd75cdc7:.
 
 
diff --git a/variants/root-x86_64/ocaml-cppo b/variants/root-x86_64/ocaml-cppo
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+ocaml.3cef599bb2d79ed5c803ff43addda5097f2deac41baf2541e45e6b3ed3faa7b3
-#+dune.b95531c089c7ae1ed6c8b5e2f5a7ea3643502a9e133deb3b712c185a253aac8e
-#+ocamlbuild.f60f824d0efa38394ed328798908b6aa9760aae86f026b75fa48192156681dc6
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+ocaml.c47166087b73d25dd821bb4eb2c09ca2edae571fd1100f7499521c11ace98677
+#+dune.3d25979e451621a278c889a6413c82bf9735f5f8ec9eac52cc524eef03ab755d
+#+ocamlbuild.9ab1e3e7a5f3483e9817a13eb531249b60e97091e2af077a4a2a601854e8171c
 #@untar:-z:sha256:6e62a8ee0217c9cc38d5860110eb18eb8d89c05c420353d298e1431fe8bac00f:.
 
 
diff --git a/variants/root-x86_64/ocaml-findlib b/variants/root-x86_64/ocaml-findlib
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+m4.40d83d50f329cfe11bfeb914c554b41bbe66538ee7aaa4380d5d19e8f33be5bb
-#+netbsd-curses.89d0e50461587137de691ff7d86e0ad43a460b53fa9b9e628ec736486eb51a91
-#+ocaml.3cef599bb2d79ed5c803ff43addda5097f2deac41baf2541e45e6b3ed3faa7b3
-#+ocamlbuild.f60f824d0efa38394ed328798908b6aa9760aae86f026b75fa48192156681dc6
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+m4.54fcb13ff827ab832cd4845f2f252d6283e377b58c2803ba46fc2862aa422d33
+#+netbsd-curses.8578184a5c4fc4c335e58d885274db099312860700445cef375937a9ec4e5dec
+#+ocaml.c47166087b73d25dd821bb4eb2c09ca2edae571fd1100f7499521c11ace98677
+#+ocamlbuild.9ab1e3e7a5f3483e9817a13eb531249b60e97091e2af077a4a2a601854e8171c
 #@untar:-z:sha256:662c910f774e9fee3a19c4e057f380581ab2fc4ee52da4761304ac9c31b8869d:.
 
 
@@ -53,7 +53,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/versions/musl.771c30950c892f46bf06accc9e76f3ba1d9def6aa765b8eb27b5b9bd2c173784/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/versions/musl.26a006d6cdfa57ea8a349863fbe4cf45cfb02ea7da0fc55e2dcd7f45179010dc/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
 			return 0
 			;;
 		(*)
@@ -79,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.3cef599bb2d79ed5c803ff43addda5097f2deac41baf2541e45e6b3ed3faa7b3"
+stdlib="$pthbs_destdir/versions/ocaml.c47166087b73d25dd821bb4eb2c09ca2edae571fd1100f7499521c11ace98677"
 mkdir -p "${stdlib%/*}"
 ln -s "$pthbs_package" "$stdlib"
 make install prefix="$pthbs_destdir"
diff --git a/variants/root-x86_64/ocaml-fmt b/variants/root-x86_64/ocaml-fmt
@@ -1,40 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+ocaml.3cef599bb2d79ed5c803ff43addda5097f2deac41baf2541e45e6b3ed3faa7b3
-#+ocaml-findlib.7545960042ed23caf596775e7010ecf30ebdde99b2cabe17e72c581d4844d85b
-#+ocamlbuild.f60f824d0efa38394ed328798908b6aa9760aae86f026b75fa48192156681dc6
-#+opam.1cce70139141c265ea3bd80c20c2c2a786b78ac77370d29d2492772adadde2db
-#+ocaml-topkg.2fe0dda43065243d1f23415abfe9561d8c37b888b04aaed5ae33b58b4aaa095f
-#+ocaml-cmdliner.d615e05b9c887a6b191fc932aa0feabb31d077d7d838772eeb6d3502b9e79486
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+ocaml.c47166087b73d25dd821bb4eb2c09ca2edae571fd1100f7499521c11ace98677
+#+ocaml-findlib.cd8e40c7e695e12b148e80eb695d41430a0a249afaaefff455fd2d850a3ac7d6
+#+ocamlbuild.9ab1e3e7a5f3483e9817a13eb531249b60e97091e2af077a4a2a601854e8171c
+#+opam.410c0c38c92f2b423e00b88f154fe5eacb820345b85d7febc8532edca2d6ff24
+#+ocaml-topkg.de293f02c9d19ceb1098fd35d05af463a91d8efc164c53fa63659a3b2d49b764
+#+ocaml-cmdliner.aa0c5534e20ca77b349a9955da3319257f7c5a7a9213514cf211783cd16f3e5e
 #@untar:-j:sha256:857cfd47a54b52429cd9b3e2665e44173cd1bd3b435bece7172f984ad5376a1b:.
 
 
diff --git a/variants/root-x86_64/ocaml-fpath b/variants/root-x86_64/ocaml-fpath
@@ -1,40 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+ocaml.3cef599bb2d79ed5c803ff43addda5097f2deac41baf2541e45e6b3ed3faa7b3
-#+ocaml-findlib.7545960042ed23caf596775e7010ecf30ebdde99b2cabe17e72c581d4844d85b
-#+ocamlbuild.f60f824d0efa38394ed328798908b6aa9760aae86f026b75fa48192156681dc6
-#+opam.1cce70139141c265ea3bd80c20c2c2a786b78ac77370d29d2492772adadde2db
-#+ocaml-topkg.2fe0dda43065243d1f23415abfe9561d8c37b888b04aaed5ae33b58b4aaa095f
-#+ocaml-astring.e9559478e3dbac579c6700eb0ad3de61a7dcddfcea8a536638b0be1d932b9b97
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+ocaml.c47166087b73d25dd821bb4eb2c09ca2edae571fd1100f7499521c11ace98677
+#+ocaml-findlib.cd8e40c7e695e12b148e80eb695d41430a0a249afaaefff455fd2d850a3ac7d6
+#+ocamlbuild.9ab1e3e7a5f3483e9817a13eb531249b60e97091e2af077a4a2a601854e8171c
+#+opam.410c0c38c92f2b423e00b88f154fe5eacb820345b85d7febc8532edca2d6ff24
+#+ocaml-topkg.de293f02c9d19ceb1098fd35d05af463a91d8efc164c53fa63659a3b2d49b764
+#+ocaml-astring.27ac3178e4f4d2399ebb8c3e7bfe9daf6785d4fee180c63b992aa710e5510e30
 #@untar:-j:sha256:12b08ff192d037d9b6d69e9ca19d1d385184f20b3237c27231e437ac81ace70f:.
 
 
diff --git a/variants/root-x86_64/ocaml-logs b/variants/root-x86_64/ocaml-logs
@@ -1,42 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+ocaml.3cef599bb2d79ed5c803ff43addda5097f2deac41baf2541e45e6b3ed3faa7b3
-#+ocaml-findlib.7545960042ed23caf596775e7010ecf30ebdde99b2cabe17e72c581d4844d85b
-#+ocamlbuild.f60f824d0efa38394ed328798908b6aa9760aae86f026b75fa48192156681dc6
-#+opam.1cce70139141c265ea3bd80c20c2c2a786b78ac77370d29d2492772adadde2db
-#+ocaml-topkg.2fe0dda43065243d1f23415abfe9561d8c37b888b04aaed5ae33b58b4aaa095f
-#+ocaml-mtime.8e659f3d4a5be6e4e613f161cada8ef081d177a6c50b8ca701e06fd47becfe42
-#+ocaml-cmdliner.d615e05b9c887a6b191fc932aa0feabb31d077d7d838772eeb6d3502b9e79486
-#+ocaml-fmt.9b81d2c81f973de2749ef770505a0eb000f838420e649eb9aee5114c0e6b59d6
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+ocaml.c47166087b73d25dd821bb4eb2c09ca2edae571fd1100f7499521c11ace98677
+#+ocaml-findlib.cd8e40c7e695e12b148e80eb695d41430a0a249afaaefff455fd2d850a3ac7d6
+#+ocamlbuild.9ab1e3e7a5f3483e9817a13eb531249b60e97091e2af077a4a2a601854e8171c
+#+opam.410c0c38c92f2b423e00b88f154fe5eacb820345b85d7febc8532edca2d6ff24
+#+ocaml-topkg.de293f02c9d19ceb1098fd35d05af463a91d8efc164c53fa63659a3b2d49b764
+#+ocaml-mtime.0dbe706fcfb8c64e222b3009908e15393984678b7f68aefc11e0cab2d2398f01
+#+ocaml-cmdliner.aa0c5534e20ca77b349a9955da3319257f7c5a7a9213514cf211783cd16f3e5e
+#+ocaml-fmt.eecce58b2e176900c553819a035ab0fa6a329035a8dc0b7617534a9b1620e115
 #@untar:-j:sha256:ee97065ba41ce28f19dea9453c6bec4e0ef26165ad7394c4131ea0c65c0f06d5:.
 
 
diff --git a/variants/root-x86_64/ocaml-lun b/variants/root-x86_64/ocaml-lun
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+ocaml.3cef599bb2d79ed5c803ff43addda5097f2deac41baf2541e45e6b3ed3faa7b3
-#+dune.b95531c089c7ae1ed6c8b5e2f5a7ea3643502a9e133deb3b712c185a253aac8e
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+ocaml.c47166087b73d25dd821bb4eb2c09ca2edae571fd1100f7499521c11ace98677
+#+dune.3d25979e451621a278c889a6413c82bf9735f5f8ec9eac52cc524eef03ab755d
 #@untar:-j:sha256:cca8badff83b470fdcfb1840116f8e8a6f2cb86cde2f44ed28cf26cbf692a793:.
 
 
diff --git a/variants/root-x86_64/ocaml-mtime b/variants/root-x86_64/ocaml-mtime
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+ocaml.3cef599bb2d79ed5c803ff43addda5097f2deac41baf2541e45e6b3ed3faa7b3
-#+ocaml-findlib.7545960042ed23caf596775e7010ecf30ebdde99b2cabe17e72c581d4844d85b
-#+ocamlbuild.f60f824d0efa38394ed328798908b6aa9760aae86f026b75fa48192156681dc6
-#+opam.1cce70139141c265ea3bd80c20c2c2a786b78ac77370d29d2492772adadde2db
-#+ocaml-topkg.2fe0dda43065243d1f23415abfe9561d8c37b888b04aaed5ae33b58b4aaa095f
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+ocaml.c47166087b73d25dd821bb4eb2c09ca2edae571fd1100f7499521c11ace98677
+#+ocaml-findlib.cd8e40c7e695e12b148e80eb695d41430a0a249afaaefff455fd2d850a3ac7d6
+#+ocamlbuild.9ab1e3e7a5f3483e9817a13eb531249b60e97091e2af077a4a2a601854e8171c
+#+opam.410c0c38c92f2b423e00b88f154fe5eacb820345b85d7febc8532edca2d6ff24
+#+ocaml-topkg.de293f02c9d19ceb1098fd35d05af463a91d8efc164c53fa63659a3b2d49b764
 #@untar:-j:sha256:097cb2802e3701ead9572e1b483d5a28c6e2f0a39449faaf9b44ad8a89834d88:.
 
 
diff --git a/variants/root-x86_64/ocaml-ppx_derivers b/variants/root-x86_64/ocaml-ppx_derivers
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+ocaml.3cef599bb2d79ed5c803ff43addda5097f2deac41baf2541e45e6b3ed3faa7b3
-#+dune.b95531c089c7ae1ed6c8b5e2f5a7ea3643502a9e133deb3b712c185a253aac8e
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+ocaml.c47166087b73d25dd821bb4eb2c09ca2edae571fd1100f7499521c11ace98677
+#+dune.3d25979e451621a278c889a6413c82bf9735f5f8ec9eac52cc524eef03ab755d
 #@untar:-z:sha256:b6595ee187dea792b31fc54a0e1524ab1e48bc6068d3066c45215a138cc73b95:.
 
 
diff --git a/variants/root-x86_64/ocaml-ppx_deriving b/variants/root-x86_64/ocaml-ppx_deriving
@@ -1,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+ocaml.3cef599bb2d79ed5c803ff43addda5097f2deac41baf2541e45e6b3ed3faa7b3
-#+dune.b95531c089c7ae1ed6c8b5e2f5a7ea3643502a9e133deb3b712c185a253aac8e
-#+ocaml-compiler-libs.f64ae533bae016face548ae0f7175fc442978d1ff30cb2ba30a067b263118bda
-#+ocaml-cppo.d24d7f66b818509b868b53d261461498e70f5b8fd01d7895afd6bb30067429d1
-#+ocaml-findlib.7545960042ed23caf596775e7010ecf30ebdde99b2cabe17e72c581d4844d85b
-#+ocaml-ppx_derivers.1dd618b76b555e6b6deaf02ca58f4646b356b8ed862097c2d8f09ff392b138f8
-#+ocaml-ppxlib.afc0296d0c8d5b0451a4f63ecb719f333361363330a0d0d437e139fa3fc465b7
-#+ocaml-sexplib0.3b69037673c719bb838d77ed5173f7ef4578b0c19179c6fd577953062de257d3
-#+ocaml-stdlib-shims.105bf3749e5c6117282c4627ad96cbfd03fe24d3e29c2ea4d21c1070b6877797
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+ocaml.c47166087b73d25dd821bb4eb2c09ca2edae571fd1100f7499521c11ace98677
+#+dune.3d25979e451621a278c889a6413c82bf9735f5f8ec9eac52cc524eef03ab755d
+#+ocaml-compiler-libs.8d581390525a723bb0d39a540c2d32842c01d5ba07ff86c4e7c82eb680f33a1e
+#+ocaml-cppo.714a3cbb755b86c650c3fe96d7893bb0895c2d8d9c88d72be2651844944537b9
+#+ocaml-findlib.cd8e40c7e695e12b148e80eb695d41430a0a249afaaefff455fd2d850a3ac7d6
+#+ocaml-ppx_derivers.38ef29143e9da2d9377da3954cff379d50425190ec71b87bfff2031071080e6b
+#+ocaml-ppxlib.a4f7ba5f4bb4978fbba31c5ac331e88328dda00d85df1d1c4554fd0411413945
+#+ocaml-sexplib0.6cf9e0fe35f3b34e5be4d9695a6edd5e92402bbd67f3711a165c63f68eeb574f
+#+ocaml-stdlib-shims.8eaa94621c86286a0adf75a2985eb30be27e366d813c2f7cf011ffe29fab8188
 #@untar:-z:sha256:c91d1ea5e15e6928a2f8947dbd135b9f765cc0e2d72be271427981afcd350c24:.
 
 
diff --git a/variants/root-x86_64/ocaml-ppxlib b/variants/root-x86_64/ocaml-ppxlib
@@ -1,40 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+ocaml.3cef599bb2d79ed5c803ff43addda5097f2deac41baf2541e45e6b3ed3faa7b3
-#+dune.b95531c089c7ae1ed6c8b5e2f5a7ea3643502a9e133deb3b712c185a253aac8e
-#+ocaml-compiler-libs.f64ae533bae016face548ae0f7175fc442978d1ff30cb2ba30a067b263118bda
-#+ocaml-ppx_derivers.1dd618b76b555e6b6deaf02ca58f4646b356b8ed862097c2d8f09ff392b138f8
-#+ocaml-sexplib0.3b69037673c719bb838d77ed5173f7ef4578b0c19179c6fd577953062de257d3
-#+ocaml-stdlib-shims.105bf3749e5c6117282c4627ad96cbfd03fe24d3e29c2ea4d21c1070b6877797
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+ocaml.c47166087b73d25dd821bb4eb2c09ca2edae571fd1100f7499521c11ace98677
+#+dune.3d25979e451621a278c889a6413c82bf9735f5f8ec9eac52cc524eef03ab755d
+#+ocaml-compiler-libs.8d581390525a723bb0d39a540c2d32842c01d5ba07ff86c4e7c82eb680f33a1e
+#+ocaml-ppx_derivers.38ef29143e9da2d9377da3954cff379d50425190ec71b87bfff2031071080e6b
+#+ocaml-sexplib0.6cf9e0fe35f3b34e5be4d9695a6edd5e92402bbd67f3711a165c63f68eeb574f
+#+ocaml-stdlib-shims.8eaa94621c86286a0adf75a2985eb30be27e366d813c2f7cf011ffe29fab8188
 #@untar:-j:sha256:2e223837e7cecc3bc84a432432c0a72f4e1d5be9165c9c33772f156db85db0b3:.
 
 
diff --git a/variants/root-x86_64/ocaml-rresult b/variants/root-x86_64/ocaml-rresult
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+ocaml.3cef599bb2d79ed5c803ff43addda5097f2deac41baf2541e45e6b3ed3faa7b3
-#+ocaml-findlib.7545960042ed23caf596775e7010ecf30ebdde99b2cabe17e72c581d4844d85b
-#+ocamlbuild.f60f824d0efa38394ed328798908b6aa9760aae86f026b75fa48192156681dc6
-#+opam.1cce70139141c265ea3bd80c20c2c2a786b78ac77370d29d2492772adadde2db
-#+ocaml-topkg.2fe0dda43065243d1f23415abfe9561d8c37b888b04aaed5ae33b58b4aaa095f
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+ocaml.c47166087b73d25dd821bb4eb2c09ca2edae571fd1100f7499521c11ace98677
+#+ocaml-findlib.cd8e40c7e695e12b148e80eb695d41430a0a249afaaefff455fd2d850a3ac7d6
+#+ocamlbuild.9ab1e3e7a5f3483e9817a13eb531249b60e97091e2af077a4a2a601854e8171c
+#+opam.410c0c38c92f2b423e00b88f154fe5eacb820345b85d7febc8532edca2d6ff24
+#+ocaml-topkg.de293f02c9d19ceb1098fd35d05af463a91d8efc164c53fa63659a3b2d49b764
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
diff --git a/variants/root-x86_64/ocaml-sexplib0 b/variants/root-x86_64/ocaml-sexplib0
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+ocaml.3cef599bb2d79ed5c803ff43addda5097f2deac41baf2541e45e6b3ed3faa7b3
-#+dune.b95531c089c7ae1ed6c8b5e2f5a7ea3643502a9e133deb3b712c185a253aac8e
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+ocaml.c47166087b73d25dd821bb4eb2c09ca2edae571fd1100f7499521c11ace98677
+#+dune.3d25979e451621a278c889a6413c82bf9735f5f8ec9eac52cc524eef03ab755d
 #@untar:-z:sha256:86dba26468194512f789f2fb709063515a9cb4e5c4461c021c239a369590701d:.
 
 
diff --git a/variants/root-x86_64/ocaml-stdlib-shims b/variants/root-x86_64/ocaml-stdlib-shims
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+ocaml.3cef599bb2d79ed5c803ff43addda5097f2deac41baf2541e45e6b3ed3faa7b3
-#+dune.b95531c089c7ae1ed6c8b5e2f5a7ea3643502a9e133deb3b712c185a253aac8e
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+ocaml.c47166087b73d25dd821bb4eb2c09ca2edae571fd1100f7499521c11ace98677
+#+dune.3d25979e451621a278c889a6413c82bf9735f5f8ec9eac52cc524eef03ab755d
 #@untar:-j:sha256:babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a:.
 
 
diff --git a/variants/root-x86_64/ocaml-topkg b/variants/root-x86_64/ocaml-topkg
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+ocaml.3cef599bb2d79ed5c803ff43addda5097f2deac41baf2541e45e6b3ed3faa7b3
-#+ocaml-findlib.7545960042ed23caf596775e7010ecf30ebdde99b2cabe17e72c581d4844d85b
-#+ocamlbuild.f60f824d0efa38394ed328798908b6aa9760aae86f026b75fa48192156681dc6
-#+opam.1cce70139141c265ea3bd80c20c2c2a786b78ac77370d29d2492772adadde2db
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+ocaml.c47166087b73d25dd821bb4eb2c09ca2edae571fd1100f7499521c11ace98677
+#+ocaml-findlib.cd8e40c7e695e12b148e80eb695d41430a0a249afaaefff455fd2d850a3ac7d6
+#+ocamlbuild.9ab1e3e7a5f3483e9817a13eb531249b60e97091e2af077a4a2a601854e8171c
+#+opam.410c0c38c92f2b423e00b88f154fe5eacb820345b85d7febc8532edca2d6ff24
 #@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.3cef599bb2d79ed5c803ff43addda5097f2deac41baf2541e45e6b3ed3faa7b3
-#+dune.b95531c089c7ae1ed6c8b5e2f5a7ea3643502a9e133deb3b712c185a253aac8e
-#+ocamlbuild.f60f824d0efa38394ed328798908b6aa9760aae86f026b75fa48192156681dc6
-#+ocaml-base.9ffae33ca98cce8a992b04bf80642cd96e44caed8d2cfdefcd9c58fa7a52d1b1
-#+opam.1cce70139141c265ea3bd80c20c2c2a786b78ac77370d29d2492772adadde2db
-#+ocaml-bos.595be7e86731c9e8150fab1c86352a78839e0fb8966005eaf70c603dc8e78251
-#+ocaml-lun.08a24cbd274a580ac13ed6cd0d9ff5f594d2ea01e4c6de65417cf6c0369509d3
-#+ocaml-ppx_deriving.2f0100a37e2aacf7d81884810e8bb54abb959b992b4fdbdd0a63166bd0414f7f-
\ No newline at end of file
+#+ocaml.c47166087b73d25dd821bb4eb2c09ca2edae571fd1100f7499521c11ace98677
+#+dune.3d25979e451621a278c889a6413c82bf9735f5f8ec9eac52cc524eef03ab755d
+#+ocamlbuild.9ab1e3e7a5f3483e9817a13eb531249b60e97091e2af077a4a2a601854e8171c
+#+ocaml-base.07f4e24cd01ccc1e9d952e3ffccad4aa3e5c07540288f8ca8472efef48e92250
+#+opam.410c0c38c92f2b423e00b88f154fe5eacb820345b85d7febc8532edca2d6ff24
+#+ocaml-bos.5284753bc52d7969add666ebbbe12c0b3c004313cf3e6855fad234c30121290d
+#+ocaml-lun.e40234db631b75e26cf9d4a066fe01e8a7f6a438383da63a4feb793dded7968a
+#+ocaml-ppx_deriving.308a41d05163cb0040775d93ec9ce5c0e18e674589874f3e296783646eeac812+
\ No newline at end of file
diff --git a/variants/root-x86_64/ocaml:dynlink b/variants/root-x86_64/ocaml:dynlink
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+m4.40d83d50f329cfe11bfeb914c554b41bbe66538ee7aaa4380d5d19e8f33be5bb
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+m4.54fcb13ff827ab832cd4845f2f252d6283e377b58c2803ba46fc2862aa422d33
 #@untar:-J:sha256:dfaa8a2e11c799bc1765d8bef44911406ee5f4803027190382a939f88c912266:.
 
 
@@ -62,9 +62,10 @@ autotools_config_static() {
 build_env_dynamic() {
 	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
 	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library.so"
 	export CPATH="$pthbs_build_environment/include"
 	export LDFLAGS="-L$pthbs_build_environment/library.so $LDFLAGS"
+	export LIBRARY_PATH="$pthbs_build_environment/library.so:$LIBRARY_PATH"
+	LIBRARY_PATH=${LIBRARY_PATH%:}
 }
 
 prefix=/versions/$pthbs_package
diff --git a/variants/root-x86_64/ocaml_intrinsics_kernel b/variants/root-x86_64/ocaml_intrinsics_kernel
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+ocaml.3cef599bb2d79ed5c803ff43addda5097f2deac41baf2541e45e6b3ed3faa7b3
-#+dune.b95531c089c7ae1ed6c8b5e2f5a7ea3643502a9e133deb3b712c185a253aac8e
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+ocaml.c47166087b73d25dd821bb4eb2c09ca2edae571fd1100f7499521c11ace98677
+#+dune.3d25979e451621a278c889a6413c82bf9735f5f8ec9eac52cc524eef03ab755d
 #@untar:-z:sha256:c988b7769a59749631c3c98ba5edd1d2fe91f5dc380b5e0593c073c92f4bee01:.
 
 
diff --git a/variants/root-x86_64/ocamlbuild b/variants/root-x86_64/ocamlbuild
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+m4.40d83d50f329cfe11bfeb914c554b41bbe66538ee7aaa4380d5d19e8f33be5bb
-#+ocaml.3cef599bb2d79ed5c803ff43addda5097f2deac41baf2541e45e6b3ed3faa7b3
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+m4.54fcb13ff827ab832cd4845f2f252d6283e377b58c2803ba46fc2862aa422d33
+#+ocaml.c47166087b73d25dd821bb4eb2c09ca2edae571fd1100f7499521c11ace98677
 #@untar:-z:sha256:2ba6857f2991b7f69368e8db818b163d31cf5a367f15f5953bf8f01a77b3d4fc:.
 
 
@@ -51,7 +51,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/versions/musl.771c30950c892f46bf06accc9e76f3ba1d9def6aa765b8eb27b5b9bd2c173784/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/versions/musl.26a006d6cdfa57ea8a349863fbe4cf45cfb02ea7da0fc55e2dcd7f45179010dc/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
 			return 0
 			;;
 		(*)
@@ -75,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.3cef599bb2d79ed5c803ff43addda5097f2deac41baf2541e45e6b3ed3faa7b3"
+stdlib="$pthbs_destdir/versions/ocaml.c47166087b73d25dd821bb4eb2c09ca2edae571fd1100f7499521c11ace98677"
 mkdir -p "${stdlib%/*}"
 ln -s "$pthbs_package" "$stdlib"
 
diff --git a/variants/root-x86_64/oldbootstrap.environment b/variants/root-x86_64/oldbootstrap.environment
@@ -1,5 +1,5 @@
 #!/usr/bin/env pthbs-build
-#+busybox.9624330e831e939cd8c151ee92f591249d816c6ccac4d4bcfeaf1ec34c83a4c8
-#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
-#+gnu-make.99fe3011f86e41833c1116b7b47d2c478ecbacb4f09734045b71df5d0c99534f
-#+musl-cross-make.3a7d0ecaebf339449fdbcf279f0e7a0af8562f98e5d2f4384136f29afa0a0d52-
\ No newline at end of file
+#+busybox.5e31f0f0327b157c167e4177de5a74415b31c690046fd2fdcc51ea2be14a4dc9
+#+nawk.3212c1f5782e03c10b90e72e5b510953274da54de73319493ffbf0653bfa51c6
+#+gnu-make.dd1c52e264308b09b3f7c57a46d1169e66fb9912ef94a03a5737665b5ea10125
+#+musl-cross-make.19ac8f28b3c5bea3bf3f8cdc16c03da22a6841210159cbfc406af8f411c87a34+
\ No newline at end of file
diff --git a/variants/root-x86_64/oldsystem.environment b/variants/root-x86_64/oldsystem.environment
@@ -1,4 +1,4 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.f8a57d7546c64c62e14d1d4b4a09fd10dc77cfc4a37744b75fac6bb5b8bdcb72
-#+busybox.887d2c60c63969374570037aef768a6956781b9330040bf4dfad409f211dea53
-#+gnu-make.f2d80c84e3be014077ece04ffe3a678d0cd258f37035ca9afcc1bf4b74d99c8c-
\ No newline at end of file
+#+musl-cross-make.9de60918044d345b88094f1b9766d241a248d8c4ca467269ef8e6291fd1e3899
+#+busybox.277be00c0789c68c60e77a83ad89b9cffa9f04c8a7793f6977e06da100b947e1
+#+gnu-make.a0028a56b84ef7efd57c74940a19a7846de8ff89db792e6553c05e966a285c3b+
\ No newline at end of file
diff --git a/variants/root-x86_64/opam b/variants/root-x86_64/opam
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+diffutils.d0677f378a1e47808251ec0a319d7ff60c8021b57c0111e218ffefe7fc441dfa
-#+patch.cc1f34666bc1f927fcd2d263904e72cd858aa27c0e8127458b58f0bc97d1e211
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+getconf.b73339837f155ee56d4b81ee2e31e2fb67edf7b123960606e6f457a4ed9222b9
-#+ocaml.3cef599bb2d79ed5c803ff43addda5097f2deac41baf2541e45e6b3ed3faa7b3
-#+dune.b95531c089c7ae1ed6c8b5e2f5a7ea3643502a9e133deb3b712c185a253aac8e
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+diffutils.7d00c8d42e6a30553091f604d163ddf2b63704ef75af8a2bfc91348661e23ba6
+#+patch.f5939c6363d5747ea877353651eb4a9e5533e2e7471ed211cf69624f32b6fadf
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+getconf.fc7060660a31878d8745e4c3ec021f2b647e7f249c6b051c60d7489733d03e21
+#+ocaml.c47166087b73d25dd821bb4eb2c09ca2edae571fd1100f7499521c11ace98677
+#+dune.3d25979e451621a278c889a6413c82bf9735f5f8ec9eac52cc524eef03ab755d
 #@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:.
 
 
@@ -72,7 +72,7 @@ export DUNE_CACHE=disabled
 	--infodir="$prefix/info" \
 	--localedir="$prefix/locale" \
 	--localstatedir='/var/pthbs' \
-	--with-dune='/versions/dune.b95531c089c7ae1ed6c8b5e2f5a7ea3643502a9e133deb3b712c185a253aac8e/command/dune' \
+	--with-dune='/versions/dune.3d25979e451621a278c889a6413c82bf9735f5f8ec9eac52cc524eef03ab755d/command/dune' \
 	--with-mccs \
 	--with-vendored-deps \
 	--enable-static
diff --git a/variants/root-x86_64/patch b/variants/root-x86_64/patch
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+m4.40d83d50f329cfe11bfeb914c554b41bbe66538ee7aaa4380d5d19e8f33be5bb
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+m4.54fcb13ff827ab832cd4845f2f252d6283e377b58c2803ba46fc2862aa422d33
 #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:.
 
 
@@ -60,10 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/pkgconf b/variants/root-x86_64/pkgconf
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+m4.40d83d50f329cfe11bfeb914c554b41bbe66538ee7aaa4380d5d19e8f33be5bb
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+m4.54fcb13ff827ab832cd4845f2f252d6283e377b58c2803ba46fc2862aa422d33
 #@untar:-J:sha256:3a224f2accf091b77a5781316e27b9ee3ba82c083cc2e539e08940b68a44fec5:.
 
 
@@ -60,10 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
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.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+pkgconf.647858fa0857ca46ea4813a6dd4887209fe1aa6454ea8e2892f343c344f76e7a
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+pkgconf.cf2c7e546a16320184516769d7d2c2511c58979c1059d4940cd255ebadca3dcc
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/popt b/variants/root-x86_64/popt
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+m4.40d83d50f329cfe11bfeb914c554b41bbe66538ee7aaa4380d5d19e8f33be5bb
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+m4.54fcb13ff827ab832cd4845f2f252d6283e377b58c2803ba46fc2862aa422d33
 #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:.
 
 
@@ -60,10 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
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.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+zsh.395877b10c2159be5ce294fdc0850eac86945d98cc77d48f1f0aaf8593880f0b
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+zsh.160a511e8dc1104420ffc16e0075e189211ef86b2b546f3e11b3d91e77ee7d91
 #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall
 
 
diff --git a/variants/root-x86_64/pthbs-sandbox-rootns b/variants/root-x86_64/pthbs-sandbox-rootns
@@ -1,10 +1,10 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
-#+execline.9daf9a7bdd9682fe29bcbfa885d1af832bc41a23ab3c03147b3f32de809bcc87
-#+lnstools.9bc9ec5a0e37d86e446308a7fb6a289ee98bafc2529f9b5685b5b46597eb337b
-#+sandbox_rootfs.e32ab59191a6e8de80ac30c308afc087ad815fe828644050575ad1375d6f0d4a
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+nawk.3212c1f5782e03c10b90e72e5b510953274da54de73319493ffbf0653bfa51c6
+#+execline.45586012eb5f84d8b21d12bb6ff8b7ebe72cdabd35674b313cfae016552a25a2
+#+lnstools.5e30bfafb73a2710961cc2a9bda933b99a9784616a2965056e35b5fb6e93b990
+#+sandbox_rootfs.1b100d69489e209186f877b59bd6f31502d9cabc62e7bbee20f07fd3ffaa8ba2
 #@sha256:b85634a91129f85a5aad5cae51d4084dd7ce62544b5585f0899058576c16451f:abspaths.awk
 #@sha256:0fb30f66e4b58fd8ffc2027b1aae646fa7583d3d72136a7d1e7c6c498b93cf1e:sandbox-rootns.in
 
diff --git a/variants/root-x86_64/rsync b/variants/root-x86_64/rsync
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+m4.40d83d50f329cfe11bfeb914c554b41bbe66538ee7aaa4380d5d19e8f33be5bb
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+popt.12fb7353607049445ca07e954f1d78a2f535e0ea5f91cf2f4a09f66c2cc1bbfd
-#+libressl.2e473e902dfa0bb7b1d907fdbdb35fb1a59afbfaf749cae6fb1fda22005a3edb
-#+zstd.d0ea2968e51590efb9b5cc00720992ee080a90bcc057dd91b42dbba09aedf488
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+m4.54fcb13ff827ab832cd4845f2f252d6283e377b58c2803ba46fc2862aa422d33
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+popt.91182fc59822be94b7ce6a182441a3ecc2a96c1f866aafc324beda196da7a0ba
+#+libressl.5f6ce78a162c0f2f1a6ccdf81d96ef3861194e6f0b7543f244c67f709183e058
+#+zstd.d808a868880fd7a702a898794c87cadf8523ef55a88bec1ac34d43088238877b
 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:.
 
 
@@ -63,10 +63,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/s6 b/variants/root-x86_64/s6
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+skalibs.8f3de7084813874998086223e969bb8bac426263e91a38ef555eaf0ad86f4a26
-#+execline.49b9333c99a58b660feb75a7598c32e9c3dfd97c16b81b7ebd4bc6bf3123f0a3
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+skalibs.32f1433808cbc3408f6fd02d58a48f36e9a8824c267984a7398bd73d2fbe55aa
+#+execline.c0c5f161b8a116da36ddada8138118cfe5c31a9f9f836653ce0a07d0f2f0946e
 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6
 
 
@@ -47,7 +47,7 @@ cd 's6'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.8f3de7084813874998086223e969bb8bac426263e91a38ef555eaf0ad86f4a26/sysdeps' \
+	--with-sysdeps='/versions/skalibs.32f1433808cbc3408f6fd02d58a48f36e9a8824c267984a7398bd73d2fbe55aa/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/root-x86_64/s6-dns b/variants/root-x86_64/s6-dns
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+skalibs.8f3de7084813874998086223e969bb8bac426263e91a38ef555eaf0ad86f4a26
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+skalibs.32f1433808cbc3408f6fd02d58a48f36e9a8824c267984a7398bd73d2fbe55aa
 #@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns
 
 
@@ -46,7 +46,7 @@ cd 's6-dns'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.8f3de7084813874998086223e969bb8bac426263e91a38ef555eaf0ad86f4a26/sysdeps' \
+	--with-sysdeps='/versions/skalibs.32f1433808cbc3408f6fd02d58a48f36e9a8824c267984a7398bd73d2fbe55aa/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/root-x86_64/s6-linux-init b/variants/root-x86_64/s6-linux-init
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+skalibs.8f3de7084813874998086223e969bb8bac426263e91a38ef555eaf0ad86f4a26
-#+execline.49b9333c99a58b660feb75a7598c32e9c3dfd97c16b81b7ebd4bc6bf3123f0a3
-#+s6.7f7a7a7fb3647c28a7ad7253b3e9970c1cd091c6fadd755f9577562494e382cc
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+skalibs.32f1433808cbc3408f6fd02d58a48f36e9a8824c267984a7398bd73d2fbe55aa
+#+execline.c0c5f161b8a116da36ddada8138118cfe5c31a9f9f836653ce0a07d0f2f0946e
+#+s6.4ba820562a6a96f108135acc5bbc99ca193e16890ff8f7d1cd71f8abb1cd0a1a
 #@git:b298e515efe16210048e504e3aec89ea1e627b73:s6-linux-init
 
 
@@ -48,7 +48,7 @@ cd 's6-linux-init'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.8f3de7084813874998086223e969bb8bac426263e91a38ef555eaf0ad86f4a26/sysdeps' \
+	--with-sysdeps='/versions/skalibs.32f1433808cbc3408f6fd02d58a48f36e9a8824c267984a7398bd73d2fbe55aa/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/root-x86_64/s6-linux-utils b/variants/root-x86_64/s6-linux-utils
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+skalibs.8f3de7084813874998086223e969bb8bac426263e91a38ef555eaf0ad86f4a26
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+skalibs.32f1433808cbc3408f6fd02d58a48f36e9a8824c267984a7398bd73d2fbe55aa
 #@git:a9e7acac41a8854546246dd39cb4daee54ead2cb:s6-linux-utils
 
 
@@ -46,7 +46,7 @@ cd 's6-linux-utils'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.8f3de7084813874998086223e969bb8bac426263e91a38ef555eaf0ad86f4a26/sysdeps' \
+	--with-sysdeps='/versions/skalibs.32f1433808cbc3408f6fd02d58a48f36e9a8824c267984a7398bd73d2fbe55aa/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/root-x86_64/s6-networking b/variants/root-x86_64/s6-networking
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+skalibs.8f3de7084813874998086223e969bb8bac426263e91a38ef555eaf0ad86f4a26
-#+execline.49b9333c99a58b660feb75a7598c32e9c3dfd97c16b81b7ebd4bc6bf3123f0a3
-#+s6.7f7a7a7fb3647c28a7ad7253b3e9970c1cd091c6fadd755f9577562494e382cc
-#+s6-dns.892b83af207f7761a8bad0eb772b4b8ff51a0481dad1f49c27bba5bdf760d14e
-#+libressl.2e473e902dfa0bb7b1d907fdbdb35fb1a59afbfaf749cae6fb1fda22005a3edb
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+skalibs.32f1433808cbc3408f6fd02d58a48f36e9a8824c267984a7398bd73d2fbe55aa
+#+execline.c0c5f161b8a116da36ddada8138118cfe5c31a9f9f836653ce0a07d0f2f0946e
+#+s6.4ba820562a6a96f108135acc5bbc99ca193e16890ff8f7d1cd71f8abb1cd0a1a
+#+s6-dns.bad0692e685773b32cd31cc37fe8339172e74c2ce1ab72c36a963574f1d1a380
+#+libressl.5f6ce78a162c0f2f1a6ccdf81d96ef3861194e6f0b7543f244c67f709183e058
 #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking
 
 
@@ -50,7 +50,7 @@ cd 's6-networking'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.8f3de7084813874998086223e969bb8bac426263e91a38ef555eaf0ad86f4a26/sysdeps' \
+	--with-sysdeps='/versions/skalibs.32f1433808cbc3408f6fd02d58a48f36e9a8824c267984a7398bd73d2fbe55aa/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/root-x86_64/s6-portable-utils b/variants/root-x86_64/s6-portable-utils
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+skalibs.8f3de7084813874998086223e969bb8bac426263e91a38ef555eaf0ad86f4a26
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+skalibs.32f1433808cbc3408f6fd02d58a48f36e9a8824c267984a7398bd73d2fbe55aa
 #@git:dc96d8a020e83b16dd7a8bd093bdb00ab2b944c0:s6-portable-utils
 
 
@@ -46,7 +46,7 @@ cd 's6-portable-utils'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.8f3de7084813874998086223e969bb8bac426263e91a38ef555eaf0ad86f4a26/sysdeps' \
+	--with-sysdeps='/versions/skalibs.32f1433808cbc3408f6fd02d58a48f36e9a8824c267984a7398bd73d2fbe55aa/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/root-x86_64/s6-rc b/variants/root-x86_64/s6-rc
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+skalibs.8f3de7084813874998086223e969bb8bac426263e91a38ef555eaf0ad86f4a26
-#+execline.49b9333c99a58b660feb75a7598c32e9c3dfd97c16b81b7ebd4bc6bf3123f0a3
-#+s6.7f7a7a7fb3647c28a7ad7253b3e9970c1cd091c6fadd755f9577562494e382cc
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+skalibs.32f1433808cbc3408f6fd02d58a48f36e9a8824c267984a7398bd73d2fbe55aa
+#+execline.c0c5f161b8a116da36ddada8138118cfe5c31a9f9f836653ce0a07d0f2f0946e
+#+s6.4ba820562a6a96f108135acc5bbc99ca193e16890ff8f7d1cd71f8abb1cd0a1a
 #@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc
 
 
@@ -48,7 +48,7 @@ cd 's6-rc'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.8f3de7084813874998086223e969bb8bac426263e91a38ef555eaf0ad86f4a26/sysdeps' \
+	--with-sysdeps='/versions/skalibs.32f1433808cbc3408f6fd02d58a48f36e9a8824c267984a7398bd73d2fbe55aa/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/sandbox_rootfs b/variants/root-x86_64/sandbox_rootfs
@@ -1,19 +1,17 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
-#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
-#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
-#+skalibs.51fd2f76304c28a7c4462038e0f290fd05f2773d7d32cc74b1a96dfd9c41f95c
+#+musl-cross-make.a231f50ea0bb1cf8f34f63b6b2d02a4a0d2035fc520be7af77e830cf7129fa86
+#+gnu-make.963377e3ce4a91501593ace2c5fd368e5b4faf22405934aa9bebba9e2f85dc2c
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+nawk.3212c1f5782e03c10b90e72e5b510953274da54de73319493ffbf0653bfa51c6
+#+skalibs.56354047ce240452301a96e20b7a2cd24eaf13144525e952347460981a8a7cbd
 #@sha256:8d716caa5ea940bbbb8f68ac0907cea36773c183bd4c1eebad030f6cc7deaec9:argv0exec.c
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/sandbox_rootns.environment b/variants/root-x86_64/sandbox_rootns.environment
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+lnstools.9bc9ec5a0e37d86e446308a7fb6a289ee98bafc2529f9b5685b5b46597eb337b
-#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+execline.9daf9a7bdd9682fe29bcbfa885d1af832bc41a23ab3c03147b3f32de809bcc87
-#+sandbox_rootfs.e32ab59191a6e8de80ac30c308afc087ad815fe828644050575ad1375d6f0d4a
-#+pthbs-sandbox-rootns.fa5bd36eff98d48f338f70e44f88ebd6d877e31721a16aea18c97c7cfcd2376b-
\ No newline at end of file
+#+lnstools.5e30bfafb73a2710961cc2a9bda933b99a9784616a2965056e35b5fb6e93b990
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+execline.45586012eb5f84d8b21d12bb6ff8b7ebe72cdabd35674b313cfae016552a25a2
+#+sandbox_rootfs.1b100d69489e209186f877b59bd6f31502d9cabc62e7bbee20f07fd3ffaa8ba2
+#+pthbs-sandbox-rootns.c7332de3c6246feb78013d338c15bba8527f33b8f8f3b154b8a603777722aa31+
\ No newline at end of file
diff --git a/variants/root-x86_64/skalibs b/variants/root-x86_64/skalibs
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
 #@git:96b537f42695da1b865588baf591fdfcae76bd41:skalibs
 
 
diff --git a/variants/root-x86_64/skalibs:bootstrap b/variants/root-x86_64/skalibs:bootstrap
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
-#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
-#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
-#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
+#+musl-cross-make.a231f50ea0bb1cf8f34f63b6b2d02a4a0d2035fc520be7af77e830cf7129fa86
+#+gnu-make.963377e3ce4a91501593ace2c5fd368e5b4faf22405934aa9bebba9e2f85dc2c
+#+busybox.6d43d0ff99e2fc2b7cbb9acd20f2cc8e120ad38b0584951feae80603a4c5f0fe
+#+nawk.3212c1f5782e03c10b90e72e5b510953274da54de73319493ffbf0653bfa51c6
 #@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.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+zsh.395877b10c2159be5ce294fdc0850eac86945d98cc77d48f1f0aaf8593880f0b
-#+pthbs-banginstall.56164df1e8e5fee562e9e72b767fd849d7e67f903182e6a1da7844d2bb23152f
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+zsh.160a511e8dc1104420ffc16e0075e189211ef86b2b546f3e11b3d91e77ee7d91
+#+pthbs-banginstall.97d3b141fd70e66fc59912a95a8ef790d6fd1e3ec5a79972e4cba2a31c62f929
 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep
 
 
diff --git a/variants/root-x86_64/squashfs-tools b/variants/root-x86_64/squashfs-tools
@@ -1,47 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+attr.31fc88ab914a7607cee3559f356ab47ce83d4281b8137131e3f6de686dcc9a1e
-#+zstd.d0ea2968e51590efb9b5cc00720992ee080a90bcc057dd91b42dbba09aedf488
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+attr.8c27725b1551988d9b56622daa60834a09fe95f5ad9b66306bb3f9dcf3349009
+#+zstd.d808a868880fd7a702a898794c87cadf8523ef55a88bec1ac34d43088238877b
 #@untar:-z:sha256:4672b5c47d9418d3a5ae5b243defc6d9eae8275b9771022247c6a6082c815914:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/strace b/variants/root-x86_64/strace
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+m4.40d83d50f329cfe11bfeb914c554b41bbe66538ee7aaa4380d5d19e8f33be5bb
-#+patch.cc1f34666bc1f927fcd2d263904e72cd858aa27c0e8127458b58f0bc97d1e211
-#+libunwind.fbfcd9b958d2b4522a33ff9835ec364d645cd9bfd3d37c3920a3d835f6a8b6e7
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+m4.54fcb13ff827ab832cd4845f2f252d6283e377b58c2803ba46fc2862aa422d33
+#+patch.f5939c6363d5747ea877353651eb4a9e5533e2e7471ed211cf69624f32b6fadf
+#+libunwind.3f3f51f844554de6056f012e365f4eb3de4ed998031f876adaa3f0c126481067
 #@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch
 #@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:.
 
@@ -63,10 +63,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
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.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-dosfstools.17418e245a79d9725a6ae2a304e8980e8d02766ab4224191de9c8d3923588b99
-#+busybox-e2fsprogs.3fed30e21aaebe97507cdd92dd433ba6c6e7a855bf557f7351d8702ae45880a8
-#+busybox-iproute2.a9cacc297d75738f0a814a984f4041c6772341f1a9ba1303771e24bc2feaf04e
-#+busybox-iputils.0b1ae18a66bf5045a3463f1f45b4518e06a912ddeec9ffbc86da30eefd79d36e
-#+busybox-net-misc.980107605e3ea5c0d52971c26d91f75bfa55d0554bcf0706580b44fcbc14ff5a
-#+busybox-net-tools.39b4b816e22b505111ca63e1bd3a0dad7b74a70dca121f2ff7c96b0d4ce2ddab
-#+busybox-traceroute.6e4cc3bdc0547aed295f908a69d25c5cff18e8ec342ff8a67dd131c2c3fb6c31
-#+busybox-wget.a5f7e43cfff655cc903dc1a233bfd94c790a291b508ef7cbc8af6e7e2811c50d
-#+busybox-chpst.985296c53e6cf78662e03bb4cc9dbcb580e8427c29929485aefd50ac475bbbc3
-#+busybox-console.49590f9bac1944990fafe5ff2f00f6ecd5aa18228af89236ad38c7e2133b7b7f
-#+busybox-getty.3a5a349030999753457a10436d5d8664968749d357e6d6f1122cd9edd6ec3cb1
-
-#+busybox-linux-extra.0a95a767387672134e1207a9314e7a5183bd00dcbc3404c3a3c02289f1b936bb
-#+busybox-mtd-utils.4047b79030c1fbfab40c3788a8ff792e26a3c7a6e0fa5b51410b4d02f2b9f9bd
-#+busybox-shadow.ac1d0f9df6782543628fe54a3aa54b58cd8b277667234fe2a0b97fc8a3363b3e
-#+busybox-su.37d0a5986b05d58d967230e94db3f50cc681477f7757d64bf597f0062012c5ad
-#+busybox-util-linux-priv.7a73598520c2b93de5291054ae77039eca2a6c99bb48c1edb1007fba5297d1bc
-#+busybox-logging.98bcaf3ee34d0ec01e1f841202ca969e1644e60629eda17e772fe49eb5beb185
-#+busybox-cron.2990cddd6816d75b12679929f7d4c17bc5f40baa1ff3223bf75682322c9b9b64
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+diffutils.d0677f378a1e47808251ec0a319d7ff60c8021b57c0111e218ffefe7fc441dfa
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+aat.861c54370957ce5fc67693cfc0201badc31872c74077a72bc82f030a9a330e3e
-#+fileset.48ef1c1ad9aabc68f8c01a689dda5666da222c796f80004f6c4e4805c27cfbfc
-#+rsync.1ae607f7f9e6240eaebcf006c32fc7e41d65f246f530f9403b88eca8e36ea619
-#+execline.49b9333c99a58b660feb75a7598c32e9c3dfd97c16b81b7ebd4bc6bf3123f0a3
-#+kbd.56c16a1607927351d22f4a64cf9ac1c6e649725258632afa5f37a25f8ab7cf06
-#+mdevd.3d9d8063a7411360f27cd8f724b62236356870400bfe73dee4b99cbf1081a3d1
-#+s6-linux-utils.68d41137286b40e77c70d997136d7aa1d26b75923d04582df5e055d3de7742b1
-#+s6-rc.da55f1f1d2a81068b979194233e09da3d41d723e76984e3ae364c9627c3ae5c8
-#+s6.7f7a7a7fb3647c28a7ad7253b3e9970c1cd091c6fadd755f9577562494e382cc
-#+zsh.395877b10c2159be5ce294fdc0850eac86945d98cc77d48f1f0aaf8593880f0b
-#+libcgroup.f24d120c542fab0ec8278c7115135fa5d726553b5c4e7918c926e3599b4a4841
-#+system-config-scripts.079f89b23655fc9ead2d8ecfa9a898f2793516085cc878e8c6bf10c465a4efbe
-#+logincaps.afa9a7378b9525f9ae3732b8e13a644f8155e22120e679fc55162518b798f3b2
-#+busybox-modutils.80cab5cf3e6c2fe6eadfe63679c03785e8b86311508bb8071b5b17672c177ad7
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-dosfstools.840efe96ff4a2fd5e6ea201844ee069a9bfde1e57e578011f88d081922e35ea0
+#+busybox-e2fsprogs.faa0971a44cffd7bad7ba247673a28f728b4ed34b16e778f13bce0163234313b
+#+busybox-iproute2.0a789e50432c5132c76e4e54327cdd3c4fc725419effebaff03fa1afcfdddb20
+#+busybox-iputils.6b15d2fa0a002dacb68c5f05d168cd2494040894aaa7452d7c3b989b26f95dfe
+#+busybox-net-misc.4f31d3bfa9084f11f49ac9a169597ccfefd3f547e7aaa78243dfa18dd4f78179
+#+busybox-net-tools.90acb34ce84618017f7906ba371f7397e291af641ff9b5e3758377a80f6e84b0
+#+busybox-traceroute.f96679012635964f73233feccaa3aa1a853db2d1bdd1440e39762d0fb9868c3d
+#+busybox-wget.4cd596d47e7943359b171a19f33002dd7bad5608db03b5c324e1a15e445e5a5d
+#+busybox-chpst.d87c2a4fd4f0f7d104cbbc9ba58e05912237813390eefe6579761da5b01cf460
+#+busybox-console.b8f64edf384a8c977a54e349796cef3715ecc6005821bf46349f0ff08c99943b
+#+busybox-getty.460a745e392e12e0316e52a50e6c8cc6641aac12f63e6c16564c1d1335dbfdd3
+
+#+busybox-linux-extra.f9921395428e9fa8b5af16018385c92d704b2cdf7d640af91d12339eb861da7d
+#+busybox-mtd-utils.7fd114e7b6fd74fa7eca5c72a51a682ba5e0a8612c1c94fda49f05e00399c8b1
+#+busybox-shadow.e25a023c5fec5ffb50245be48589001bba2991ef5c4630dfdb2c7163045d11d2
+#+busybox-su.2ba2709e598244cae8847d472c6d75baea820aece7b47e68aa2995282dd197a0
+#+busybox-util-linux-priv.6ecfcbc54fc609ca2f78f69276a0958e35768f2f1947ba76375e99aa3746fede
+#+busybox-logging.f16e603247e9dd21d587a1b47863c4accee0405b3129a15cc2f1bc3168ac5915
+#+busybox-cron.4dffe76d11bfebbde0a1009a25512f1fe2152643eb72e579718e00d8c6ab749e
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+diffutils.7d00c8d42e6a30553091f604d163ddf2b63704ef75af8a2bfc91348661e23ba6
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+aat.61db0dec6d83cf73bd768c9df38688526d65885f0b1866d70a9f20be91881450
+#+fileset.8c85b6836e1d462f61be6053516d340514e45287a5cf3f6838901d3d4bf39d1d
+#+rsync.6c211909510a441cb4cee329683a81d073690a382b9ec794a63eb88660d67021
+#+execline.c0c5f161b8a116da36ddada8138118cfe5c31a9f9f836653ce0a07d0f2f0946e
+#+kbd.4487e6d75546403b1e6ee97eae118513a9b83f82c30db0fc61d1238d44ef6a51
+#+mdevd.4db62fcc7311dd8bb11154429406f5fee75629ee4e6f0aee3fbd6b827c806d83
+#+s6-linux-utils.bb25c104b641816e1f3a0270401bb7a9536d5269c124bfa88e4195cc8b8b5ab0
+#+s6-rc.83a65d472b3ede2ab999d9965eee87b7a0fcf853d7ee57c1bee9d71537cd99bd
+#+s6.4ba820562a6a96f108135acc5bbc99ca193e16890ff8f7d1cd71f8abb1cd0a1a
+#+zsh.160a511e8dc1104420ffc16e0075e189211ef86b2b546f3e11b3d91e77ee7d91
+#+libcgroup.32db233f9ed70435e2ad840e1cd9bffc34c25f42609e91fbaa9f1438034ce45a
+#+system-config-scripts.f0b50feed2f18fc54f37ffafb086491e233777474550e4abaa51b9a5f1855132
+#+logincaps.c7f64df4cfe599babb406a11b1b6f0b837b332fcc73b708800883e8e9a5ddf12
+#+busybox-modutils.0f21d0dc18d9f6fa69623fec39c958e3b3ccb9dff524fdd4f13b0ca7678e0087
 #@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.cf9c3b06f7f76403524c3143f6178a928cd7755113818bbd681c6aef472261dd' \
-	'pthbs_path_mdevd=/versions/env.ba4e9e9af1e5ed753cba5bc37cf2984bfe8ef764b323ec03c3617a185afc1551' \
+	'pthbs_path_containers=/versions/env.4cd877dbc093b377ab6a9dc2d535d7185e338ca43251df2880d0390787f4224e' \
+	'pthbs_path_mdevd=/versions/env.63369559b0d98a1a492cff987bd46e3269b1843ed7119d4345f0d911bdb8b9a2' \
 	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.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-dosfstools.17418e245a79d9725a6ae2a304e8980e8d02766ab4224191de9c8d3923588b99
-#+busybox-e2fsprogs.3fed30e21aaebe97507cdd92dd433ba6c6e7a855bf557f7351d8702ae45880a8
-#+busybox-iproute2.a9cacc297d75738f0a814a984f4041c6772341f1a9ba1303771e24bc2feaf04e
-#+busybox-iputils.0b1ae18a66bf5045a3463f1f45b4518e06a912ddeec9ffbc86da30eefd79d36e
-#+busybox-net-misc.980107605e3ea5c0d52971c26d91f75bfa55d0554bcf0706580b44fcbc14ff5a
-#+busybox-net-tools.39b4b816e22b505111ca63e1bd3a0dad7b74a70dca121f2ff7c96b0d4ce2ddab
-#+busybox-traceroute.6e4cc3bdc0547aed295f908a69d25c5cff18e8ec342ff8a67dd131c2c3fb6c31
-#+busybox-wget.a5f7e43cfff655cc903dc1a233bfd94c790a291b508ef7cbc8af6e7e2811c50d
-#+busybox-chpst.985296c53e6cf78662e03bb4cc9dbcb580e8427c29929485aefd50ac475bbbc3
-#+busybox-console.49590f9bac1944990fafe5ff2f00f6ecd5aa18228af89236ad38c7e2133b7b7f
-#+busybox-getty.3a5a349030999753457a10436d5d8664968749d357e6d6f1122cd9edd6ec3cb1
-
-#+busybox-linux-extra.0a95a767387672134e1207a9314e7a5183bd00dcbc3404c3a3c02289f1b936bb
-#+busybox-mtd-utils.4047b79030c1fbfab40c3788a8ff792e26a3c7a6e0fa5b51410b4d02f2b9f9bd
-#+busybox-shadow.ac1d0f9df6782543628fe54a3aa54b58cd8b277667234fe2a0b97fc8a3363b3e
-#+busybox-su.37d0a5986b05d58d967230e94db3f50cc681477f7757d64bf597f0062012c5ad
-#+busybox-util-linux-priv.7a73598520c2b93de5291054ae77039eca2a6c99bb48c1edb1007fba5297d1bc
-#+busybox-logging.98bcaf3ee34d0ec01e1f841202ca969e1644e60629eda17e772fe49eb5beb185
-#+busybox-cron.2990cddd6816d75b12679929f7d4c17bc5f40baa1ff3223bf75682322c9b9b64
-#+s6.7f7a7a7fb3647c28a7ad7253b3e9970c1cd091c6fadd755f9577562494e382cc
-#+s6-rc.da55f1f1d2a81068b979194233e09da3d41d723e76984e3ae364c9627c3ae5c8
-#+s6-portable-utils.9eb45e59d2ecd4f200d7b4132a1c712262560bb62c3e583bbae8f3fbaa16c050
-#+s6-linux-init.2e88c8c6a67a9d70b1929cebf9a7f4d706c4ea822ec0ca77308a0871b9f04612
-#+execline.49b9333c99a58b660feb75a7598c32e9c3dfd97c16b81b7ebd4bc6bf3123f0a3
-#+system-config-rc.7fe5365ae17253c2b6eac2fb94ec6dd9936c71f718a12eed63aa3f14ad9fe0f3
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-dosfstools.840efe96ff4a2fd5e6ea201844ee069a9bfde1e57e578011f88d081922e35ea0
+#+busybox-e2fsprogs.faa0971a44cffd7bad7ba247673a28f728b4ed34b16e778f13bce0163234313b
+#+busybox-iproute2.0a789e50432c5132c76e4e54327cdd3c4fc725419effebaff03fa1afcfdddb20
+#+busybox-iputils.6b15d2fa0a002dacb68c5f05d168cd2494040894aaa7452d7c3b989b26f95dfe
+#+busybox-net-misc.4f31d3bfa9084f11f49ac9a169597ccfefd3f547e7aaa78243dfa18dd4f78179
+#+busybox-net-tools.90acb34ce84618017f7906ba371f7397e291af641ff9b5e3758377a80f6e84b0
+#+busybox-traceroute.f96679012635964f73233feccaa3aa1a853db2d1bdd1440e39762d0fb9868c3d
+#+busybox-wget.4cd596d47e7943359b171a19f33002dd7bad5608db03b5c324e1a15e445e5a5d
+#+busybox-chpst.d87c2a4fd4f0f7d104cbbc9ba58e05912237813390eefe6579761da5b01cf460
+#+busybox-console.b8f64edf384a8c977a54e349796cef3715ecc6005821bf46349f0ff08c99943b
+#+busybox-getty.460a745e392e12e0316e52a50e6c8cc6641aac12f63e6c16564c1d1335dbfdd3
+
+#+busybox-linux-extra.f9921395428e9fa8b5af16018385c92d704b2cdf7d640af91d12339eb861da7d
+#+busybox-mtd-utils.7fd114e7b6fd74fa7eca5c72a51a682ba5e0a8612c1c94fda49f05e00399c8b1
+#+busybox-shadow.e25a023c5fec5ffb50245be48589001bba2991ef5c4630dfdb2c7163045d11d2
+#+busybox-su.2ba2709e598244cae8847d472c6d75baea820aece7b47e68aa2995282dd197a0
+#+busybox-util-linux-priv.6ecfcbc54fc609ca2f78f69276a0958e35768f2f1947ba76375e99aa3746fede
+#+busybox-logging.f16e603247e9dd21d587a1b47863c4accee0405b3129a15cc2f1bc3168ac5915
+#+busybox-cron.4dffe76d11bfebbde0a1009a25512f1fe2152643eb72e579718e00d8c6ab749e
+#+s6.4ba820562a6a96f108135acc5bbc99ca193e16890ff8f7d1cd71f8abb1cd0a1a
+#+s6-rc.83a65d472b3ede2ab999d9965eee87b7a0fcf853d7ee57c1bee9d71537cd99bd
+#+s6-portable-utils.7c73e7826eab9aeea887b315409969c2341b2f7a7b26382074eb3bd518534482
+#+s6-linux-init.d397d1674f3c2437043c36b38283656f3a8b845115d3fcc4a6915281a0971b85
+#+execline.c0c5f161b8a116da36ddada8138118cfe5c31a9f9f836653ce0a07d0f2f0946e
+#+system-config-rc.61470738e6346f1501e4f0eda927c0a33162f5ae5615e39989b47cacd7a229be
 
 
 # - build script start -
@@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-s6rcdb=/versions/system-config-rc.7fe5365ae17253c2b6eac2fb94ec6dd9936c71f718a12eed63aa3f14ad9fe0f3/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.61470738e6346f1501e4f0eda927c0a33162f5ae5615e39989b47cacd7a229be/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.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+s6-rc.da55f1f1d2a81068b979194233e09da3d41d723e76984e3ae364c9627c3ae5c8
-#+fileset.48ef1c1ad9aabc68f8c01a689dda5666da222c796f80004f6c4e4805c27cfbfc
-#+system-config.91e918b82a5be7a19840fdd849061e8a812c398cfa81fd298361825e872975ef
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+s6-rc.83a65d472b3ede2ab999d9965eee87b7a0fcf853d7ee57c1bee9d71537cd99bd
+#+fileset.8c85b6836e1d462f61be6053516d340514e45287a5cf3f6838901d3d4bf39d1d
+#+system-config.cb569748518a506228436b8da52ab3894385ffdc4b5aa264a601818e00d435e6
 
 
 # - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-src=/versions/system-config.91e918b82a5be7a19840fdd849061e8a812c398cfa81fd298361825e872975ef/config/s6-rc-source
+src=/versions/system-config.cb569748518a506228436b8da52ab3894385ffdc4b5aa264a601818e00d435e6/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.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+zsh.395877b10c2159be5ce294fdc0850eac86945d98cc77d48f1f0aaf8593880f0b
-#+pthbs-banginstall.56164df1e8e5fee562e9e72b767fd849d7e67f903182e6a1da7844d2bb23152f
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+zsh.160a511e8dc1104420ffc16e0075e189211ef86b2b546f3e11b3d91e77ee7d91
+#+pthbs-banginstall.97d3b141fd70e66fc59912a95a8ef790d6fd1e3ec5a79972e4cba2a31c62f929
 #@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.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+zsh.395877b10c2159be5ce294fdc0850eac86945d98cc77d48f1f0aaf8593880f0b
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+zsh.160a511e8dc1104420ffc16e0075e189211ef86b2b546f3e11b3d91e77ee7d91
 #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh
 
 
diff --git a/variants/root-x86_64/tinyssh b/variants/root-x86_64/tinyssh
@@ -1,45 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
 #@untar:-z:sha256:f3ae622c765db4e0d791ea90a9feba39d7f693ef9cb949a797f7ad6b404a2d61:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/toolchain.environment b/variants/root-x86_64/toolchain.environment
@@ -1,4 +1,4 @@
 #!/usr/bin/env pthbs-build
-#+musl.771c30950c892f46bf06accc9e76f3ba1d9def6aa765b8eb27b5b9bd2c173784
-#+gcc.5f46eb64db64effdaeb2a2a79dd978e7fc0b865881ad70031716080ed0ad3cb5
-#+binutils.3f071a6b087aef967f5924d2d214fe161bea2f1161f7b26a6641d3811dac2677-
\ No newline at end of file
+#+musl.26a006d6cdfa57ea8a349863fbe4cf45cfb02ea7da0fc55e2dcd7f45179010dc
+#+gcc.0dd3facf6f6a04910637edff441be34bd9a99cd6565c6f0d992b606e5874dbd4
+#+binutils.7a79e3f9d4601fba84c01d09d2c34123f4c50c9082e081beb52843cd2525ee01+
\ No newline at end of file
diff --git a/variants/root-x86_64/user-env b/variants/root-x86_64/user-env
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+execline.49b9333c99a58b660feb75a7598c32e9c3dfd97c16b81b7ebd4bc6bf3123f0a3
-#+pthbs-banginstall.56164df1e8e5fee562e9e72b767fd849d7e67f903182e6a1da7844d2bb23152f
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+execline.c0c5f161b8a116da36ddada8138118cfe5c31a9f9f836653ce0a07d0f2f0946e
+#+pthbs-banginstall.97d3b141fd70e66fc59912a95a8ef790d6fd1e3ec5a79972e4cba2a31c62f929
 #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env
 
 
diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment
@@ -1,91 +1,91 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-dosfstools.17418e245a79d9725a6ae2a304e8980e8d02766ab4224191de9c8d3923588b99
-#+busybox-e2fsprogs.3fed30e21aaebe97507cdd92dd433ba6c6e7a855bf557f7351d8702ae45880a8
-#+busybox-iproute2.a9cacc297d75738f0a814a984f4041c6772341f1a9ba1303771e24bc2feaf04e
-#+busybox-iputils.0b1ae18a66bf5045a3463f1f45b4518e06a912ddeec9ffbc86da30eefd79d36e
-#+busybox-net-misc.980107605e3ea5c0d52971c26d91f75bfa55d0554bcf0706580b44fcbc14ff5a
-#+busybox-net-tools.39b4b816e22b505111ca63e1bd3a0dad7b74a70dca121f2ff7c96b0d4ce2ddab
-#+busybox-traceroute.6e4cc3bdc0547aed295f908a69d25c5cff18e8ec342ff8a67dd131c2c3fb6c31
-#+busybox-wget.a5f7e43cfff655cc903dc1a233bfd94c790a291b508ef7cbc8af6e7e2811c50d
-#+busybox-chpst.985296c53e6cf78662e03bb4cc9dbcb580e8427c29929485aefd50ac475bbbc3
-#+busybox-console.49590f9bac1944990fafe5ff2f00f6ecd5aa18228af89236ad38c7e2133b7b7f
-#+busybox-getty.3a5a349030999753457a10436d5d8664968749d357e6d6f1122cd9edd6ec3cb1
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-dosfstools.840efe96ff4a2fd5e6ea201844ee069a9bfde1e57e578011f88d081922e35ea0
+#+busybox-e2fsprogs.faa0971a44cffd7bad7ba247673a28f728b4ed34b16e778f13bce0163234313b
+#+busybox-iproute2.0a789e50432c5132c76e4e54327cdd3c4fc725419effebaff03fa1afcfdddb20
+#+busybox-iputils.6b15d2fa0a002dacb68c5f05d168cd2494040894aaa7452d7c3b989b26f95dfe
+#+busybox-net-misc.4f31d3bfa9084f11f49ac9a169597ccfefd3f547e7aaa78243dfa18dd4f78179
+#+busybox-net-tools.90acb34ce84618017f7906ba371f7397e291af641ff9b5e3758377a80f6e84b0
+#+busybox-traceroute.f96679012635964f73233feccaa3aa1a853db2d1bdd1440e39762d0fb9868c3d
+#+busybox-wget.4cd596d47e7943359b171a19f33002dd7bad5608db03b5c324e1a15e445e5a5d
+#+busybox-chpst.d87c2a4fd4f0f7d104cbbc9ba58e05912237813390eefe6579761da5b01cf460
+#+busybox-console.b8f64edf384a8c977a54e349796cef3715ecc6005821bf46349f0ff08c99943b
+#+busybox-getty.460a745e392e12e0316e52a50e6c8cc6641aac12f63e6c16564c1d1335dbfdd3
 
-#+busybox-linux-extra.0a95a767387672134e1207a9314e7a5183bd00dcbc3404c3a3c02289f1b936bb
-#+busybox-mtd-utils.4047b79030c1fbfab40c3788a8ff792e26a3c7a6e0fa5b51410b4d02f2b9f9bd
-#+busybox-shadow.ac1d0f9df6782543628fe54a3aa54b58cd8b277667234fe2a0b97fc8a3363b3e
-#+busybox-su.37d0a5986b05d58d967230e94db3f50cc681477f7757d64bf597f0062012c5ad
-#+busybox-util-linux-priv.7a73598520c2b93de5291054ae77039eca2a6c99bb48c1edb1007fba5297d1bc
-#+busybox-logging.98bcaf3ee34d0ec01e1f841202ca969e1644e60629eda17e772fe49eb5beb185
-#+busybox-cron.2990cddd6816d75b12679929f7d4c17bc5f40baa1ff3223bf75682322c9b9b64
-#+attr.31fc88ab914a7607cee3559f356ab47ce83d4281b8137131e3f6de686dcc9a1e
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+diffutils.d0677f378a1e47808251ec0a319d7ff60c8021b57c0111e218ffefe7fc441dfa
-#+patch.cc1f34666bc1f927fcd2d263904e72cd858aa27c0e8127458b58f0bc97d1e211
-#+flex.e74780d4a218bf4ce34228e9e5b6c33beb9f40a5220fa15d25a9fd586382f8fc
-#+bison.1652f11d06c5721f3bb85a3e995ef18dccf5bf6f36081f17d7aecbcbfae5dc67
-#+rsync.1ae607f7f9e6240eaebcf006c32fc7e41d65f246f530f9403b88eca8e36ea619
-#+execline.49b9333c99a58b660feb75a7598c32e9c3dfd97c16b81b7ebd4bc6bf3123f0a3
-#+s6.7f7a7a7fb3647c28a7ad7253b3e9970c1cd091c6fadd755f9577562494e382cc
-#+s6-rc.da55f1f1d2a81068b979194233e09da3d41d723e76984e3ae364c9627c3ae5c8
-#+s6-portable-utils.9eb45e59d2ecd4f200d7b4132a1c712262560bb62c3e583bbae8f3fbaa16c050
-#+s6-linux-utils.68d41137286b40e77c70d997136d7aa1d26b75923d04582df5e055d3de7742b1
-#+s6-linux-init.2e88c8c6a67a9d70b1929cebf9a7f4d706c4ea822ec0ca77308a0871b9f04612
-#+mdevd.3d9d8063a7411360f27cd8f724b62236356870400bfe73dee4b99cbf1081a3d1
-#+s6-dns.892b83af207f7761a8bad0eb772b4b8ff51a0481dad1f49c27bba5bdf760d14e
-#+libressl.2e473e902dfa0bb7b1d907fdbdb35fb1a59afbfaf749cae6fb1fda22005a3edb
-#+s6-networking.25fd456f6586de6bcf9fa22948eb03889ab967b9f880d0849e790f2c1f86ec9a
-#+zsh.395877b10c2159be5ce294fdc0850eac86945d98cc77d48f1f0aaf8593880f0b
-#+pthbs-banginstall.56164df1e8e5fee562e9e72b767fd849d7e67f903182e6a1da7844d2bb23152f
-#+aat.861c54370957ce5fc67693cfc0201badc31872c74077a72bc82f030a9a330e3e
-#+confz.307b96c407bf61de025eb21da7764acf5d14ed96f00d54f9c5666f73ec628577
-#+containers.6a0a97d8e1e8241b9aafbc4778c7931b16d93dd4f39e2120dc12911e8f6973d5
-#+fileset.48ef1c1ad9aabc68f8c01a689dda5666da222c796f80004f6c4e4805c27cfbfc
-#+logincaps.afa9a7378b9525f9ae3732b8e13a644f8155e22120e679fc55162518b798f3b2
-#+snaprep.96439b1085b703a80c2614890e38cee665354d2ece5f0aaef28aa7b01a11146d
-#+curl.e4eb1bb9395c22548c4b042a99a3c8a3295393c8672930089d9d32e81951468b
-#+git.238db32bcc7bf8c7dff5d743aac5d7c7e33e13b60fe7444d057cf75afbfba5ad
-#+xbps.41ed375b0206ad8a1702f4acbd37a641bf0dd86874908c8450ab04a7714223e8
-#+apk-tools.e89c2df3cf7e4d0b05594966e9170a4aa1c934ef64d0140ece7d8589a49fde20
-#+getent.a311c732280dc93397f941c8658159a8a3d98d27b7f1c1a7a575b7e9a893a7b5
-#+getconf.b73339837f155ee56d4b81ee2e31e2fb67edf7b123960606e6f457a4ed9222b9
-#+iconv.73a903740e755048935f4e7e64e9145df0e11d06bf3fb04f805961573e399cfc
-#+libcap.cb2eed4fbad8a7fbfd1489ae621cee4e5d847e11f7e09377053cd65730b7e699
-#+applyuidgid-caps.79f2943f8120c3becf7f1b2524caf86bd7d07fcc18190db01f21b32241cf2a0d
-#+ccx-utils.e5fdf6dedb639eaa807c7aee61370932de3a0b382ae152855e9bb8b11f08c6c4
-#+user-env.6d0bf435cd0b221516b90de322483463977b1e4d2a16182e850b69bf17e791de
-#+strace.8c037d751cf522ccbf31bb3370a8ab0cf57f3ded1fd7d172d9ef539b0407983c
-#+mlog.6d96fa5ff07539ac681bc86e2b3715b1199affe9978defad54726111f6e665c9
-#+findutils.546d28378fdb9da6733c82dbb35bd1568992e8da525806fda5e9ffb8fc51d98e
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+nvi.0509f8f0777d38c1bec4800aa6f77876bbb9f466e1ff5ad68ef4bf0d007a7478
-#+squashfs-tools.a3e62a4f7c0c8a51df24d99e6701b29f6f46c3451dc93c0e25eac3965deb71ea
-#+mandoc.ca5f0bc2830d931f7d66c82625fb572404a19f73a6922a28b01f4b5a7665cb79
-#+tinyssh.2c25a6a0063c1e741d809094c0ccb72f2cc19b827217dd6bffb960beebcb8141-
\ No newline at end of file
+#+busybox-linux-extra.f9921395428e9fa8b5af16018385c92d704b2cdf7d640af91d12339eb861da7d
+#+busybox-mtd-utils.7fd114e7b6fd74fa7eca5c72a51a682ba5e0a8612c1c94fda49f05e00399c8b1
+#+busybox-shadow.e25a023c5fec5ffb50245be48589001bba2991ef5c4630dfdb2c7163045d11d2
+#+busybox-su.2ba2709e598244cae8847d472c6d75baea820aece7b47e68aa2995282dd197a0
+#+busybox-util-linux-priv.6ecfcbc54fc609ca2f78f69276a0958e35768f2f1947ba76375e99aa3746fede
+#+busybox-logging.f16e603247e9dd21d587a1b47863c4accee0405b3129a15cc2f1bc3168ac5915
+#+busybox-cron.4dffe76d11bfebbde0a1009a25512f1fe2152643eb72e579718e00d8c6ab749e
+#+attr.8c27725b1551988d9b56622daa60834a09fe95f5ad9b66306bb3f9dcf3349009
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+diffutils.7d00c8d42e6a30553091f604d163ddf2b63704ef75af8a2bfc91348661e23ba6
+#+patch.f5939c6363d5747ea877353651eb4a9e5533e2e7471ed211cf69624f32b6fadf
+#+flex.dc317eaae721db029d4114e05212cac1e8891266100e882399d19113c03b1451
+#+bison.d2bcd8b75ff96d6becbc842039e5126c2ffa2c34c34abd623464637bad0d204f
+#+rsync.6c211909510a441cb4cee329683a81d073690a382b9ec794a63eb88660d67021
+#+execline.c0c5f161b8a116da36ddada8138118cfe5c31a9f9f836653ce0a07d0f2f0946e
+#+s6.4ba820562a6a96f108135acc5bbc99ca193e16890ff8f7d1cd71f8abb1cd0a1a
+#+s6-rc.83a65d472b3ede2ab999d9965eee87b7a0fcf853d7ee57c1bee9d71537cd99bd
+#+s6-portable-utils.7c73e7826eab9aeea887b315409969c2341b2f7a7b26382074eb3bd518534482
+#+s6-linux-utils.bb25c104b641816e1f3a0270401bb7a9536d5269c124bfa88e4195cc8b8b5ab0
+#+s6-linux-init.d397d1674f3c2437043c36b38283656f3a8b845115d3fcc4a6915281a0971b85
+#+mdevd.4db62fcc7311dd8bb11154429406f5fee75629ee4e6f0aee3fbd6b827c806d83
+#+s6-dns.bad0692e685773b32cd31cc37fe8339172e74c2ce1ab72c36a963574f1d1a380
+#+libressl.5f6ce78a162c0f2f1a6ccdf81d96ef3861194e6f0b7543f244c67f709183e058
+#+s6-networking.d9d413fcc4fae8e4ff229286f8f5403273aa44e68404111e99c802fd6e578d1e
+#+zsh.160a511e8dc1104420ffc16e0075e189211ef86b2b546f3e11b3d91e77ee7d91
+#+pthbs-banginstall.97d3b141fd70e66fc59912a95a8ef790d6fd1e3ec5a79972e4cba2a31c62f929
+#+aat.61db0dec6d83cf73bd768c9df38688526d65885f0b1866d70a9f20be91881450
+#+confz.d00355b26c375f76967b72e160619321d4943ac1e70bda9284ea202a62149850
+#+containers.2de6283ca8c4494655e236dd819988b48a261a20dfaef886a51823689a5a89fe
+#+fileset.8c85b6836e1d462f61be6053516d340514e45287a5cf3f6838901d3d4bf39d1d
+#+logincaps.c7f64df4cfe599babb406a11b1b6f0b837b332fcc73b708800883e8e9a5ddf12
+#+snaprep.00c23eda9e381f78130696f9dd2bca0e4dcfa5e968847477329a1396e5d1a458
+#+curl.d3aa78208cdef3587276d0f13b47c33e2d79250c709c6c276138a9238c4bb863
+#+git.b435ac11c0f5e3b062ac4ec0867edced8822184567f7f58001c2097577995049
+#+xbps.207598e2d56371c99db84493ff1b6c5e3891e0f06f91cd47f2a113e133dd7c32
+#+apk-tools.c692d9b15dbcddd9667eff2f3443ea7f81d3ed8e0ef893f9bba925172a308bbe
+#+getent.93ac43fbd2153c7725631d4547f7c35ae1dc8a0eb602fb2619d3c06eb958514c
+#+getconf.fc7060660a31878d8745e4c3ec021f2b647e7f249c6b051c60d7489733d03e21
+#+iconv.62ba123084e7e8ad0671112287ea5708a5fa819af2a7fec23a198c52769dd963
+#+libcap.8174e0d858087c367ab06231281ca1edef5354ad701504ac4e3bd27c2c31c0ad
+#+applyuidgid-caps.1e7bbbb5ecd050ce3e03441e69a518a2d4b61cf2c0d21699b21a5b134be87af5
+#+ccx-utils.f098fada9c7a39e9f64bfe84e15907a6535b1be88cd8e1b21eeeaa591f84f666
+#+user-env.9bf9a36e604e49aa67f676dd953ca668eb51d7dc2ad2433d9a837813edcdea7a
+#+strace.d3e314ef9dd1c87f6227eb7d18f75b5bcab8246722cc408dd45d80c4cfc33817
+#+mlog.a161df07b2dc6cccebfc092dcf3ffe90e1675c8f48eab75cc25cb6ea3489cea0
+#+findutils.1ca9a221cbfe034384a44d3fca0d5675f9d4294b0d0cf41b2bfee40d5dc033b1
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+nvi.8824e0f2864a615a169d3398acc84d6ac9b4320ab21cec444a6f01d70d01cfee
+#+squashfs-tools.9ad29f557a99efeead3e8a2406018106a1b8cbadc5e302b24d5aa3ba288c239d
+#+mandoc.318133f4b6b71ec0e61de272df3319d172837d670f8a3eb24afb1ded4e873b5b
+#+tinyssh.a7cbbdb96b73cea70514a88ad502393a088e00d8aecfca8af1b3982832d9976c+
\ 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.ef4cec5f7a8ba34fe90c9fe5d135d26d49a19a3423358da6f258bac995d78adb-
\ No newline at end of file
+#+linux-qemu-guest.00c9796571649cc90e5539e4b62fe3af36138386a224e448d8bd048a9462f132+
\ No newline at end of file
diff --git a/variants/root-x86_64/xbps b/variants/root-x86_64/xbps
@@ -1,47 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+libarchive.616584a2e068297d5045377cfd31f4cc5e3c8636983cac1eede96490d883f641
-#+libressl.2e473e902dfa0bb7b1d907fdbdb35fb1a59afbfaf749cae6fb1fda22005a3edb
-#+pkgconf-pkg-config.e94944954818a6069f4d643a0d98553596df133ac8ccd5bc26e1140ce4f45bc2
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+libarchive.f1dbc5452b9381c29b18cb9def19515e48d6966c136efcf864f657115e6b7a21
+#+libressl.5f6ce78a162c0f2f1a6ccdf81d96ef3861194e6f0b7543f244c67f709183e058
+#+pkgconf-pkg-config.81a2e86557c7f29747c5e0710f9a59912bded92551099c2720b17ebe1ceb9704
 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
diff --git a/variants/root-x86_64/zsh b/variants/root-x86_64/zsh
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+m4.40d83d50f329cfe11bfeb914c554b41bbe66538ee7aaa4380d5d19e8f33be5bb
-#+netbsd-curses.89d0e50461587137de691ff7d86e0ad43a460b53fa9b9e628ec736486eb51a91
-#+libbsd.abbfe7f003574ddfcaca72d7121a3a90890833afbb2a6bd8c1c3cbbf4d512c6b
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+m4.54fcb13ff827ab832cd4845f2f252d6283e377b58c2803ba46fc2862aa422d33
+#+netbsd-curses.8578184a5c4fc4c335e58d885274db099312860700445cef375937a9ec4e5dec
+#+libbsd.aacc3314e303f231be844661eed907bd9aad6e3fb7784156855ebfde3b674f33
 #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config
 #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:.
 
@@ -63,10 +63,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }
 
@@ -90,6 +88,10 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'zsh-5.9'
 
 
+export CPATH=$pthbs_build_environment/'include'
+export LIBRARY_PATH=$pthbs_build_environment/'library'
+export LD_LIBRARY_PATH=$pthbs_build_environment/'library.so'
+build_env_static
 autotools_config \
 	--enable-datadir="${prefix}" \
 	--enable-datarootdir="${prefix}" \
diff --git a/variants/root-x86_64/zstd b/variants/root-x86_64/zstd
@@ -1,45 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
-#+busybox-bzip2.20745f40cb0c6e8cdf2156b9e34e01c6142e4020f4d2af3bc43561bc44da734d
-#+busybox-gzip.4ccc1cedf66e8df0b254cb9cf23801f91f44229cc7d1884e8e708033c0065d58
-#+busybox-lzop.7801b14b4ce6c6841f25ee605734d705f49f64f31269f7265c616667a472a6c6
-#+busybox-unzip.ac1ebc1b8ee04b89d3941a2ee327953eae098cf6407800c79bdca063786cbe3b
-#+busybox-xz.22c1235e5aa723fbfb594b998226cef6df12bfd749a7f5051f7cf411fdd79384
-#+busybox-cpio.beab66dd8098d52c002a2e6dad68491f6511af7de1386d539fe43b267526d92a
-#+busybox-dpkg.4424b9f78eeeda07eed66c4c10a166961bad500eaa0690882cb483b92099c375
-#+busybox-rpm.69f773fa8e4b4e4a785049016053b39dae9237cade5b67aa106233d9390992cb
-#+busybox-tar.2b9781679ae73dd7240669df4ac7e62d1d0129785d3d606bacd726a76efafd2e
-#+busybox-ed.3c280f58c2734f330469f2cc1c14be0c3e31b7d86f185a8618da76ea18fc1109
-#+busybox-sed.919cbd556bcc334bead5e66f2c90e36b97cac6ced29106c3144c9b5da0f16fcb
-#+busybox-vi.1a5e5cc81ca5fa7f6d1ea10536cc291174ffcb1ae4bd79eec1addb8a9b8e9c00
-#+busybox-xxd.3f70713f7da58bc8b002f6a48c286a16187b061fab496700dfea3cdc8f030f4a
-#+busybox-process-extra.794a9f080977d1b40f17a6a536c6ffab8d2721462f494ecf9449f6b3c5c77e4c
-#+busybox-procps.b58aec81951ec3cd7e2cc3150ff9b53ae412d7690730dae6a7288d8fae8a31f8
-#+busybox-psmisc.e10610343d4ec9f4c830a5be5755685b3c5604c33572f2429f6965b702f7237b
-#+busybox-ash.368e504b1171923476fdec5be23b9f2e864a6b50ae1001aaf59e39254c5f2eb6
-#+busybox-bc.2fd7765465cd00b626dc501585b633c5258bcb5fda3ec6bdf072cdb193e900df
-#+busybox-coreutils.0c6200dc46078101ff4106cc932757f8214f923e15578606ce10f5da8f6a38a9
-#+busybox-coreutils-extra.51ab0ce5eec4c8e884061c8fa7f8dcd8e7974a414f4669dadb2f7a37431208c4
-#+busybox-daemontools.5c9200d503e26dc3fb9a1c17ae55113389bd32eedc7d22b737a807b3d7b3ef66
-#+busybox-grep.f6b7c7498888e15c281721feb1d118a1ae26ce05e4531573dec69274fff23e65
-#+busybox-misc.253b0af0e81f1ffe6fa5b69b4c74b9dab11b8fac361f537ca4810eceda565b84
-#+busybox-sh.9847fe8736b7adcb2422ffd7957d51c5eee41904de7028935dd13cd7a754fa41
-#+busybox-util-linux-unpriv.3623ffbae4e67b1b4a5ac8d0903144bd7d8c5c95f29316785831f082eb28599a
-#+busybox-findutils.9be629cc8ce6167492458077c8335e106e77c4a38c2def0b133a72476ccfc5a9
-#+nawk.c1500c79a61c418754f9de36e9ec9ec36a180cddd64901d4402d2a30a81d8520
-#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
-#+gnu-make.db77e5ebc7f9f3312f672f16291562c2ee9c4d5cdf92118b34eaca1249bf1ec2
-#+busybox-diffutils.97b4c074439bf1f936862f1c122b6248ff093f09dca85ae2a3e12fece53d198b
+#+busybox.23cff19cc9ab0ef554efac97e68d5e826dc2c7c05c597d9b01325b4ed46da453
+#+busybox-bzip2.42e3e8c7a46829d8acaee352ef86ae48a6433cb20d7ed2315c666af047fc7358
+#+busybox-gzip.f194e5dadf084591651b87b9d2aeb1fcb2f409b3620341a2893bb63054d43887
+#+busybox-lzop.b1624db6efc5b0409a2638adf198f00b01c01628595c1e15159abd35547c9789
+#+busybox-unzip.cacf3809aac6476fe8d3ab2f5a41088ccea3e259db86b63f61e44c10cb5c6665
+#+busybox-xz.d0aee72aa8a38cbb5ceae8e460000c8e8000b409f9d619ada67647b871999717
+#+busybox-cpio.26fdfb5d20ae6eb7470f08a7c77065b70e2a00bfef5e0a85b01e80304219ec8c
+#+busybox-dpkg.a20dd035162d0db228a3d0e67d41146da0a3d6ca00ff7e47b1530b28133e39c0
+#+busybox-rpm.38c06ae06ef99b343aaac91cdfe8b322fe52cedf48082bc538f9f2b035fed745
+#+busybox-tar.a337a263c5e4ed07f2e0fac5014a0d8502baf7dcdaeefe78c1087f260d8caa53
+#+busybox-ed.f9a09fc8c38bafea6404c05e8100af9cb2d5896b6effbd3c1eb1ea37d74758ce
+#+busybox-sed.73d1507bc88163ba363589f65491780f14d266a87d028ca6f13504bf03027143
+#+busybox-vi.d8f1c9d044cab8141df9581816e9ed9999c0c6d1e21c53e7a1912afb536eba8c
+#+busybox-xxd.93ce12424a8adf67eda4189254f8900ddd6e86b99b6d7e5802308c9a963a4887
+#+busybox-process-extra.6238327943e38399d75412ee16c84fb57069b90f53d126790177ec2eb06f6d78
+#+busybox-procps.1a584ba9bc9d4311fe85305a477f62635b2f0dafca4d96fd600dd78bdec51d58
+#+busybox-psmisc.9150fb634d4f43cdf850b2965693ef4e727fa6450571707ba335c52305a83ad2
+#+busybox-ash.08bbd754428bb0a8633ddb4c857f8111006311979dc19a793c7832367d860c4b
+#+busybox-bc.a499fe65ed3563d08200c203657c0b888e94a1ac2f37ed71ef80117a5881d34a
+#+busybox-coreutils.41a4267b484821bdc213883fc33c819f3eb26f109b156b3ade016123809c7a11
+#+busybox-coreutils-extra.bc5a9a401b27a5a04441bc8638a88535cfc8a377e9ccd402b44848eab3ca9e68
+#+busybox-daemontools.2ab1aef8abab6b14c0f3ad3072bcf598f90cd7f30a083f9d377f6765b220d392
+#+busybox-grep.e80b707205396c99ab138c04b266bd5d5e44ff2e2875840cb90dabb2488fbd11
+#+busybox-misc.4af6da23b37d500cff0c74c9140091f783ca159ef0d8faee51023e939623267e
+#+busybox-sh.f5acf7991f132a9e94b4e767681b5d1d8edb6110b137cd4f7ce15abf876e1d5b
+#+busybox-util-linux-unpriv.8a1888aefdf29b78159a1a578dbb807cc38a0794e05860f03cf3515ab60dd0f7
+#+busybox-findutils.0d1b9bc0d3e963096200d045a9bbb63021d85350783aff6609fcfa491f773644
+#+nawk.051f783a5ee68a8843db4b7ea0b5ddf69564d8586c9b8acf958ffbbf0f97aabe
+#+musl-cross-make.31115dc9cc63f2893a55601c7b414be9bfd974ad2da68cbf844892ffaad102b1
+#+gnu-make.12f97c573403d56cc01038be26bec3c0a3bc6b2f774cc8d82a7d9056a4435479
+#+busybox-diffutils.f248ce59500db7272ea1713aef4c56bbbbe353e4d96f421c6e60cd2a416ea575
 #@untar:-z:sha256:98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir -L$pthbs_build_environment/library $CXXFLAGS"
-	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
-	export CPATH="$pthbs_build_environment/include"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
 }