mrrl

commit fab7d25b86a560932a6a1886417bb7237fe63c41
parent 0c4da53ca27378d9ad08e15541e27f420bcad7ae
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Tue,  9 Dec 2025 16:30:32 +0000

Add library search path to CFLAGS via build_env_static

Diffstat:
M
templates/functions/build_env_static
 | 
4
++--
M
variants/ccx-x86_64/aat
 | 
60
++++++++++++++++++++++++++++++------------------------------
M
variants/ccx-x86_64/abduco
 | 
66
+++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/alpine-keys
 | 
56
++++++++++++++++++++++++++++----------------------------
M
variants/ccx-x86_64/apk-tools
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/applyuidgid-caps
 | 
66
+++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/argp-standalone
 | 
64
++++++++++++++++++++++++++++++++--------------------------------
M
variants/ccx-x86_64/attr
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/binutils
 | 
14
+++++++-------
M
variants/ccx-x86_64/bison
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
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
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/certdata2pem
 | 
62
+++++++++++++++++++++++++++++++-------------------------------
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
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/default.environment
 | 
192
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/ccx-x86_64/diffutils
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/dune
 | 
64
++++++++++++++++++++++++++++++++--------------------------------
M
variants/ccx-x86_64/easyseccomp
 | 
80
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/ccx-x86_64/error-standalone
 | 
66
+++++++++++++++++++++++++++++++++---------------------------------
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
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/flex
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/gcc
 | 
26
+++++++++++++-------------
M
variants/ccx-x86_64/getconf
 | 
62
+++++++++++++++++++++++++++++++-------------------------------
M
variants/ccx-x86_64/getent
 | 
62
+++++++++++++++++++++++++++++++-------------------------------
M
variants/ccx-x86_64/git
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/gmp
 | 
14
+++++++-------
M
variants/ccx-x86_64/gnu-make
 | 
12
++++++------
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
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/iconv
 | 
62
+++++++++++++++++++++++++++++++-------------------------------
M
variants/ccx-x86_64/kbd
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/kernel.environment
 | 
6
+++---
M
variants/ccx-x86_64/libarchive
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/libbsd
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/libcap
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/libcap:bootstrap
 | 
8
++++----
M
variants/ccx-x86_64/libcgroup
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/libelf
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/libmd
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/libressl
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/libseccomp
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/libunwind
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
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
 | 
66
+++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/m4:bootstrap
 | 
12
++++++------
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
 | 
64
++++++++++++++++++++++++++++++++--------------------------------
M
variants/ccx-x86_64/mpc
 | 
18
+++++++++---------
M
variants/ccx-x86_64/mpfr
 | 
16
++++++++--------
M
variants/ccx-x86_64/musl
 | 
10
+++++-----
M
variants/ccx-x86_64/musl-cross-make
 | 
8
++++----
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
 | 
64
++++++++++++++++++++++++++++++++--------------------------------
M
variants/ccx-x86_64/nawk
 | 
66
+++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/nawk:bootstrap
 | 
4
++--
M
variants/ccx-x86_64/netbsd-curses
 | 
60
++++++++++++++++++++++++++++++------------------------------
M
variants/ccx-x86_64/nvi
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
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
 | 
64
++++++++++++++++++++++++++++++++--------------------------------
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
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/pkgconf
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/pkgconf-pkg-config
 | 
54
+++++++++++++++++++++++++++---------------------------
M
variants/ccx-x86_64/popt
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/pthbs-banginstall
 | 
58
+++++++++++++++++++++++++++++-----------------------------
M
variants/ccx-x86_64/pthbs-sandbox-rootns
 | 
10
+++++-----
M
variants/ccx-x86_64/rsync
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
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
 | 
14
+++++++-------
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
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/strace
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
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
 | 
66
+++++++++++++++++++++++++++++++++---------------------------------
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
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/zsh
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/zstd
 | 
66
+++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/aat
 | 
60
++++++++++++++++++++++++++++++------------------------------
M
variants/root-x86_64/abduco
 | 
66
+++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/alpine-keys
 | 
56
++++++++++++++++++++++++++++----------------------------
M
variants/root-x86_64/apk-tools
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/applyuidgid-caps
 | 
66
+++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/argp-standalone
 | 
64
++++++++++++++++++++++++++++++++--------------------------------
M
variants/root-x86_64/attr
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/binutils
 | 
14
+++++++-------
M
variants/root-x86_64/bison
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
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
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/certdata2pem
 | 
62
+++++++++++++++++++++++++++++++-------------------------------
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
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/default.environment
 | 
192
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/root-x86_64/diffutils
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/dune
 | 
64
++++++++++++++++++++++++++++++++--------------------------------
M
variants/root-x86_64/easyseccomp
 | 
80
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/root-x86_64/error-standalone
 | 
66
+++++++++++++++++++++++++++++++++---------------------------------
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
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/flex
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/gcc
 | 
26
+++++++++++++-------------
M
variants/root-x86_64/getconf
 | 
62
+++++++++++++++++++++++++++++++-------------------------------
M
variants/root-x86_64/getent
 | 
62
+++++++++++++++++++++++++++++++-------------------------------
M
variants/root-x86_64/git
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/gmp
 | 
14
+++++++-------
M
variants/root-x86_64/gnu-make
 | 
12
++++++------
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
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/iconv
 | 
62
+++++++++++++++++++++++++++++++-------------------------------
M
variants/root-x86_64/kbd
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/libarchive
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/libbsd
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/libcap
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/libcap:bootstrap
 | 
8
++++----
M
variants/root-x86_64/libcgroup
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/libelf
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/libmd
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/libressl
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/libseccomp
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/libunwind
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
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
 | 
66
+++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/m4:bootstrap
 | 
12
++++++------
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
 | 
64
++++++++++++++++++++++++++++++++--------------------------------
M
variants/root-x86_64/mpc
 | 
18
+++++++++---------
M
variants/root-x86_64/mpfr
 | 
16
++++++++--------
M
variants/root-x86_64/musl
 | 
10
+++++-----
M
variants/root-x86_64/musl-cross-make
 | 
8
++++----
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
 | 
64
++++++++++++++++++++++++++++++++--------------------------------
M
variants/root-x86_64/nawk
 | 
66
+++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/nawk:bootstrap
 | 
4
++--
M
variants/root-x86_64/netbsd-curses
 | 
60
++++++++++++++++++++++++++++++------------------------------
M
variants/root-x86_64/nvi
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
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
 | 
64
++++++++++++++++++++++++++++++++--------------------------------
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
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/pkgconf
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/pkgconf-pkg-config
 | 
54
+++++++++++++++++++++++++++---------------------------
M
variants/root-x86_64/popt
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/pthbs-banginstall
 | 
58
+++++++++++++++++++++++++++++-----------------------------
M
variants/root-x86_64/pthbs-sandbox-rootns
 | 
10
+++++-----
M
variants/root-x86_64/rsync
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
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
 | 
14
+++++++-------
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
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/strace
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
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
 | 
66
+++++++++++++++++++++++++++++++++---------------------------------
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
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/zsh
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/zstd
 | 
66
+++++++++++++++++++++++++++++++++---------------------------------

376 files changed, 7990 insertions(+), 7990 deletions(-)
diff --git a/templates/functions/build_env_static b/templates/functions/build_env_static
@@ -1,6 +1,6 @@
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 LDFLAGS="-static -L$pthbs_build_environment/{{libdir}} $LDFLAGS"
diff --git a/variants/ccx-x86_64/aat b/variants/ccx-x86_64/aat
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+zsh.50b0fe630f2d5ddbe51a36ba7884be91a5c15ab95e13f8263dd2d7d66250f8f5
-#+pthbs-banginstall.2dd016dd341fe9efe7cfe92c022f13264e0946c144a1f30da9b2d1190662f058
+#+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
 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat
 
 
diff --git a/variants/ccx-x86_64/abduco b/variants/ccx-x86_64/abduco
@@ -1,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
+#+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
 #@git:8c32909a159aaa9484c82b71f05b7a73321eb491:abduco
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
+#+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
 #@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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+patch.95c9bec783a4dffd073983372fb9952b5f686dc3576bdeabd175ea44ec199660
-#+libressl.2a203c612465b8b8cb0aaa2ea8f17bda8848442cadc3e881ccb51d17617ae2f5
-#+zstd.9b15b3ddc4b37f15f098e5a280bcbb0f18a877d51674c2eedae7697666d1b7da
-#+pkgconf-pkg-config.36a9dc4c92d6d644f3a0e9b3399397e26b8e5c86c16ffe2c23dc7397cebd5f6d
+#+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
 #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch
 #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools
 
@@ -41,8 +41,8 @@
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+skalibs.1022f215409d53b0b7c03be5d57100a166d24812c7d3b8a7bcddb3cdb22f1d59
-#+libcap.d1371bcd4132215289259226f215b7e950a936a9d208408fb28f497ffd918312
+#+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
 #@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+m4.2f11520ee4dee19e3911857ae1fe0a484cc48676b0efa28328cdc29e73be5b6b
+#+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
 #@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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+m4.2f11520ee4dee19e3911857ae1fe0a484cc48676b0efa28328cdc29e73be5b6b
+#+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
 #@untar:-z:sha256:39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87:.
 
 
@@ -60,8 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.d59becebc257140acc79692fc0c93a44f74666c5ab003b71f4f7f21c21011eae
-#+gnu-make.69bac45b9788ae51b55d84abdb050a1863403e3adb0ddd608036227a5202415e
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+m4.8e765e9de0450da373ecc8384d740a82d02fcef05c8a160d79791211d26cbe68
-#+nawk.e751b8be76a2fb59a2fe374e1f55c7da47b14ef1154eb8614d12107e6d68e88d
+#+musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
+#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+m4.d7c9e4dd9474e659d6c16f640cd2d57ac62b252b2a4bb12259dcc48d2412e402
+#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
 #@sha256:a119e7e50cae23feaad160a533d69a90073a519521924da56abc74724cec65c6:merged.patch
 #@untar:-z:sha256:0cdd76777a0dfd3dd3a63f215f030208ddb91c2361d2bcc02acec0f1c16b6a2e:.
 
@@ -34,8 +34,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.e751b8be76a2fb59a2fe374e1f55c7da47b14ef1154eb8614d12107e6d68e88d
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+m4.2f11520ee4dee19e3911857ae1fe0a484cc48676b0efa28328cdc29e73be5b6b
-#+flex.bb8a2badc1b9c5e4f7ed4671e5df3a64c77240c22ca349ed94053546a095141d
+#+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
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 
@@ -62,8 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+gnu-make.69bac45b9788ae51b55d84abdb050a1863403e3adb0ddd608036227a5202415e
-#+musl-cross-make.d59becebc257140acc79692fc0c93a44f74666c5ab003b71f4f7f21c21011eae-
\ No newline at end of file
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
+#+musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4+
\ 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.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.69bac45b9788ae51b55d84abdb050a1863403e3adb0ddd608036227a5202415e
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
+#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
+#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
 #@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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-attr b/variants/ccx-x86_64/busybox-attr
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-awk b/variants/ccx-x86_64/busybox-awk
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-bc b/variants/ccx-x86_64/busybox-bc
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-bzip2 b/variants/ccx-x86_64/busybox-bzip2
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-chpst b/variants/ccx-x86_64/busybox-chpst
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-console b/variants/ccx-x86_64/busybox-console
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-coreutils b/variants/ccx-x86_64/busybox-coreutils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-coreutils-extra b/variants/ccx-x86_64/busybox-coreutils-extra
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-cpio b/variants/ccx-x86_64/busybox-cpio
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-cron b/variants/ccx-x86_64/busybox-cron
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-daemontools b/variants/ccx-x86_64/busybox-daemontools
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-diffutils b/variants/ccx-x86_64/busybox-diffutils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-dosfstools b/variants/ccx-x86_64/busybox-dosfstools
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-dpkg b/variants/ccx-x86_64/busybox-dpkg
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-e2fsprogs b/variants/ccx-x86_64/busybox-e2fsprogs
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-ed b/variants/ccx-x86_64/busybox-ed
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-findutils b/variants/ccx-x86_64/busybox-findutils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-getty b/variants/ccx-x86_64/busybox-getty
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-grep b/variants/ccx-x86_64/busybox-grep
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-gzip b/variants/ccx-x86_64/busybox-gzip
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-iproute2 b/variants/ccx-x86_64/busybox-iproute2
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-iputils b/variants/ccx-x86_64/busybox-iputils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-kbd b/variants/ccx-x86_64/busybox-kbd
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-linux-extra b/variants/ccx-x86_64/busybox-linux-extra
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-logging b/variants/ccx-x86_64/busybox-logging
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-login b/variants/ccx-x86_64/busybox-login
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-lzop b/variants/ccx-x86_64/busybox-lzop
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-misc b/variants/ccx-x86_64/busybox-misc
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-modutils b/variants/ccx-x86_64/busybox-modutils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-mtd-utils b/variants/ccx-x86_64/busybox-mtd-utils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-net-misc b/variants/ccx-x86_64/busybox-net-misc
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-net-tools b/variants/ccx-x86_64/busybox-net-tools
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-process-extra b/variants/ccx-x86_64/busybox-process-extra
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-procps b/variants/ccx-x86_64/busybox-procps
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-psmisc b/variants/ccx-x86_64/busybox-psmisc
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-rpm b/variants/ccx-x86_64/busybox-rpm
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-sed b/variants/ccx-x86_64/busybox-sed
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-sh b/variants/ccx-x86_64/busybox-sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-shadow b/variants/ccx-x86_64/busybox-shadow
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-su b/variants/ccx-x86_64/busybox-su
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-tar b/variants/ccx-x86_64/busybox-tar
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-traceroute b/variants/ccx-x86_64/busybox-traceroute
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-unzip b/variants/ccx-x86_64/busybox-unzip
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-util-linux-priv b/variants/ccx-x86_64/busybox-util-linux-priv
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-util-linux-unpriv b/variants/ccx-x86_64/busybox-util-linux-unpriv
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-vi b/variants/ccx-x86_64/busybox-vi
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-wget b/variants/ccx-x86_64/busybox-wget
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-xxd b/variants/ccx-x86_64/busybox-xxd
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-xz b/variants/ccx-x86_64/busybox-xz
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+busybox.963718927a5eb891a37229a317b2503a86f89c54e76b96f6c3e7f35b5837c483
 
 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.d59becebc257140acc79692fc0c93a44f74666c5ab003b71f4f7f21c21011eae
-#+gnu-make.69bac45b9788ae51b55d84abdb050a1863403e3adb0ddd608036227a5202415e
-#+nawk.e751b8be76a2fb59a2fe374e1f55c7da47b14ef1154eb8614d12107e6d68e88d
+#+musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
+#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
+#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
 #@git:8d7ae80eda7e08ee361f8793683ae58216caf720:busybox
 #@sha256:13ed92216aef70e6fc431b2e66a9b20a71b5f4b69a3d7a84acbc4d1210d6ea6a:busybox/.config
 
 PATH="$pthbs_build_environment/command:$PATH"
-mcm=/home/ccx/versions/musl-cross-make.d59becebc257140acc79692fc0c93a44f74666c5ab003b71f4f7f21c21011eae
-make=/home/ccx/versions/gnu-make.69bac45b9788ae51b55d84abdb050a1863403e3adb0ddd608036227a5202415e
+mcm=/home/ccx/versions/musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
+make=/home/ccx/versions/gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
 
 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.72cc6042b882082c7cbfed17c89285926cd297f02d997e25901bcfc3b318bb21
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
+#+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
 #@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.72cc6042b882082c7cbfed17c89285926cd297f02d997e25901bcfc3b318bb21"
+CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux-qemu-guest.2146f6782e67214c7ad7ee82b2c006ba2f2cd852ed4df91c86decd5c41d0e7ae"
 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.d6750f5a1e339e3d060bfc90f5782fe6092b8efd8f888c77677981b49e640c5d
-#+gnu-make.e1e853dc6defb07b15f88e3e3d66b395de244b7fc5f47ef92b624ff73540cc1d
-#+busybox.7c806f251682aef762107a570a344b486e48595991e74acd422ea1d030d92afb
-#+nawk.e751b8be76a2fb59a2fe374e1f55c7da47b14ef1154eb8614d12107e6d68e88d
+#+musl-cross-make.e6726ea29e8b7fe316c8a30b8a500f73aab8cf8c862a1bcd575d50b3265dd793
+#+gnu-make.b7cde92a7edabca3a8e00739fed6aaa5533d94f74d290dff8ce739ffef9171b5
+#+busybox.3cee246e09c72f86b6e714fb4b4557dc2f9ee571084f716bbcb612fa8ebd3deb
+#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
 #@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.2a6aa41af147a85dfff7a65f9be1e61939dd022d85b7ec42d6add621e550995f
-#+gnu-make.e1e853dc6defb07b15f88e3e3d66b395de244b7fc5f47ef92b624ff73540cc1d
+#+musl-cross-make.a92bd0a73a662b4ebb61cd88fa1f6d034a327326d3a9d0f0040cc87ed97e5cb3
+#+gnu-make.b7cde92a7edabca3a8e00739fed6aaa5533d94f74d290dff8ce739ffef9171b5
 #@git:8d7ae80eda7e08ee361f8793683ae58216caf720:busybox
 #@sha256:13ed92216aef70e6fc431b2e66a9b20a71b5f4b69a3d7a84acbc4d1210d6ea6a:busybox/.config
 
-mcm=/home/ccx/versions/musl-cross-make.2a6aa41af147a85dfff7a65f9be1e61939dd022d85b7ec42d6add621e550995f
-make=/home/ccx/versions/gnu-make.e1e853dc6defb07b15f88e3e3d66b395de244b7fc5f47ef92b624ff73540cc1d
+mcm=/home/ccx/versions/musl-cross-make.a92bd0a73a662b4ebb61cd88fa1f6d034a327326d3a9d0f0040cc87ed97e5cb3
+make=/home/ccx/versions/gnu-make.b7cde92a7edabca3a8e00739fed6aaa5533d94f74d290dff8ce739ffef9171b5
 
 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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+certdata2pem.6f6f4ce92b2bdb336d09a5d825519156d94ad6eaf9acf5139a0fad63d9b71bdb
+#+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
 #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:.
 
 
diff --git a/variants/ccx-x86_64/ccx-utils b/variants/ccx-x86_64/ccx-utils
@@ -1,44 +1,44 @@
 #!/usr/bin/env pthbs-build
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+skalibs.1022f215409d53b0b7c03be5d57100a166d24812c7d3b8a7bcddb3cdb22f1d59
-#+s6.fa8d0d8033aaedab1c63c5a20c2870ed08373230c95d8351f9c9019b933e0e57
+#+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
 #@git:461a9ec198c1e2b9c39a34e21786747dbb8671b4:ccx-utils
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
diff --git a/variants/ccx-x86_64/certdata2pem b/variants/ccx-x86_64/certdata2pem
@@ -1,41 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
+#+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
 #@sha256:064f7d41106cd9efa08b9e68cf049f44e3be55666bd2ab96d02c508293b8dce7:certdata2pem.c
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+zsh.50b0fe630f2d5ddbe51a36ba7884be91a5c15ab95e13f8263dd2d7d66250f8f5
-#+pthbs-banginstall.2dd016dd341fe9efe7cfe92c022f13264e0946c144a1f30da9b2d1190662f058
+#+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
 #@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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-dosfstools.c26636980512dcf58bcbfe55e8c4ce739c93fb4359405f76dff21f8343596c50
-#+busybox-e2fsprogs.1e5660091e6520a3988dc8a510c3f99d2aaf6e9b428d61445343f8a39ff873b1
-#+busybox-iproute2.c654d96f2773b83751b1f291461412afa2ca1968f35bd0b5f5cc8ea1bf498753
-#+busybox-iputils.3888ba1bcd114fa12d10624893f29c22316be12ab58374814b52f632693d7ed3
-#+busybox-net-misc.b5e1023e2a4d185360e2a5b861a0bdcd944f0539eb999e22bdab820711a28e22
-#+busybox-net-tools.d937ca99cea064fd48a06d5cdc7d87a60e0de88d2db05bba29ad70dd71571c17
-#+busybox-traceroute.c9d11a038ab0855899a1df4407193aef8ceb617af9f23b7881dacfc7425368fc
-#+busybox-wget.0e0213a7d9f34ef18486a7645b6e767b12ef2f47d36d033a79743b2c1c8f07bf
-#+busybox-chpst.0392e263516a389be6f7d8a6e3c359483ffc93d9705f219b6d8210fb78499fe2
-#+busybox-console.8ce9edbc43963182f847d202220f7cf8f7e590705d084bd00b7318caa5b1b299
-#+busybox-getty.f42c431df165b7cce5537d94f9340e04a957c07152e3a8799640ab8340f3274c
+#+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.7dc3b7b60595c62f8dd970f6c05fe3d312607cb7cc5b69f58ae410d9ae4ffd33
-#+busybox-mtd-utils.b8334cadc3c32d88259754442595397857076b04f2b7ff9dfa6423059d638251
-#+busybox-shadow.f34c11ffe40dc4aeb018ed0860115135203b47dc8662079384459771505402d0
-#+busybox-su.e6e9417b08d76a7b6bd4cafb582ea79fc21d67dd7202c8f36da6ca6c10ac6cfd
-#+busybox-util-linux-priv.fe8407a7762ebc0804b125f31244fc42f9dc89197bae51ee4fbc04406bdfb7df
-#+busybox-logging.623712e57c085735d389b2f908e1ea2baadff835be7b47ca9ccce7d22fec6dff
-#+busybox-cron.53101fe61ef2d2d23e9a7be7deb587f2f898bf6a4d55f701612a9d3522a8f92a
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+busybox-login.26f6397558d127103a19551fb6a18530331d1bd142f385d93333da8e2e9b845b
-#+execline.ec73c6787ef0d881956fb837789e6a473c89cdb27b4f9fbd5a37898a9f3afe39
-#+s6.fa8d0d8033aaedab1c63c5a20c2870ed08373230c95d8351f9c9019b933e0e57
-#+ccx-utils.9a09ff0654f51bd2e9d09d8aabdc1130fb28177fb573bf864762c5b0ecfea3be
-#+applyuidgid-caps.d1e9a66bfd2e493b768aec9421cc329d04adb4fb5acf49d0068e58330127cce4
-#+easyseccomp.5d93ae6aede4dfc2099e2ea4359a6de893d68be17dcd2eb4acc3cc15e5b08aa1
-#+mlog.74cc18d92e541a5dc9aeb019d6eac5abea67ed268df73a4a5887c70d1f49ec24
-#+abduco.ae08700175ec4ecbb978f4eeda4c350bbe417173178a87f30229aae868c5d438
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
+#+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
 #@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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+zsh.50b0fe630f2d5ddbe51a36ba7884be91a5c15ab95e13f8263dd2d7d66250f8f5
-#+pthbs-banginstall.2dd016dd341fe9efe7cfe92c022f13264e0946c144a1f30da9b2d1190662f058
-#+execline.ec73c6787ef0d881956fb837789e6a473c89cdb27b4f9fbd5a37898a9f3afe39
-#+alpine-keys.393d6ddbc8cb246a72bf70ab777396c5f3e7ea73abe017c9f5ba1453cd38bc28
-#+apk-tools.88f1ee907868f3ad55cb7a6f1dcedebc58feb53171ea0b2e816f28fa2253b771
-#+xbps.fafd552737d53ce93b27c20629629cb3979f44693861f4023bf0a13bdc8f3a61
-#+container-bin-image.0af218729e6d2319c98b3044245e97c658e74eacab876848bf07ba9da2045461
+#+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
 #@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.88f1ee907868f3ad55cb7a6f1dcedebc58feb53171ea0b2e816f28fa2253b771/command/apk.static' "${dest}/deps/command/"
-ln -sf '/home/ccx/versions/xbps.fafd552737d53ce93b27c20629629cb3979f44693861f4023bf0a13bdc8f3a61/command/xbps-install.static' "${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/"
 
-for f in '/home/ccx/versions/alpine-keys.393d6ddbc8cb246a72bf70ab777396c5f3e7ea73abe017c9f5ba1453cd38bc28'/keys/alpine/*/*; do
+for f in '/home/ccx/versions/alpine-keys.9eaaca66e8ce40e80163bc44c50e906938a8cd6f640554a57a6c2c5e95e08d70'/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.393d6ddbc8cb246a72bf70ab777396c5f3e7ea7
 done
  
 mkdir -p "${dest}/deps/keys/void"
-for f in '/home/ccx/versions/xbps.fafd552737d53ce93b27c20629629cb3979f44693861f4023bf0a13bdc8f3a61'/keys/void/*; do
+for f in '/home/ccx/versions/xbps.aa21c50c81629365c03a2529a67af5b03d3dad9eb4a511575009c5f0447a6722'/keys/void/*; do
 	ln -sf "$f" "${dest}/deps/keys/void/"
 done
 
-test -d '/home/ccx/versions/container-bin-image.0af218729e6d2319c98b3044245e97c658e74eacab876848bf07ba9da2045461/container-bin-image'
-test -f '/home/ccx/versions/container-bin-image.0af218729e6d2319c98b3044245e97c658e74eacab876848bf07ba9da2045461/container-bin-image/if'
-ln -sf '/home/ccx/versions/container-bin-image.0af218729e6d2319c98b3044245e97c658e74eacab876848bf07ba9da2045461/container-bin-image' "${dest}/deps/"
+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/"
  
 
 
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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-dosfstools.c26636980512dcf58bcbfe55e8c4ce739c93fb4359405f76dff21f8343596c50
-#+busybox-e2fsprogs.1e5660091e6520a3988dc8a510c3f99d2aaf6e9b428d61445343f8a39ff873b1
-#+busybox-iproute2.c654d96f2773b83751b1f291461412afa2ca1968f35bd0b5f5cc8ea1bf498753
-#+busybox-iputils.3888ba1bcd114fa12d10624893f29c22316be12ab58374814b52f632693d7ed3
-#+busybox-net-misc.b5e1023e2a4d185360e2a5b861a0bdcd944f0539eb999e22bdab820711a28e22
-#+busybox-net-tools.d937ca99cea064fd48a06d5cdc7d87a60e0de88d2db05bba29ad70dd71571c17
-#+busybox-traceroute.c9d11a038ab0855899a1df4407193aef8ceb617af9f23b7881dacfc7425368fc
-#+busybox-wget.0e0213a7d9f34ef18486a7645b6e767b12ef2f47d36d033a79743b2c1c8f07bf
-#+busybox-chpst.0392e263516a389be6f7d8a6e3c359483ffc93d9705f219b6d8210fb78499fe2
-#+busybox-console.8ce9edbc43963182f847d202220f7cf8f7e590705d084bd00b7318caa5b1b299
-#+busybox-getty.f42c431df165b7cce5537d94f9340e04a957c07152e3a8799640ab8340f3274c
+#+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.7dc3b7b60595c62f8dd970f6c05fe3d312607cb7cc5b69f58ae410d9ae4ffd33
-#+busybox-mtd-utils.b8334cadc3c32d88259754442595397857076b04f2b7ff9dfa6423059d638251
-#+busybox-shadow.f34c11ffe40dc4aeb018ed0860115135203b47dc8662079384459771505402d0
-#+busybox-su.e6e9417b08d76a7b6bd4cafb582ea79fc21d67dd7202c8f36da6ca6c10ac6cfd
-#+busybox-util-linux-priv.fe8407a7762ebc0804b125f31244fc42f9dc89197bae51ee4fbc04406bdfb7df
-#+busybox-logging.623712e57c085735d389b2f908e1ea2baadff835be7b47ca9ccce7d22fec6dff
-#+busybox-cron.53101fe61ef2d2d23e9a7be7deb587f2f898bf6a4d55f701612a9d3522a8f92a
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+execline.ec73c6787ef0d881956fb837789e6a473c89cdb27b4f9fbd5a37898a9f3afe39
-#+s6.fa8d0d8033aaedab1c63c5a20c2870ed08373230c95d8351f9c9019b933e0e57
-#+s6-portable-utils.c0804808faaf2deaf78a0af7e2740a4e842abb758ff2f09695e2c271d47945eb
-#+s6-linux-utils.f7f8f2506c0f9f229cedbafe7bba352a730c1ad6f627b98522a624a868028b09
-#+zsh.50b0fe630f2d5ddbe51a36ba7884be91a5c15ab95e13f8263dd2d7d66250f8f5
-#+confz.5e2b0dbf2f649f321e2827578800fb9d2f22ef3042c32aab5a6ad972b8b7cac9
-#+containers.9e71321c183bde58cf483e2c9a94d4495cfa4ea5eecee4daeaf80ec6bd41497a
-#+xbps.fafd552737d53ce93b27c20629629cb3979f44693861f4023bf0a13bdc8f3a61
-#+zstd.9b15b3ddc4b37f15f098e5a280bcbb0f18a877d51674c2eedae7697666d1b7da
-#+apk-tools.88f1ee907868f3ad55cb7a6f1dcedebc58feb53171ea0b2e816f28fa2253b771
-#+alpine-keys.393d6ddbc8cb246a72bf70ab777396c5f3e7ea73abe017c9f5ba1453cd38bc28
-#+getent.9030e22ab2424a35586ef14c53494d9016573f2cc8854b8528940aea76035fc5
-#+fileset.fab019da70446bb5342023abc0102a860fac4578aff92a9529ec46a8289da9c3
-#+ccx-utils.9a09ff0654f51bd2e9d09d8aabdc1130fb28177fb573bf864762c5b0ecfea3be
-#+easyseccomp.5d93ae6aede4dfc2099e2ea4359a6de893d68be17dcd2eb4acc3cc15e5b08aa1
-#+findutils.9029d157542e2a7b3200caf0210ee41c68c52e657ca7d009ccd064aabb1f3721
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da-
\ No newline at end of file
+#+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
diff --git a/variants/ccx-x86_64/curl b/variants/ccx-x86_64/curl
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+m4.2f11520ee4dee19e3911857ae1fe0a484cc48676b0efa28328cdc29e73be5b6b
-#+libressl.2a203c612465b8b8cb0aaa2ea8f17bda8848442cadc3e881ccb51d17617ae2f5
+#+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
 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:.
 
 
@@ -61,8 +61,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-dosfstools.c26636980512dcf58bcbfe55e8c4ce739c93fb4359405f76dff21f8343596c50
-#+busybox-e2fsprogs.1e5660091e6520a3988dc8a510c3f99d2aaf6e9b428d61445343f8a39ff873b1
-#+busybox-iproute2.c654d96f2773b83751b1f291461412afa2ca1968f35bd0b5f5cc8ea1bf498753
-#+busybox-iputils.3888ba1bcd114fa12d10624893f29c22316be12ab58374814b52f632693d7ed3
-#+busybox-net-misc.b5e1023e2a4d185360e2a5b861a0bdcd944f0539eb999e22bdab820711a28e22
-#+busybox-net-tools.d937ca99cea064fd48a06d5cdc7d87a60e0de88d2db05bba29ad70dd71571c17
-#+busybox-traceroute.c9d11a038ab0855899a1df4407193aef8ceb617af9f23b7881dacfc7425368fc
-#+busybox-wget.0e0213a7d9f34ef18486a7645b6e767b12ef2f47d36d033a79743b2c1c8f07bf
-#+busybox-chpst.0392e263516a389be6f7d8a6e3c359483ffc93d9705f219b6d8210fb78499fe2
-#+busybox-console.8ce9edbc43963182f847d202220f7cf8f7e590705d084bd00b7318caa5b1b299
-#+busybox-getty.f42c431df165b7cce5537d94f9340e04a957c07152e3a8799640ab8340f3274c
+#+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.7dc3b7b60595c62f8dd970f6c05fe3d312607cb7cc5b69f58ae410d9ae4ffd33
-#+busybox-mtd-utils.b8334cadc3c32d88259754442595397857076b04f2b7ff9dfa6423059d638251
-#+busybox-shadow.f34c11ffe40dc4aeb018ed0860115135203b47dc8662079384459771505402d0
-#+busybox-su.e6e9417b08d76a7b6bd4cafb582ea79fc21d67dd7202c8f36da6ca6c10ac6cfd
-#+busybox-util-linux-priv.fe8407a7762ebc0804b125f31244fc42f9dc89197bae51ee4fbc04406bdfb7df
-#+busybox-logging.623712e57c085735d389b2f908e1ea2baadff835be7b47ca9ccce7d22fec6dff
-#+busybox-cron.53101fe61ef2d2d23e9a7be7deb587f2f898bf6a4d55f701612a9d3522a8f92a
-#+attr.4df8a66007c9b54fff9f367ced36a003d88b810fbaf3a99634e11be9386e297e
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+diffutils.24eca0a696d51c4fe18eeff95248fefdadbbb726849aab113112df71bb704ca7
-#+patch.95c9bec783a4dffd073983372fb9952b5f686dc3576bdeabd175ea44ec199660
-#+flex.bb8a2badc1b9c5e4f7ed4671e5df3a64c77240c22ca349ed94053546a095141d
-#+bison.cd965483a9f386e1c0d8d48be8b103d96c04f40e28dc396f450720f594118079
-#+rsync.482d99a310fe4ce0290fef1e9a8b12cd6002e44548e32511babefb0997b250f7
-#+execline.ec73c6787ef0d881956fb837789e6a473c89cdb27b4f9fbd5a37898a9f3afe39
-#+s6.fa8d0d8033aaedab1c63c5a20c2870ed08373230c95d8351f9c9019b933e0e57
-#+s6-rc.c6aa1d311a7aa43c5e48f9d992ee093bba358706db7a26d63aeb89b89829bdd4
-#+s6-portable-utils.c0804808faaf2deaf78a0af7e2740a4e842abb758ff2f09695e2c271d47945eb
-#+s6-linux-utils.f7f8f2506c0f9f229cedbafe7bba352a730c1ad6f627b98522a624a868028b09
-#+s6-linux-init.fb58c6d9009a13adc44bb780d8532f79e1d6473a44838f5fe677cf1cc606f6ba
-#+mdevd.d21d8a9f0227638435e0b759438215dea57882b236a86e8fb60ed69e006bd8e5
-#+s6-dns.616cc00904b2702228935d41a1857c8a7ab39ddd0434c2937a879a3277a39332
-#+libressl.2a203c612465b8b8cb0aaa2ea8f17bda8848442cadc3e881ccb51d17617ae2f5
-#+s6-networking.7e321390b4e7b529582758b66ea39f81a64c368be6a7247bb86a8ede6b06bd64
-#+zsh.50b0fe630f2d5ddbe51a36ba7884be91a5c15ab95e13f8263dd2d7d66250f8f5
-#+pthbs-banginstall.2dd016dd341fe9efe7cfe92c022f13264e0946c144a1f30da9b2d1190662f058
-#+aat.738f2999ee5a47a40c028bb2c2eec6c52d112763d95cc31b115a06a1e5962138
-#+confz.5e2b0dbf2f649f321e2827578800fb9d2f22ef3042c32aab5a6ad972b8b7cac9
-#+containers.9e71321c183bde58cf483e2c9a94d4495cfa4ea5eecee4daeaf80ec6bd41497a
-#+fileset.fab019da70446bb5342023abc0102a860fac4578aff92a9529ec46a8289da9c3
-#+logincaps.bd8ccf7ef490d0ece4edddc7667bf7e7c50d100f708b67880f3bb78b196f570e
-#+snaprep.9d17a18a0b12128a1ab242bb2556cffc0a00d421f4a75463f88a817e855ac41c
-#+curl.9d4cfc6e80aceca8f089e2a656236b0e7af987bc677769cee48a165feabbd43b
-#+git.e6177ca34066c2e25a1c62b9b5dcfcfd01847ec39130182fd5f3a67096093ed8
-#+xbps.fafd552737d53ce93b27c20629629cb3979f44693861f4023bf0a13bdc8f3a61
-#+apk-tools.88f1ee907868f3ad55cb7a6f1dcedebc58feb53171ea0b2e816f28fa2253b771
-#+getent.9030e22ab2424a35586ef14c53494d9016573f2cc8854b8528940aea76035fc5
-#+getconf.a26e723c0b53e150997cd5f0147e6660ab2d8847a504ea94865624b20e1ff501
-#+iconv.5bf8733465da0a683d1cc711a577214e1872ee1e47e780558a0af827a60b44b5
-#+libcap.d1371bcd4132215289259226f215b7e950a936a9d208408fb28f497ffd918312
-#+applyuidgid-caps.d1e9a66bfd2e493b768aec9421cc329d04adb4fb5acf49d0068e58330127cce4
-#+ccx-utils.9a09ff0654f51bd2e9d09d8aabdc1130fb28177fb573bf864762c5b0ecfea3be
-#+user-env.35c87df7d94082c553246c2100678cbda310c690ccdb739f98f7046b72df415a
-#+strace.8e9294ac9a28e9f42ee8ad519794b830bfd61eb020a5f7d09ae9dce6aa5f96a3
-#+mlog.74cc18d92e541a5dc9aeb019d6eac5abea67ed268df73a4a5887c70d1f49ec24
-#+findutils.9029d157542e2a7b3200caf0210ee41c68c52e657ca7d009ccd064aabb1f3721
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+nvi.14d32964bb3e136507a7375f493728d2eb5356dca4a3c473c46fa7af540c0f49
-#+squashfs-tools.37b37ac5e4af3f6a3b097b50c443c756e723055f11d313febb346a191dee1531
-#+mandoc.337d52f28d2da9cb636d4917ee45cd9119c517b1c2034e7532554747fb3e1e96
-#+tinyssh.b476e3e4dd069844730f101e3030171c2a7fb0d5d80498ae45074f8d47410663
-#+system-config.56ecc319e5e26cb7e5f4170fb0078dc114b5ecfccb2830bb2396f7c6fd7c0bdf
-#+system-config-rc.6e6f636bbf0c11f400680abee4e5534431aba7681c42824ebf8d023702546b93
-#+system-config-scripts.2ae7f78670c709d581ce12374de1b67991540883c2de7d14ed1a714c9f6e4bfa
-#+system-config-init.cc2eb730933ae13e50203be508aca72a4d7da7992b5bb683c0f504d3b265ca59
-#+system-config-zsh.ef04c7dd3e6cd1e7d1348b0e27c24f5a80f66894ca3f02462a6b70d50f991d02
-#+busybox.e493d1e3b5d62e9240972cab3804d5037b2f97694f40194ac573dc73a1253093-
\ No newline at end of file
+#+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
diff --git a/variants/ccx-x86_64/diffutils b/variants/ccx-x86_64/diffutils
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+m4.2f11520ee4dee19e3911857ae1fe0a484cc48676b0efa28328cdc29e73be5b6b
+#+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
 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:.
 
 
@@ -60,8 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+ocaml.820389565cec86ddb056960d295dc67d12983873bae264d15d9d85e0f0ea49f9
+#+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
 #@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.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/home/ccx/versions/musl.d828e4f6cb803b5cd778bf063a4ea6455e0eec6251844c9d88f69a3fab854167/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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+m4.2f11520ee4dee19e3911857ae1fe0a484cc48676b0efa28328cdc29e73be5b6b
-#+patch.95c9bec783a4dffd073983372fb9952b5f686dc3576bdeabd175ea44ec199660
-#+flex.bb8a2badc1b9c5e4f7ed4671e5df3a64c77240c22ca349ed94053546a095141d
-#+bison.cd965483a9f386e1c0d8d48be8b103d96c04f40e28dc396f450720f594118079
-#+libseccomp.4bb48b38f6fda82e2c96c014a5834a5a40fb866f908b3d96e0b092f8c76d0a38
-#+error-standalone.0ed9277fe6e3bbf378a39e5e9ce9474ccbd58b9263f710b45280ff7cf07b2005
-#+argp-standalone.70afb30ac12b7d0f351a4d45208c9f77cbe6e0b4a8d8b208e5f23ca54eb3a4b6
+#+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
 #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp
 #@sha256:eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10:easyseccomp_fix_includes.patch
 #@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
@@ -68,8 +68,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
+#+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
 #@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+skalibs.1022f215409d53b0b7c03be5d57100a166d24812c7d3b8a7bcddb3cdb22f1d59
+#+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
 #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline
 
 
@@ -46,7 +46,7 @@ cd 'execline'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.1022f215409d53b0b7c03be5d57100a166d24812c7d3b8a7bcddb3cdb22f1d59/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.7f2610571321bf6ff32187e4720b1f4d7bdeab2163da455e07e75549b216fbe8/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.d59becebc257140acc79692fc0c93a44f74666c5ab003b71f4f7f21c21011eae
-#+gnu-make.69bac45b9788ae51b55d84abdb050a1863403e3adb0ddd608036227a5202415e
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+nawk.e751b8be76a2fb59a2fe374e1f55c7da47b14ef1154eb8614d12107e6d68e88d
-#+skalibs.6fc6ef7789fd250fa44993a2c24dff3aeda14cf8886b0d6644d95a67b1579de9
+#+musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
+#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
+#+skalibs.d1ff8cdcea9d046498fa6d934eac84fb74629f477532b3480ad1b38b794db050
 #@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.6fc6ef7789fd250fa44993a2c24dff3aeda14cf8886b0d6644d95a67b1579de9/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.d1ff8cdcea9d046498fa6d934eac84fb74629f477532b3480ad1b38b794db050/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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+zsh.50b0fe630f2d5ddbe51a36ba7884be91a5c15ab95e13f8263dd2d7d66250f8f5
-#+pthbs-banginstall.2dd016dd341fe9efe7cfe92c022f13264e0946c144a1f30da9b2d1190662f058
+#+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
 #@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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+m4.2f11520ee4dee19e3911857ae1fe0a484cc48676b0efa28328cdc29e73be5b6b
+#+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
 #@untar:-J:sha256:1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5:.
 
 
@@ -60,8 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.e751b8be76a2fb59a2fe374e1f55c7da47b14ef1154eb8614d12107e6d68e88d
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+m4.2f11520ee4dee19e3911857ae1fe0a484cc48676b0efa28328cdc29e73be5b6b
+#+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
 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
 
 
@@ -60,8 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.d59becebc257140acc79692fc0c93a44f74666c5ab003b71f4f7f21c21011eae
-#+gnu-make.69bac45b9788ae51b55d84abdb050a1863403e3adb0ddd608036227a5202415e
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+nawk.e751b8be76a2fb59a2fe374e1f55c7da47b14ef1154eb8614d12107e6d68e88d
-#+musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gmp.25dc1d87b24df96e3f73559df95b0c04bc5167abdebc9e5f2fb566a0e8589f18
-#+mpc.4dd4dc155b8afc5413bac59ae66a5ce1938ed40c4a5a1738a8fa8c3dc639a371
-#+mpfr.fd1d0c61b05f9d605080b247c2b675d9da0128292a0ae9c51e70e73f94be14ab
+#+musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
+#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
+#+musl.d828e4f6cb803b5cd778bf063a4ea6455e0eec6251844c9d88f69a3fab854167
+#+gmp.609022c8a461c7025772fffc1cf09f15317ea036990463845acbda54d7584a62
+#+mpc.d0e807c81701ac6eb90079784372dac8a73b5a939ecb0769155b1dadea29051e
+#+mpfr.de7da86a91124d5bbb0029521f3c04cce0308be77e0fde4bd81c4f17bfa48117
 #@sha256:62eb68290502d54b16457509aa0c3995a84116408e6b593d676b9f4c03b6b160:merged.patch
 #@untar:-J:sha256:e0dc77297625631ac8e50fa92fffefe899a4eb702592da5c32ef04e2293aca3a:.
 
@@ -15,8 +15,8 @@
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
@@ -47,10 +47,10 @@ patch -p1 <../merged.patch
 export TZ=UTC
 export SOURCE_DATE_EPOCH=1748000928
 
-mcm=/home/ccx/versions/musl-cross-make.d59becebc257140acc79692fc0c93a44f74666c5ab003b71f4f7f21c21011eae
+mcm=/home/ccx/versions/musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
 mcm_bin=$mcm/bin/x86_64-linux-musl
-binutils_cmd=/home/ccx/versions/binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9
-musl=/home/ccx/versions/musl.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
+binutils_cmd=/home/ccx/versions/binutils.65dbf67be4f2300d50f411d71f488260cbcd1f9ee8e0120c6d3f2ce189c81edb
+musl=/home/ccx/versions/musl.d828e4f6cb803b5cd778bf063a4ea6455e0eec6251844c9d88f69a3fab854167
 build_env_static
 
 sysroot="${pthbs_workdir}/sysroot"
diff --git a/variants/ccx-x86_64/getconf b/variants/ccx-x86_64/getconf
@@ -1,41 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
+#+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
 #@sha256:d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c:getconf.c
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
diff --git a/variants/ccx-x86_64/getent b/variants/ccx-x86_64/getent
@@ -1,41 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
+#+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
 #@sha256:002c1a216f6bed0f816ab1cfebde94a0b127193ef410c36b2190599983e015b8:getent.c
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+m4.2f11520ee4dee19e3911857ae1fe0a484cc48676b0efa28328cdc29e73be5b6b
-#+libressl.2a203c612465b8b8cb0aaa2ea8f17bda8848442cadc3e881ccb51d17617ae2f5
-#+curl.9d4cfc6e80aceca8f089e2a656236b0e7af987bc677769cee48a165feabbd43b
+#+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
 #@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.d59becebc257140acc79692fc0c93a44f74666c5ab003b71f4f7f21c21011eae
-#+gnu-make.69bac45b9788ae51b55d84abdb050a1863403e3adb0ddd608036227a5202415e
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+m4.8e765e9de0450da373ecc8384d740a82d02fcef05c8a160d79791211d26cbe68
-#+nawk.e751b8be76a2fb59a2fe374e1f55c7da47b14ef1154eb8614d12107e6d68e88d
+#+musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
+#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+m4.d7c9e4dd9474e659d6c16f640cd2d57ac62b252b2a4bb12259dcc48d2412e402
+#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
 #@untar:-J:sha256:a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898:.
 
 
@@ -33,8 +33,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.69bac45b9788ae51b55d84abdb050a1863403e3adb0ddd608036227a5202415e
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+nawk.e751b8be76a2fb59a2fe374e1f55c7da47b14ef1154eb8614d12107e6d68e88d
+#+musl-cross-make.02ed1b5e53bd8257aca756ec21f873bcda3f03b562a3fc46abe4c94633c3da72
+#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -32,8 +32,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.d59becebc257140acc79692fc0c93a44f74666c5ab003b71f4f7f21c21011eae
-#+nawk.e751b8be76a2fb59a2fe374e1f55c7da47b14ef1154eb8614d12107e6d68e88d
+#+musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
+#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -37,7 +37,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'make-4.4.1'
 
 
-mcm=/home/ccx/versions/musl-cross-make.d59becebc257140acc79692fc0c93a44f74666c5ab003b71f4f7f21c21011eae
+mcm=/home/ccx/versions/musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
 
 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.d6750f5a1e339e3d060bfc90f5782fe6092b8efd8f888c77677981b49e640c5d
-#+gnu-make.e1e853dc6defb07b15f88e3e3d66b395de244b7fc5f47ef92b624ff73540cc1d
-#+busybox.7c806f251682aef762107a570a344b486e48595991e74acd422ea1d030d92afb
-#+nawk.e751b8be76a2fb59a2fe374e1f55c7da47b14ef1154eb8614d12107e6d68e88d
+#+musl-cross-make.e6726ea29e8b7fe316c8a30b8a500f73aab8cf8c862a1bcd575d50b3265dd793
+#+gnu-make.b7cde92a7edabca3a8e00739fed6aaa5533d94f74d290dff8ce739ffef9171b5
+#+busybox.3cee246e09c72f86b6e714fb4b4557dc2f9ee571084f716bbcb612fa8ebd3deb
+#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
 #@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.2a6aa41af147a85dfff7a65f9be1e61939dd022d85b7ec42d6add621e550995f
+#+musl-cross-make.a92bd0a73a662b4ebb61cd88fa1f6d034a327326d3a9d0f0040cc87ed97e5cb3
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -30,7 +30,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'make-4.4.1'
 
 
-mcm=/home/ccx/versions/musl-cross-make.2a6aa41af147a85dfff7a65f9be1e61939dd022d85b7ec42d6add621e550995f
+mcm=/home/ccx/versions/musl-cross-make.a92bd0a73a662b4ebb61cd88fa1f6d034a327326d3a9d0f0040cc87ed97e5cb3
 
 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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+m4.2f11520ee4dee19e3911857ae1fe0a484cc48676b0efa28328cdc29e73be5b6b
+#+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
 #@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:.
 
 
@@ -60,8 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
diff --git a/variants/ccx-x86_64/iconv b/variants/ccx-x86_64/iconv
@@ -1,41 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
+#+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
 #@sha256:f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7:iconv.c
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+m4.2f11520ee4dee19e3911857ae1fe0a484cc48676b0efa28328cdc29e73be5b6b
+#+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
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 
@@ -61,8 +61,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.72cc6042b882082c7cbfed17c89285926cd297f02d997e25901bcfc3b318bb21
-#+busybox.e493d1e3b5d62e9240972cab3804d5037b2f97694f40194ac573dc73a1253093-
\ No newline at end of file
+#+linux-qemu-guest.2146f6782e67214c7ad7ee82b2c006ba2f2cd852ed4df91c86decd5c41d0e7ae
+#+busybox.c6b6443b5623b38e0a8ecc5840aabdf6abfb2163181801f84f344072c0386312+
\ 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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+m4.2f11520ee4dee19e3911857ae1fe0a484cc48676b0efa28328cdc29e73be5b6b
+#+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
 #@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:.
 
 
@@ -60,8 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+m4.2f11520ee4dee19e3911857ae1fe0a484cc48676b0efa28328cdc29e73be5b6b
-#+libmd.15424d0bc8868fbad90ca15aafdea11ed72fa1d9780ad37615131cb910a2f429
+#+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
 #@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:.
 
 
@@ -61,8 +61,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
diff --git a/variants/ccx-x86_64/libcap b/variants/ccx-x86_64/libcap
@@ -1,44 +1,44 @@
 #!/usr/bin/env pthbs-build
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+pkgconf-pkg-config.36a9dc4c92d6d644f3a0e9b3399397e26b8e5c86c16ffe2c23dc7397cebd5f6d
+#+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
 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.d59becebc257140acc79692fc0c93a44f74666c5ab003b71f4f7f21c21011eae
-#+gnu-make.69bac45b9788ae51b55d84abdb050a1863403e3adb0ddd608036227a5202415e
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+nawk.e751b8be76a2fb59a2fe374e1f55c7da47b14ef1154eb8614d12107e6d68e88d
+#+musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
+#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
 #@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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+m4.2f11520ee4dee19e3911857ae1fe0a484cc48676b0efa28328cdc29e73be5b6b
-#+flex.bb8a2badc1b9c5e4f7ed4671e5df3a64c77240c22ca349ed94053546a095141d
-#+bison.cd965483a9f386e1c0d8d48be8b103d96c04f40e28dc396f450720f594118079
-#+musl-fts.a58a05da76601265710ed551ed3f262e39854d0707e877c9004d0512c632a5f9
+#+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
 #@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:.
 
 
@@ -63,8 +63,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
diff --git a/variants/ccx-x86_64/libelf b/variants/ccx-x86_64/libelf
@@ -1,44 +1,44 @@
 #!/usr/bin/env pthbs-build
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+zstd.9b15b3ddc4b37f15f098e5a280bcbb0f18a877d51674c2eedae7697666d1b7da
+#+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
 #@git:288355d104ff9930520c0283fe82556c6cc5c16f:libelf
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+m4.2f11520ee4dee19e3911857ae1fe0a484cc48676b0efa28328cdc29e73be5b6b
+#+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
 #@untar:-J:sha256:1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332:.
 
 
@@ -60,8 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+m4.2f11520ee4dee19e3911857ae1fe0a484cc48676b0efa28328cdc29e73be5b6b
-#+ca-certificates-wip-donotuse.48de321487b8a68f6faf0e251c2ef1d64235f651c6a713f6aabc1b273fabe44c
+#+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
 #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c
 #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:.
 
@@ -62,8 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
@@ -101,7 +101,7 @@ make DESTDIR="$pthbs_destdir" install
 
 cd ..
 gcc ./c_rehash.c -o c_rehash --static -static -I"$pthbs_destdir/$prefix/include" -L"$pthbs_destdir/$prefix/library" -lssl -lcrypto
-cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.48de321487b8a68f6faf0e251c2ef1d64235f651c6a713f6aabc1b273fabe44c/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
+cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.c6c159c30313341544d981a4228a261acd3c3daa51af8df182cfd1f9b878e379/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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+m4.2f11520ee4dee19e3911857ae1fe0a484cc48676b0efa28328cdc29e73be5b6b
-#+pkgconf-pkg-config.36a9dc4c92d6d644f3a0e9b3399397e26b8e5c86c16ffe2c23dc7397cebd5f6d
-#+gperf.f1288d96390863a09318221d5e68a4f1613f9887935b50438ba058b4660963e7
+#+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
 #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:.
 
 
@@ -62,8 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+m4.2f11520ee4dee19e3911857ae1fe0a484cc48676b0efa28328cdc29e73be5b6b
+#+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
 #@untar:-z:sha256:ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157:.
 
 
@@ -60,8 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-modutils.83d07889d9b5759b5e277dd9a8503b88d3338f725de4069b528f321c8fa67446
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+findutils.9029d157542e2a7b3200caf0210ee41c68c52e657ca7d009ccd064aabb1f3721
-#+diffutils.24eca0a696d51c4fe18eeff95248fefdadbbb726849aab113112df71bb704ca7
-#+patch.95c9bec783a4dffd073983372fb9952b5f686dc3576bdeabd175ea44ec199660
-#+flex.bb8a2badc1b9c5e4f7ed4671e5df3a64c77240c22ca349ed94053546a095141d
-#+bison.cd965483a9f386e1c0d8d48be8b103d96c04f40e28dc396f450720f594118079
-#+rsync.482d99a310fe4ce0290fef1e9a8b12cd6002e44548e32511babefb0997b250f7
-#+zstd.9b15b3ddc4b37f15f098e5a280bcbb0f18a877d51674c2eedae7697666d1b7da
-#+libelf.9097a425e1e7bc340c05c00426e5b0f2555ad6013e0aaa751499a5115daa0a44
-#+pkgconf-pkg-config.36a9dc4c92d6d644f3a0e9b3399397e26b8e5c86c16ffe2c23dc7397cebd5f6d
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
+#+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
 #@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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-modutils.83d07889d9b5759b5e277dd9a8503b88d3338f725de4069b528f321c8fa67446
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+findutils.9029d157542e2a7b3200caf0210ee41c68c52e657ca7d009ccd064aabb1f3721
-#+diffutils.24eca0a696d51c4fe18eeff95248fefdadbbb726849aab113112df71bb704ca7
-#+patch.95c9bec783a4dffd073983372fb9952b5f686dc3576bdeabd175ea44ec199660
-#+flex.bb8a2badc1b9c5e4f7ed4671e5df3a64c77240c22ca349ed94053546a095141d
-#+bison.cd965483a9f386e1c0d8d48be8b103d96c04f40e28dc396f450720f594118079
-#+rsync.482d99a310fe4ce0290fef1e9a8b12cd6002e44548e32511babefb0997b250f7
-#+zstd.9b15b3ddc4b37f15f098e5a280bcbb0f18a877d51674c2eedae7697666d1b7da
-#+libelf.9097a425e1e7bc340c05c00426e5b0f2555ad6013e0aaa751499a5115daa0a44
-#+pkgconf-pkg-config.36a9dc4c92d6d644f3a0e9b3399397e26b8e5c86c16ffe2c23dc7397cebd5f6d
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
+#+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
 #@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.d59becebc257140acc79692fc0c93a44f74666c5ab003b71f4f7f21c21011eae
-#+gnu-make.69bac45b9788ae51b55d84abdb050a1863403e3adb0ddd608036227a5202415e
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+nawk.e751b8be76a2fb59a2fe374e1f55c7da47b14ef1154eb8614d12107e6d68e88d
-#+skalibs.6fc6ef7789fd250fa44993a2c24dff3aeda14cf8886b0d6644d95a67b1579de9
-#+execline.97dcd338d1cd526ffe28a8cbb05849056cb77d98f2ba70113cf1197c070caf98
-#+libcap.b93516bd8ead46e80368c35df18e3f88afab6d5a4a82a6f766aa5c6bcb4ec025
+#+musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
+#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
+#+skalibs.d1ff8cdcea9d046498fa6d934eac84fb74629f477532b3480ad1b38b794db050
+#+execline.dcc4d1547d9927e4a41bc28ae51ac1667791a3cb51a3d4e210e7bc0e4ec9328f
+#+libcap.44be1577840dbfe3c66cae428fb1a5779605df9865e11648facb9b18596ac686
 #@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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+zsh.50b0fe630f2d5ddbe51a36ba7884be91a5c15ab95e13f8263dd2d7d66250f8f5
-#+pthbs-banginstall.2dd016dd341fe9efe7cfe92c022f13264e0946c144a1f30da9b2d1190662f058
-#+execline.ec73c6787ef0d881956fb837789e6a473c89cdb27b4f9fbd5a37898a9f3afe39
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+ccx-utils.9a09ff0654f51bd2e9d09d8aabdc1130fb28177fb573bf864762c5b0ecfea3be
+#+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
 #@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.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+nawk.e751b8be76a2fb59a2fe374e1f55c7da47b14ef1154eb8614d12107e6d68e88d
+#+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
 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
 
 
@@ -59,8 +59,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.d59becebc257140acc79692fc0c93a44f74666c5ab003b71f4f7f21c21011eae
-#+gnu-make.69bac45b9788ae51b55d84abdb050a1863403e3adb0ddd608036227a5202415e
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+nawk.e751b8be76a2fb59a2fe374e1f55c7da47b14ef1154eb8614d12107e6d68e88d
+#+musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
+#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
 
 
@@ -32,8 +32,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
+#+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
 #@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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+zsh.50b0fe630f2d5ddbe51a36ba7884be91a5c15ab95e13f8263dd2d7d66250f8f5
-#+pthbs-banginstall.2dd016dd341fe9efe7cfe92c022f13264e0946c144a1f30da9b2d1190662f058
+#+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
 #@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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+skalibs.1022f215409d53b0b7c03be5d57100a166d24812c7d3b8a7bcddb3cdb22f1d59
-#+execline.ec73c6787ef0d881956fb837789e6a473c89cdb27b4f9fbd5a37898a9f3afe39
+#+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
 #@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd
 
 
@@ -47,7 +47,7 @@ cd 'mdevd'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.1022f215409d53b0b7c03be5d57100a166d24812c7d3b8a7bcddb3cdb22f1d59/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.7f2610571321bf6ff32187e4720b1f4d7bdeab2163da455e07e75549b216fbe8/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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-dosfstools.c26636980512dcf58bcbfe55e8c4ce739c93fb4359405f76dff21f8343596c50
-#+busybox-e2fsprogs.1e5660091e6520a3988dc8a510c3f99d2aaf6e9b428d61445343f8a39ff873b1
-#+busybox-iproute2.c654d96f2773b83751b1f291461412afa2ca1968f35bd0b5f5cc8ea1bf498753
-#+busybox-iputils.3888ba1bcd114fa12d10624893f29c22316be12ab58374814b52f632693d7ed3
-#+busybox-net-misc.b5e1023e2a4d185360e2a5b861a0bdcd944f0539eb999e22bdab820711a28e22
-#+busybox-net-tools.d937ca99cea064fd48a06d5cdc7d87a60e0de88d2db05bba29ad70dd71571c17
-#+busybox-traceroute.c9d11a038ab0855899a1df4407193aef8ceb617af9f23b7881dacfc7425368fc
-#+busybox-wget.0e0213a7d9f34ef18486a7645b6e767b12ef2f47d36d033a79743b2c1c8f07bf
-#+busybox-chpst.0392e263516a389be6f7d8a6e3c359483ffc93d9705f219b6d8210fb78499fe2
-#+busybox-console.8ce9edbc43963182f847d202220f7cf8f7e590705d084bd00b7318caa5b1b299
-#+busybox-getty.f42c431df165b7cce5537d94f9340e04a957c07152e3a8799640ab8340f3274c
+#+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.7dc3b7b60595c62f8dd970f6c05fe3d312607cb7cc5b69f58ae410d9ae4ffd33
-#+busybox-mtd-utils.b8334cadc3c32d88259754442595397857076b04f2b7ff9dfa6423059d638251
-#+busybox-shadow.f34c11ffe40dc4aeb018ed0860115135203b47dc8662079384459771505402d0
-#+busybox-su.e6e9417b08d76a7b6bd4cafb582ea79fc21d67dd7202c8f36da6ca6c10ac6cfd
-#+busybox-util-linux-priv.fe8407a7762ebc0804b125f31244fc42f9dc89197bae51ee4fbc04406bdfb7df
-#+busybox-logging.623712e57c085735d389b2f908e1ea2baadff835be7b47ca9ccce7d22fec6dff
-#+busybox-cron.53101fe61ef2d2d23e9a7be7deb587f2f898bf6a4d55f701612a9d3522a8f92a
-#+execline.ec73c6787ef0d881956fb837789e6a473c89cdb27b4f9fbd5a37898a9f3afe39
-#+s6.fa8d0d8033aaedab1c63c5a20c2870ed08373230c95d8351f9c9019b933e0e57
-#+mdev-scripts.7da42a6102519d4b93fa537f4edae70e63236142fae711269c7e4d068334afcd
-#+mdevd.d21d8a9f0227638435e0b759438215dea57882b236a86e8fb60ed69e006bd8e5
-#+busybox.e493d1e3b5d62e9240972cab3804d5037b2f97694f40194ac573dc73a1253093-
\ No newline at end of file
+#+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
diff --git a/variants/ccx-x86_64/mlog b/variants/ccx-x86_64/mlog
@@ -1,42 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
+#+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
 #@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.d59becebc257140acc79692fc0c93a44f74666c5ab003b71f4f7f21c21011eae
-#+gnu-make.69bac45b9788ae51b55d84abdb050a1863403e3adb0ddd608036227a5202415e
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+m4.8e765e9de0450da373ecc8384d740a82d02fcef05c8a160d79791211d26cbe68
-#+nawk.e751b8be76a2fb59a2fe374e1f55c7da47b14ef1154eb8614d12107e6d68e88d
-#+gmp.25dc1d87b24df96e3f73559df95b0c04bc5167abdebc9e5f2fb566a0e8589f18
-#+mpfr.fd1d0c61b05f9d605080b247c2b675d9da0128292a0ae9c51e70e73f94be14ab
+#+musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
+#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+m4.d7c9e4dd9474e659d6c16f640cd2d57ac62b252b2a4bb12259dcc48d2412e402
+#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
+#+gmp.609022c8a461c7025772fffc1cf09f15317ea036990463845acbda54d7584a62
+#+mpfr.de7da86a91124d5bbb0029521f3c04cce0308be77e0fde4bd81c4f17bfa48117
 #@untar:-z:sha256:ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8:.
 
 
@@ -35,8 +35,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.d59becebc257140acc79692fc0c93a44f74666c5ab003b71f4f7f21c21011eae
-#+gnu-make.69bac45b9788ae51b55d84abdb050a1863403e3adb0ddd608036227a5202415e
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+m4.8e765e9de0450da373ecc8384d740a82d02fcef05c8a160d79791211d26cbe68
-#+nawk.e751b8be76a2fb59a2fe374e1f55c7da47b14ef1154eb8614d12107e6d68e88d
-#+gmp.25dc1d87b24df96e3f73559df95b0c04bc5167abdebc9e5f2fb566a0e8589f18
+#+musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
+#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+m4.d7c9e4dd9474e659d6c16f640cd2d57ac62b252b2a4bb12259dcc48d2412e402
+#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
+#+gmp.609022c8a461c7025772fffc1cf09f15317ea036990463845acbda54d7584a62
 #@untar:-J:sha256:b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01:.
 
 
@@ -34,8 +34,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.d59becebc257140acc79692fc0c93a44f74666c5ab003b71f4f7f21c21011eae
-#+gnu-make.69bac45b9788ae51b55d84abdb050a1863403e3adb0ddd608036227a5202415e
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+nawk.e751b8be76a2fb59a2fe374e1f55c7da47b14ef1154eb8614d12107e6d68e88d
+#+musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
+#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
 #@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.d59becebc257140acc79692fc0c93a44f74666c5ab003b71f4f7f21c21011eae
+mcm=/home/ccx/versions/musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
 
 ./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.d59becebc257140acc79692fc0c93a44f74666c5ab003b71f4f7f21c21011eae
-#+gnu-make.69bac45b9788ae51b55d84abdb050a1863403e3adb0ddd608036227a5202415e
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+nawk.e751b8be76a2fb59a2fe374e1f55c7da47b14ef1154eb8614d12107e6d68e88d
+#+musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
+#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
 #@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: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.e751b8be76a2fb59a2fe374e1f55c7da47b14ef1154eb8614d12107e6d68e88d
+#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
 #@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.2a6aa41af147a85dfff7a65f9be1e61939dd022d85b7ec42d6add621e550995f
-#+gnu-make.e1e853dc6defb07b15f88e3e3d66b395de244b7fc5f47ef92b624ff73540cc1d
-#+busybox.7c806f251682aef762107a570a344b486e48595991e74acd422ea1d030d92afb
-#+nawk.e751b8be76a2fb59a2fe374e1f55c7da47b14ef1154eb8614d12107e6d68e88d
+#+musl-cross-make.a92bd0a73a662b4ebb61cd88fa1f6d034a327326d3a9d0f0040cc87ed97e5cb3
+#+gnu-make.b7cde92a7edabca3a8e00739fed6aaa5533d94f74d290dff8ce739ffef9171b5
+#+busybox.3cee246e09c72f86b6e714fb4b4557dc2f9ee571084f716bbcb612fa8ebd3deb
+#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
 #@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.e751b8be76a2fb59a2fe374e1f55c7da47b14ef1154eb8614d12107e6d68e88d
+#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
 #@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,42 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
+#+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
 #@untar:-z:sha256:49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
diff --git a/variants/ccx-x86_64/nawk b/variants/ccx-x86_64/nawk
@@ -1,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.e751b8be76a2fb59a2fe374e1f55c7da47b14ef1154eb8614d12107e6d68e88d
-#+bison.cd965483a9f386e1c0d8d48be8b103d96c04f40e28dc396f450720f594118079
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
+#+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
 #@untar:-z:sha256:e031b1e1d2b230f276f975bffb923f0ea15f798c839d15a3f26a1a39448e32d7:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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,8 +11,8 @@
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
+#+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
 #@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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+m4.2f11520ee4dee19e3911857ae1fe0a484cc48676b0efa28328cdc29e73be5b6b
-#+netbsd-curses.fa6a5ef3cc156caf8afa419cf413e785383f30fabe50f0afa369af655e250638
+#+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
 #@untar:-z:sha256:755b87aa1e25c24c4c1668de5573d7d9a327b529423ce3ad9ee753bfb2296e33:.
 
 
@@ -61,8 +61,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+ocaml.820389565cec86ddb056960d295dc67d12983873bae264d15d9d85e0f0ea49f9
-#+ocaml-findlib.7a5de3a84edb8c3a4c3135e9d53ad024f557511d54e60f39690d86075d448964
-#+ocamlbuild.70235ec8ceaa735592ddfe1559a140ec140b39db62e3afdaafb5d7ad3e61580c
-#+opam.e5558b28cf5c6630049a1393d1a14011da9abdbe4cc62861d9f502a11eec6ae1
-#+ocaml-topkg.895a21f67e7acfeabbfa96e0154912481ac3da811c55b8dce13c2366a03882d5
+#+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
 #@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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+ocaml.820389565cec86ddb056960d295dc67d12983873bae264d15d9d85e0f0ea49f9
-#+dune.79c6d6a331294cbb6fecb42c39f14377c2eb6869bac481bed75400f1ec893127
-#+ocaml_intrinsics_kernel.59c61073cfe2e5a3531d4cb210441ebeaacdc67fa78fb68c9b4aaea650776867
-#+ocaml-sexplib0.e0542603ebe9f93d008e3bd49b509a192fbd4d962e706607578afbad412d0395
+#+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
 #@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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+ocaml.820389565cec86ddb056960d295dc67d12983873bae264d15d9d85e0f0ea49f9
-#+ocaml-findlib.7a5de3a84edb8c3a4c3135e9d53ad024f557511d54e60f39690d86075d448964
-#+ocamlbuild.70235ec8ceaa735592ddfe1559a140ec140b39db62e3afdaafb5d7ad3e61580c
-#+opam.e5558b28cf5c6630049a1393d1a14011da9abdbe4cc62861d9f502a11eec6ae1
-#+ocaml-topkg.895a21f67e7acfeabbfa96e0154912481ac3da811c55b8dce13c2366a03882d5
-#+ocaml-astring.02c7f70ca86bd0b41001217a54b0e3c832402a4e0297eb0b4035addebb6a673e
-#+ocaml-fpath.f28be046a79f23299ad364edfa4d676f5d8337367b6ae61dcc12e25eee7bebdf
-#+ocaml-rresult.9645d6895a00ab3de01b5e1c0ec139a0da7c1e2fc78e7ad8149486aa995c0730
-#+ocaml-fmt.45317a9d3f0afdc7bdcfb7c0e086f252d6ef072472426caab8507c90b3957e9a
-#+ocaml-logs.0a748e9d7f77325f9c2e6691c0bbaf589220996018bf6bb936a94a95ed0f8097
-#+ocaml-mtime.46c23a318ca3c51d99d4cb48c6b70929a9e366945a8eb1935d36b840864c0ab8
+#+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
 #@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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+ocaml.820389565cec86ddb056960d295dc67d12983873bae264d15d9d85e0f0ea49f9
-#+ocaml-findlib.7a5de3a84edb8c3a4c3135e9d53ad024f557511d54e60f39690d86075d448964
-#+ocamlbuild.70235ec8ceaa735592ddfe1559a140ec140b39db62e3afdaafb5d7ad3e61580c
-#+opam.e5558b28cf5c6630049a1393d1a14011da9abdbe4cc62861d9f502a11eec6ae1
-#+ocaml-topkg.895a21f67e7acfeabbfa96e0154912481ac3da811c55b8dce13c2366a03882d5
+#+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
 #@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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+ocaml.820389565cec86ddb056960d295dc67d12983873bae264d15d9d85e0f0ea49f9
-#+dune.79c6d6a331294cbb6fecb42c39f14377c2eb6869bac481bed75400f1ec893127
+#+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
 #@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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+ocaml.820389565cec86ddb056960d295dc67d12983873bae264d15d9d85e0f0ea49f9
-#+dune.79c6d6a331294cbb6fecb42c39f14377c2eb6869bac481bed75400f1ec893127
-#+ocamlbuild.70235ec8ceaa735592ddfe1559a140ec140b39db62e3afdaafb5d7ad3e61580c
+#+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
 #@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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+m4.2f11520ee4dee19e3911857ae1fe0a484cc48676b0efa28328cdc29e73be5b6b
-#+netbsd-curses.fa6a5ef3cc156caf8afa419cf413e785383f30fabe50f0afa369af655e250638
-#+ocaml.820389565cec86ddb056960d295dc67d12983873bae264d15d9d85e0f0ea49f9
-#+ocamlbuild.70235ec8ceaa735592ddfe1559a140ec140b39db62e3afdaafb5d7ad3e61580c
+#+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
 #@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.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/home/ccx/versions/musl.d828e4f6cb803b5cd778bf063a4ea6455e0eec6251844c9d88f69a3fab854167/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.820389565cec86ddb056960d295dc67d12983873bae264d15d9d85e0f0ea49f9"
+stdlib="$pthbs_destdir/home/ccx/versions/ocaml.819d781b7986f8a3af9d9cb3060b5cf1321208b6740d9d03edd97f0596c89621"
 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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+ocaml.820389565cec86ddb056960d295dc67d12983873bae264d15d9d85e0f0ea49f9
-#+ocaml-findlib.7a5de3a84edb8c3a4c3135e9d53ad024f557511d54e60f39690d86075d448964
-#+ocamlbuild.70235ec8ceaa735592ddfe1559a140ec140b39db62e3afdaafb5d7ad3e61580c
-#+opam.e5558b28cf5c6630049a1393d1a14011da9abdbe4cc62861d9f502a11eec6ae1
-#+ocaml-topkg.895a21f67e7acfeabbfa96e0154912481ac3da811c55b8dce13c2366a03882d5
-#+ocaml-cmdliner.03882d46dbf03d9515adc74d4b821bc200176b609ed987f1a3c0859f2ec203b8
+#+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
 #@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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+ocaml.820389565cec86ddb056960d295dc67d12983873bae264d15d9d85e0f0ea49f9
-#+ocaml-findlib.7a5de3a84edb8c3a4c3135e9d53ad024f557511d54e60f39690d86075d448964
-#+ocamlbuild.70235ec8ceaa735592ddfe1559a140ec140b39db62e3afdaafb5d7ad3e61580c
-#+opam.e5558b28cf5c6630049a1393d1a14011da9abdbe4cc62861d9f502a11eec6ae1
-#+ocaml-topkg.895a21f67e7acfeabbfa96e0154912481ac3da811c55b8dce13c2366a03882d5
-#+ocaml-astring.02c7f70ca86bd0b41001217a54b0e3c832402a4e0297eb0b4035addebb6a673e
+#+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
 #@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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+ocaml.820389565cec86ddb056960d295dc67d12983873bae264d15d9d85e0f0ea49f9
-#+ocaml-findlib.7a5de3a84edb8c3a4c3135e9d53ad024f557511d54e60f39690d86075d448964
-#+ocamlbuild.70235ec8ceaa735592ddfe1559a140ec140b39db62e3afdaafb5d7ad3e61580c
-#+opam.e5558b28cf5c6630049a1393d1a14011da9abdbe4cc62861d9f502a11eec6ae1
-#+ocaml-topkg.895a21f67e7acfeabbfa96e0154912481ac3da811c55b8dce13c2366a03882d5
-#+ocaml-mtime.46c23a318ca3c51d99d4cb48c6b70929a9e366945a8eb1935d36b840864c0ab8
-#+ocaml-cmdliner.03882d46dbf03d9515adc74d4b821bc200176b609ed987f1a3c0859f2ec203b8
-#+ocaml-fmt.45317a9d3f0afdc7bdcfb7c0e086f252d6ef072472426caab8507c90b3957e9a
+#+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
 #@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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+ocaml.820389565cec86ddb056960d295dc67d12983873bae264d15d9d85e0f0ea49f9
-#+dune.79c6d6a331294cbb6fecb42c39f14377c2eb6869bac481bed75400f1ec893127
+#+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
 #@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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+ocaml.820389565cec86ddb056960d295dc67d12983873bae264d15d9d85e0f0ea49f9
-#+ocaml-findlib.7a5de3a84edb8c3a4c3135e9d53ad024f557511d54e60f39690d86075d448964
-#+ocamlbuild.70235ec8ceaa735592ddfe1559a140ec140b39db62e3afdaafb5d7ad3e61580c
-#+opam.e5558b28cf5c6630049a1393d1a14011da9abdbe4cc62861d9f502a11eec6ae1
-#+ocaml-topkg.895a21f67e7acfeabbfa96e0154912481ac3da811c55b8dce13c2366a03882d5
+#+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
 #@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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+ocaml.820389565cec86ddb056960d295dc67d12983873bae264d15d9d85e0f0ea49f9
-#+dune.79c6d6a331294cbb6fecb42c39f14377c2eb6869bac481bed75400f1ec893127
+#+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
 #@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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+ocaml.820389565cec86ddb056960d295dc67d12983873bae264d15d9d85e0f0ea49f9
-#+dune.79c6d6a331294cbb6fecb42c39f14377c2eb6869bac481bed75400f1ec893127
-#+ocaml-compiler-libs.f181e5f7b4d6dcd0631eda1db7f34e073257ae55162a525f948bae1318610c30
-#+ocaml-cppo.2f00a864ec9d5d7f98e93afbb0122442071aa9569d223354c9c430e93f729dfe
-#+ocaml-findlib.7a5de3a84edb8c3a4c3135e9d53ad024f557511d54e60f39690d86075d448964
-#+ocaml-ppx_derivers.a9e620c270c571d8b48bb5aff1400d77a0706b318ee95b4976326cafbd823b6e
-#+ocaml-ppxlib.98ce16f53bfc02665f709fc5ce298f6c45fbbac29af0c0d7fb9ecaad8e244d76
-#+ocaml-sexplib0.e0542603ebe9f93d008e3bd49b509a192fbd4d962e706607578afbad412d0395
-#+ocaml-stdlib-shims.848deb1b0b8e3f85b7b8a64dae8bb1ee0b9dc26f20c9e4d81ef2742bafbdca11
+#+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
 #@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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+ocaml.820389565cec86ddb056960d295dc67d12983873bae264d15d9d85e0f0ea49f9
-#+dune.79c6d6a331294cbb6fecb42c39f14377c2eb6869bac481bed75400f1ec893127
-#+ocaml-compiler-libs.f181e5f7b4d6dcd0631eda1db7f34e073257ae55162a525f948bae1318610c30
-#+ocaml-ppx_derivers.a9e620c270c571d8b48bb5aff1400d77a0706b318ee95b4976326cafbd823b6e
-#+ocaml-sexplib0.e0542603ebe9f93d008e3bd49b509a192fbd4d962e706607578afbad412d0395
-#+ocaml-stdlib-shims.848deb1b0b8e3f85b7b8a64dae8bb1ee0b9dc26f20c9e4d81ef2742bafbdca11
+#+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
 #@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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+ocaml.820389565cec86ddb056960d295dc67d12983873bae264d15d9d85e0f0ea49f9
-#+ocaml-findlib.7a5de3a84edb8c3a4c3135e9d53ad024f557511d54e60f39690d86075d448964
-#+ocamlbuild.70235ec8ceaa735592ddfe1559a140ec140b39db62e3afdaafb5d7ad3e61580c
-#+opam.e5558b28cf5c6630049a1393d1a14011da9abdbe4cc62861d9f502a11eec6ae1
-#+ocaml-topkg.895a21f67e7acfeabbfa96e0154912481ac3da811c55b8dce13c2366a03882d5
+#+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
 #@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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+ocaml.820389565cec86ddb056960d295dc67d12983873bae264d15d9d85e0f0ea49f9
-#+dune.79c6d6a331294cbb6fecb42c39f14377c2eb6869bac481bed75400f1ec893127
+#+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
 #@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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+ocaml.820389565cec86ddb056960d295dc67d12983873bae264d15d9d85e0f0ea49f9
-#+dune.79c6d6a331294cbb6fecb42c39f14377c2eb6869bac481bed75400f1ec893127
+#+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
 #@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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+ocaml.820389565cec86ddb056960d295dc67d12983873bae264d15d9d85e0f0ea49f9
-#+ocaml-findlib.7a5de3a84edb8c3a4c3135e9d53ad024f557511d54e60f39690d86075d448964
-#+ocamlbuild.70235ec8ceaa735592ddfe1559a140ec140b39db62e3afdaafb5d7ad3e61580c
-#+opam.e5558b28cf5c6630049a1393d1a14011da9abdbe4cc62861d9f502a11eec6ae1
+#+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
 #@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.820389565cec86ddb056960d295dc67d12983873bae264d15d9d85e0f0ea49f9
-#+dune.79c6d6a331294cbb6fecb42c39f14377c2eb6869bac481bed75400f1ec893127
-#+ocamlbuild.70235ec8ceaa735592ddfe1559a140ec140b39db62e3afdaafb5d7ad3e61580c
-#+ocaml-base.78e2aaf65ae71c201ef57405e5d9fde4bb0876bd0081584c9e813828c3c79d4b
-#+opam.e5558b28cf5c6630049a1393d1a14011da9abdbe4cc62861d9f502a11eec6ae1
-#+ocaml-bos.5ceecd07d2f38b270971af72c77e6dcbbc4628c5246e107da4a7ca18af9b5bfc
-#+ocaml-lun.70a12ea5427026d9089c25442c4e6a3d4d17e97bc142920b1d5c9d287a892590
-#+ocaml-ppx_deriving.41305f66bbdac7b0a0aa979a8fe838eec4d2fba21d83352c9f9773a03c174069-
\ No newline at end of file
+#+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
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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+m4.2f11520ee4dee19e3911857ae1fe0a484cc48676b0efa28328cdc29e73be5b6b
+#+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
 #@untar:-J:sha256:dfaa8a2e11c799bc1765d8bef44911406ee5f4803027190382a939f88c912266:.
 
 
diff --git a/variants/ccx-x86_64/ocaml_intrinsics_kernel b/variants/ccx-x86_64/ocaml_intrinsics_kernel
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+ocaml.820389565cec86ddb056960d295dc67d12983873bae264d15d9d85e0f0ea49f9
-#+dune.79c6d6a331294cbb6fecb42c39f14377c2eb6869bac481bed75400f1ec893127
+#+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
 #@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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+m4.2f11520ee4dee19e3911857ae1fe0a484cc48676b0efa28328cdc29e73be5b6b
-#+ocaml.820389565cec86ddb056960d295dc67d12983873bae264d15d9d85e0f0ea49f9
+#+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
 #@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.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/home/ccx/versions/musl.d828e4f6cb803b5cd778bf063a4ea6455e0eec6251844c9d88f69a3fab854167/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.820389565cec86ddb056960d295dc67d12983873bae264d15d9d85e0f0ea49f9"
+stdlib="$pthbs_destdir/home/ccx/versions/ocaml.819d781b7986f8a3af9d9cb3060b5cf1321208b6740d9d03edd97f0596c89621"
 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.7c806f251682aef762107a570a344b486e48595991e74acd422ea1d030d92afb
-#+nawk.e751b8be76a2fb59a2fe374e1f55c7da47b14ef1154eb8614d12107e6d68e88d
-#+gnu-make.e1e853dc6defb07b15f88e3e3d66b395de244b7fc5f47ef92b624ff73540cc1d
-#+musl-cross-make.2a6aa41af147a85dfff7a65f9be1e61939dd022d85b7ec42d6add621e550995f-
\ No newline at end of file
+#+busybox.3cee246e09c72f86b6e714fb4b4557dc2f9ee571084f716bbcb612fa8ebd3deb
+#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
+#+gnu-make.b7cde92a7edabca3a8e00739fed6aaa5533d94f74d290dff8ce739ffef9171b5
+#+musl-cross-make.a92bd0a73a662b4ebb61cd88fa1f6d034a327326d3a9d0f0040cc87ed97e5cb3+
\ 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.d6750f5a1e339e3d060bfc90f5782fe6092b8efd8f888c77677981b49e640c5d
-#+busybox.078d166f772398584ff2dcee5af91d214d0d0a80caac910ee0aacffdc6a00d45
-#+gnu-make.bcceef7460295cce6b153e4b13e9b0291833235a0247509ffdd56e544816a363-
\ No newline at end of file
+#+musl-cross-make.e6726ea29e8b7fe316c8a30b8a500f73aab8cf8c862a1bcd575d50b3265dd793
+#+busybox.03aafd6784fbaf10998bbada115afc6987a8bd0eef274b3bd154ffcbdc937789
+#+gnu-make.d59adbd7109f94fce8999fa5d07408a4f6e0a904eee0f1fb6d23063b79b5fa9c+
\ 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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+diffutils.24eca0a696d51c4fe18eeff95248fefdadbbb726849aab113112df71bb704ca7
-#+patch.95c9bec783a4dffd073983372fb9952b5f686dc3576bdeabd175ea44ec199660
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+getconf.a26e723c0b53e150997cd5f0147e6660ab2d8847a504ea94865624b20e1ff501
-#+ocaml.820389565cec86ddb056960d295dc67d12983873bae264d15d9d85e0f0ea49f9
-#+dune.79c6d6a331294cbb6fecb42c39f14377c2eb6869bac481bed75400f1ec893127
+#+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
 #@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.79c6d6a331294cbb6fecb42c39f14377c2eb6869bac481bed75400f1ec893127/command/dune' \
+	--with-dune='/home/ccx/versions/dune.07c387be10443c98f2c7c36eefcbec5c1a42297780842f9ef38224543f148efd/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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+m4.2f11520ee4dee19e3911857ae1fe0a484cc48676b0efa28328cdc29e73be5b6b
+#+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
 #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:.
 
 
@@ -60,8 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+m4.2f11520ee4dee19e3911857ae1fe0a484cc48676b0efa28328cdc29e73be5b6b
+#+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
 #@untar:-J:sha256:3a224f2accf091b77a5781316e27b9ee3ba82c083cc2e539e08940b68a44fec5:.
 
 
@@ -60,8 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+pkgconf.49083df6fbf810ecb6fe35deb8d7afa8b7a8e07d14b58b178e1b0167b13651c0
+#+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
 
 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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+m4.2f11520ee4dee19e3911857ae1fe0a484cc48676b0efa28328cdc29e73be5b6b
+#+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
 #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:.
 
 
@@ -60,8 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+zsh.50b0fe630f2d5ddbe51a36ba7884be91a5c15ab95e13f8263dd2d7d66250f8f5
+#+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
 #@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.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+nawk.e751b8be76a2fb59a2fe374e1f55c7da47b14ef1154eb8614d12107e6d68e88d
-#+execline.97dcd338d1cd526ffe28a8cbb05849056cb77d98f2ba70113cf1197c070caf98
-#+lnstools.e19f5f7ba4bae384a8acd87690ae30ecca4b7fc563e9794d82c2ffb805797d7d
-#+sandbox_rootfs.5e12d8489f17d499f05d0c234e1b951786b7583d0328757138e618ed8770bc56
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
+#+execline.dcc4d1547d9927e4a41bc28ae51ac1667791a3cb51a3d4e210e7bc0e4ec9328f
+#+lnstools.f1b8af57f9a3f0324508771413c79dfebba84f6b8503c56241af85a2bf6e81ef
+#+sandbox_rootfs.1b77f57dc69d19ee3056840b0ea5a674575a0b854b2f528d7c0f40079b5c27d7
 #@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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+m4.2f11520ee4dee19e3911857ae1fe0a484cc48676b0efa28328cdc29e73be5b6b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+popt.b1d337120a016476f86594ca3cb35559b8bdd91e7e865a28dc4fd68a2ae87c01
-#+libressl.2a203c612465b8b8cb0aaa2ea8f17bda8848442cadc3e881ccb51d17617ae2f5
-#+zstd.9b15b3ddc4b37f15f098e5a280bcbb0f18a877d51674c2eedae7697666d1b7da
+#+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
 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:.
 
 
@@ -63,8 +63,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+skalibs.1022f215409d53b0b7c03be5d57100a166d24812c7d3b8a7bcddb3cdb22f1d59
-#+execline.ec73c6787ef0d881956fb837789e6a473c89cdb27b4f9fbd5a37898a9f3afe39
+#+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
 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6
 
 
@@ -47,7 +47,7 @@ cd 's6'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.1022f215409d53b0b7c03be5d57100a166d24812c7d3b8a7bcddb3cdb22f1d59/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.7f2610571321bf6ff32187e4720b1f4d7bdeab2163da455e07e75549b216fbe8/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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+skalibs.1022f215409d53b0b7c03be5d57100a166d24812c7d3b8a7bcddb3cdb22f1d59
+#+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
 #@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.1022f215409d53b0b7c03be5d57100a166d24812c7d3b8a7bcddb3cdb22f1d59/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.7f2610571321bf6ff32187e4720b1f4d7bdeab2163da455e07e75549b216fbe8/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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+skalibs.1022f215409d53b0b7c03be5d57100a166d24812c7d3b8a7bcddb3cdb22f1d59
-#+execline.ec73c6787ef0d881956fb837789e6a473c89cdb27b4f9fbd5a37898a9f3afe39
-#+s6.fa8d0d8033aaedab1c63c5a20c2870ed08373230c95d8351f9c9019b933e0e57
+#+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
 #@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.1022f215409d53b0b7c03be5d57100a166d24812c7d3b8a7bcddb3cdb22f1d59/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.7f2610571321bf6ff32187e4720b1f4d7bdeab2163da455e07e75549b216fbe8/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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+skalibs.1022f215409d53b0b7c03be5d57100a166d24812c7d3b8a7bcddb3cdb22f1d59
+#+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
 #@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.1022f215409d53b0b7c03be5d57100a166d24812c7d3b8a7bcddb3cdb22f1d59/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.7f2610571321bf6ff32187e4720b1f4d7bdeab2163da455e07e75549b216fbe8/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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+skalibs.1022f215409d53b0b7c03be5d57100a166d24812c7d3b8a7bcddb3cdb22f1d59
-#+execline.ec73c6787ef0d881956fb837789e6a473c89cdb27b4f9fbd5a37898a9f3afe39
-#+s6.fa8d0d8033aaedab1c63c5a20c2870ed08373230c95d8351f9c9019b933e0e57
-#+s6-dns.616cc00904b2702228935d41a1857c8a7ab39ddd0434c2937a879a3277a39332
-#+libressl.2a203c612465b8b8cb0aaa2ea8f17bda8848442cadc3e881ccb51d17617ae2f5
+#+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
 #@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.1022f215409d53b0b7c03be5d57100a166d24812c7d3b8a7bcddb3cdb22f1d59/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.7f2610571321bf6ff32187e4720b1f4d7bdeab2163da455e07e75549b216fbe8/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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+skalibs.1022f215409d53b0b7c03be5d57100a166d24812c7d3b8a7bcddb3cdb22f1d59
+#+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
 #@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.1022f215409d53b0b7c03be5d57100a166d24812c7d3b8a7bcddb3cdb22f1d59/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.7f2610571321bf6ff32187e4720b1f4d7bdeab2163da455e07e75549b216fbe8/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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+skalibs.1022f215409d53b0b7c03be5d57100a166d24812c7d3b8a7bcddb3cdb22f1d59
-#+execline.ec73c6787ef0d881956fb837789e6a473c89cdb27b4f9fbd5a37898a9f3afe39
-#+s6.fa8d0d8033aaedab1c63c5a20c2870ed08373230c95d8351f9c9019b933e0e57
+#+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
 #@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.1022f215409d53b0b7c03be5d57100a166d24812c7d3b8a7bcddb3cdb22f1d59/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.7f2610571321bf6ff32187e4720b1f4d7bdeab2163da455e07e75549b216fbe8/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,17 +1,17 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.d59becebc257140acc79692fc0c93a44f74666c5ab003b71f4f7f21c21011eae
-#+gnu-make.69bac45b9788ae51b55d84abdb050a1863403e3adb0ddd608036227a5202415e
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+nawk.e751b8be76a2fb59a2fe374e1f55c7da47b14ef1154eb8614d12107e6d68e88d
-#+skalibs.6fc6ef7789fd250fa44993a2c24dff3aeda14cf8886b0d6644d95a67b1579de9
+#+musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
+#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
+#+skalibs.d1ff8cdcea9d046498fa6d934eac84fb74629f477532b3480ad1b38b794db050
 #@sha256:8d716caa5ea940bbbb8f68ac0907cea36773c183bd4c1eebad030f6cc7deaec9:argv0exec.c
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.e19f5f7ba4bae384a8acd87690ae30ecca4b7fc563e9794d82c2ffb805797d7d
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+execline.97dcd338d1cd526ffe28a8cbb05849056cb77d98f2ba70113cf1197c070caf98
-#+sandbox_rootfs.5e12d8489f17d499f05d0c234e1b951786b7583d0328757138e618ed8770bc56
-#+pthbs-sandbox-rootns.203a5a7d3082ff13f9af0da024cb2a72a1c020a33e793683042f187c14c388d0-
\ No newline at end of file
+#+lnstools.f1b8af57f9a3f0324508771413c79dfebba84f6b8503c56241af85a2bf6e81ef
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+execline.dcc4d1547d9927e4a41bc28ae51ac1667791a3cb51a3d4e210e7bc0e4ec9328f
+#+sandbox_rootfs.1b77f57dc69d19ee3056840b0ea5a674575a0b854b2f528d7c0f40079b5c27d7
+#+pthbs-sandbox-rootns.f237ee255ebb738e252fe1bd01691f3cf2eaad422a2efc67203ddda8915f6b87+
\ 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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
+#+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
 #@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.d59becebc257140acc79692fc0c93a44f74666c5ab003b71f4f7f21c21011eae
-#+gnu-make.69bac45b9788ae51b55d84abdb050a1863403e3adb0ddd608036227a5202415e
-#+busybox.d2459d82c53bbacce6fbdbf272b9caf844835248a72c6c2cdf8525229786b23f
-#+nawk.e751b8be76a2fb59a2fe374e1f55c7da47b14ef1154eb8614d12107e6d68e88d
+#+musl-cross-make.243f568d00720d3a8759aecc7c880848a613da43325da90fdf7aab753543f4c4
+#+gnu-make.877d948e3ba82f4641d0cb661c9100d10263fff3768ec5db7645ebcc2ad44d50
+#+busybox.be3e12182a662610de1174c77a1e8fb9b9d31a4c94135ccdb8d05a15db4cbe4b
+#+nawk.a9e7265a75ebdb71e3853e2a85d39dbf8a2d692ca395484686d108f837cd94ed
 #@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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+zsh.50b0fe630f2d5ddbe51a36ba7884be91a5c15ab95e13f8263dd2d7d66250f8f5
-#+pthbs-banginstall.2dd016dd341fe9efe7cfe92c022f13264e0946c144a1f30da9b2d1190662f058
+#+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
 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep
 
 
diff --git a/variants/ccx-x86_64/squashfs-tools b/variants/ccx-x86_64/squashfs-tools
@@ -1,45 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+attr.4df8a66007c9b54fff9f367ced36a003d88b810fbaf3a99634e11be9386e297e
-#+zstd.9b15b3ddc4b37f15f098e5a280bcbb0f18a877d51674c2eedae7697666d1b7da
+#+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
 #@untar:-z:sha256:4672b5c47d9418d3a5ae5b243defc6d9eae8275b9771022247c6a6082c815914:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+m4.2f11520ee4dee19e3911857ae1fe0a484cc48676b0efa28328cdc29e73be5b6b
-#+patch.95c9bec783a4dffd073983372fb9952b5f686dc3576bdeabd175ea44ec199660
-#+libunwind.4ffc7ce1404e0dd72d0babca03827dc2814287c1c66b37f5b4a5353a010a42be
+#+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
 #@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch
 #@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:.
 
@@ -63,8 +63,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-dosfstools.c26636980512dcf58bcbfe55e8c4ce739c93fb4359405f76dff21f8343596c50
-#+busybox-e2fsprogs.1e5660091e6520a3988dc8a510c3f99d2aaf6e9b428d61445343f8a39ff873b1
-#+busybox-iproute2.c654d96f2773b83751b1f291461412afa2ca1968f35bd0b5f5cc8ea1bf498753
-#+busybox-iputils.3888ba1bcd114fa12d10624893f29c22316be12ab58374814b52f632693d7ed3
-#+busybox-net-misc.b5e1023e2a4d185360e2a5b861a0bdcd944f0539eb999e22bdab820711a28e22
-#+busybox-net-tools.d937ca99cea064fd48a06d5cdc7d87a60e0de88d2db05bba29ad70dd71571c17
-#+busybox-traceroute.c9d11a038ab0855899a1df4407193aef8ceb617af9f23b7881dacfc7425368fc
-#+busybox-wget.0e0213a7d9f34ef18486a7645b6e767b12ef2f47d36d033a79743b2c1c8f07bf
-#+busybox-chpst.0392e263516a389be6f7d8a6e3c359483ffc93d9705f219b6d8210fb78499fe2
-#+busybox-console.8ce9edbc43963182f847d202220f7cf8f7e590705d084bd00b7318caa5b1b299
-#+busybox-getty.f42c431df165b7cce5537d94f9340e04a957c07152e3a8799640ab8340f3274c
-
-#+busybox-linux-extra.7dc3b7b60595c62f8dd970f6c05fe3d312607cb7cc5b69f58ae410d9ae4ffd33
-#+busybox-mtd-utils.b8334cadc3c32d88259754442595397857076b04f2b7ff9dfa6423059d638251
-#+busybox-shadow.f34c11ffe40dc4aeb018ed0860115135203b47dc8662079384459771505402d0
-#+busybox-su.e6e9417b08d76a7b6bd4cafb582ea79fc21d67dd7202c8f36da6ca6c10ac6cfd
-#+busybox-util-linux-priv.fe8407a7762ebc0804b125f31244fc42f9dc89197bae51ee4fbc04406bdfb7df
-#+busybox-logging.623712e57c085735d389b2f908e1ea2baadff835be7b47ca9ccce7d22fec6dff
-#+busybox-cron.53101fe61ef2d2d23e9a7be7deb587f2f898bf6a4d55f701612a9d3522a8f92a
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+diffutils.24eca0a696d51c4fe18eeff95248fefdadbbb726849aab113112df71bb704ca7
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+aat.738f2999ee5a47a40c028bb2c2eec6c52d112763d95cc31b115a06a1e5962138
-#+fileset.fab019da70446bb5342023abc0102a860fac4578aff92a9529ec46a8289da9c3
-#+rsync.482d99a310fe4ce0290fef1e9a8b12cd6002e44548e32511babefb0997b250f7
-#+execline.ec73c6787ef0d881956fb837789e6a473c89cdb27b4f9fbd5a37898a9f3afe39
-#+kbd.ec7774325fb3a305cf5716ae6ec7ea27fe98ef7371bce1906e5dad1689c307cb
-#+mdevd.d21d8a9f0227638435e0b759438215dea57882b236a86e8fb60ed69e006bd8e5
-#+s6-linux-utils.f7f8f2506c0f9f229cedbafe7bba352a730c1ad6f627b98522a624a868028b09
-#+s6-rc.c6aa1d311a7aa43c5e48f9d992ee093bba358706db7a26d63aeb89b89829bdd4
-#+s6.fa8d0d8033aaedab1c63c5a20c2870ed08373230c95d8351f9c9019b933e0e57
-#+zsh.50b0fe630f2d5ddbe51a36ba7884be91a5c15ab95e13f8263dd2d7d66250f8f5
-#+libcgroup.6729358e5a55c6c9e88921daee41f721bc2b2b17d482d1530bb36c342ccdb97a
-#+system-config-scripts.2ae7f78670c709d581ce12374de1b67991540883c2de7d14ed1a714c9f6e4bfa
-#+logincaps.bd8ccf7ef490d0ece4edddc7667bf7e7c50d100f708b67880f3bb78b196f570e
-#+busybox.e493d1e3b5d62e9240972cab3804d5037b2f97694f40194ac573dc73a1253093
+#+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
 #@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.2d1b28120f9c79e16f9d97c86462724fd1acd10559ccf949e3302238a92ec575' \
-	'pthbs_path_mdevd=/home/ccx/versions/env.e7af9f3b8de9f70a70299daaf416bc1c41a133d1e83f1c9d017384d18d1ef31a' \
+	'pthbs_path_containers=/home/ccx/versions/env.32f77d2783130f2c2dc1f19824f64f26c65c3a75e98a1a408cc0a8d4013632f4' \
+	'pthbs_path_mdevd=/home/ccx/versions/env.ecbc61ab8ddf0737769c2d71139aa51727552156e579653036df3c5fbb6b697b' \
 	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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-dosfstools.c26636980512dcf58bcbfe55e8c4ce739c93fb4359405f76dff21f8343596c50
-#+busybox-e2fsprogs.1e5660091e6520a3988dc8a510c3f99d2aaf6e9b428d61445343f8a39ff873b1
-#+busybox-iproute2.c654d96f2773b83751b1f291461412afa2ca1968f35bd0b5f5cc8ea1bf498753
-#+busybox-iputils.3888ba1bcd114fa12d10624893f29c22316be12ab58374814b52f632693d7ed3
-#+busybox-net-misc.b5e1023e2a4d185360e2a5b861a0bdcd944f0539eb999e22bdab820711a28e22
-#+busybox-net-tools.d937ca99cea064fd48a06d5cdc7d87a60e0de88d2db05bba29ad70dd71571c17
-#+busybox-traceroute.c9d11a038ab0855899a1df4407193aef8ceb617af9f23b7881dacfc7425368fc
-#+busybox-wget.0e0213a7d9f34ef18486a7645b6e767b12ef2f47d36d033a79743b2c1c8f07bf
-#+busybox-chpst.0392e263516a389be6f7d8a6e3c359483ffc93d9705f219b6d8210fb78499fe2
-#+busybox-console.8ce9edbc43963182f847d202220f7cf8f7e590705d084bd00b7318caa5b1b299
-#+busybox-getty.f42c431df165b7cce5537d94f9340e04a957c07152e3a8799640ab8340f3274c
-
-#+busybox-linux-extra.7dc3b7b60595c62f8dd970f6c05fe3d312607cb7cc5b69f58ae410d9ae4ffd33
-#+busybox-mtd-utils.b8334cadc3c32d88259754442595397857076b04f2b7ff9dfa6423059d638251
-#+busybox-shadow.f34c11ffe40dc4aeb018ed0860115135203b47dc8662079384459771505402d0
-#+busybox-su.e6e9417b08d76a7b6bd4cafb582ea79fc21d67dd7202c8f36da6ca6c10ac6cfd
-#+busybox-util-linux-priv.fe8407a7762ebc0804b125f31244fc42f9dc89197bae51ee4fbc04406bdfb7df
-#+busybox-logging.623712e57c085735d389b2f908e1ea2baadff835be7b47ca9ccce7d22fec6dff
-#+busybox-cron.53101fe61ef2d2d23e9a7be7deb587f2f898bf6a4d55f701612a9d3522a8f92a
-#+s6.fa8d0d8033aaedab1c63c5a20c2870ed08373230c95d8351f9c9019b933e0e57
-#+s6-rc.c6aa1d311a7aa43c5e48f9d992ee093bba358706db7a26d63aeb89b89829bdd4
-#+s6-portable-utils.c0804808faaf2deaf78a0af7e2740a4e842abb758ff2f09695e2c271d47945eb
-#+s6-linux-init.fb58c6d9009a13adc44bb780d8532f79e1d6473a44838f5fe677cf1cc606f6ba
-#+execline.ec73c6787ef0d881956fb837789e6a473c89cdb27b4f9fbd5a37898a9f3afe39
-#+system-config-rc.6e6f636bbf0c11f400680abee4e5534431aba7681c42824ebf8d023702546b93
+#+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
 
 
 # - build script start -
@@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-s6rcdb=/home/ccx/versions/system-config-rc.6e6f636bbf0c11f400680abee4e5534431aba7681c42824ebf8d023702546b93/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.f6ae1e98cc8b0b2d0832376a251b5f0d3f2ee8eaca2de93980c1c3144ee9ac07/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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+s6-rc.c6aa1d311a7aa43c5e48f9d992ee093bba358706db7a26d63aeb89b89829bdd4
-#+fileset.fab019da70446bb5342023abc0102a860fac4578aff92a9529ec46a8289da9c3
-#+system-config.56ecc319e5e26cb7e5f4170fb0078dc114b5ecfccb2830bb2396f7c6fd7c0bdf
+#+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
 
 
 # - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-src=/home/ccx/versions/system-config.56ecc319e5e26cb7e5f4170fb0078dc114b5ecfccb2830bb2396f7c6fd7c0bdf/config/s6-rc-source
+src=/home/ccx/versions/system-config.66975cf360621a11c95e95daf32201fcd7ff9b23d5cf158a8395443b8418b6f1/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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+zsh.50b0fe630f2d5ddbe51a36ba7884be91a5c15ab95e13f8263dd2d7d66250f8f5
-#+pthbs-banginstall.2dd016dd341fe9efe7cfe92c022f13264e0946c144a1f30da9b2d1190662f058
+#+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
 #@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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+zsh.50b0fe630f2d5ddbe51a36ba7884be91a5c15ab95e13f8263dd2d7d66250f8f5
+#+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
 #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh
 
 
diff --git a/variants/ccx-x86_64/tinyssh b/variants/ccx-x86_64/tinyssh
@@ -1,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
+#+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
 #@untar:-z:sha256:f3ae622c765db4e0d791ea90a9feba39d7f693ef9cb949a797f7ad6b404a2d61:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.cc510cced48a354f7f3fc9c86018304ce87eb20d67932bc434b8860698012e81
-#+gcc.7ae4521d1a31b56213e643dc35e5ba5a24ca2ffa5adf87e6858a7af5a7a3122c
-#+binutils.d003c218c2130038dc676d11d663db4018c503ba5ce38d71550e96dad6ba5ef9-
\ No newline at end of file
+#+musl.d828e4f6cb803b5cd778bf063a4ea6455e0eec6251844c9d88f69a3fab854167
+#+gcc.c3f94cf4e0f94f41a7eedde398b97f44313b54c79897d3aecbc69ba0bc9aea5f
+#+binutils.65dbf67be4f2300d50f411d71f488260cbcd1f9ee8e0120c6d3f2ce189c81edb+
\ 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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+execline.ec73c6787ef0d881956fb837789e6a473c89cdb27b4f9fbd5a37898a9f3afe39
-#+pthbs-banginstall.2dd016dd341fe9efe7cfe92c022f13264e0946c144a1f30da9b2d1190662f058
+#+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
 #@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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-dosfstools.c26636980512dcf58bcbfe55e8c4ce739c93fb4359405f76dff21f8343596c50
-#+busybox-e2fsprogs.1e5660091e6520a3988dc8a510c3f99d2aaf6e9b428d61445343f8a39ff873b1
-#+busybox-iproute2.c654d96f2773b83751b1f291461412afa2ca1968f35bd0b5f5cc8ea1bf498753
-#+busybox-iputils.3888ba1bcd114fa12d10624893f29c22316be12ab58374814b52f632693d7ed3
-#+busybox-net-misc.b5e1023e2a4d185360e2a5b861a0bdcd944f0539eb999e22bdab820711a28e22
-#+busybox-net-tools.d937ca99cea064fd48a06d5cdc7d87a60e0de88d2db05bba29ad70dd71571c17
-#+busybox-traceroute.c9d11a038ab0855899a1df4407193aef8ceb617af9f23b7881dacfc7425368fc
-#+busybox-wget.0e0213a7d9f34ef18486a7645b6e767b12ef2f47d36d033a79743b2c1c8f07bf
-#+busybox-chpst.0392e263516a389be6f7d8a6e3c359483ffc93d9705f219b6d8210fb78499fe2
-#+busybox-console.8ce9edbc43963182f847d202220f7cf8f7e590705d084bd00b7318caa5b1b299
-#+busybox-getty.f42c431df165b7cce5537d94f9340e04a957c07152e3a8799640ab8340f3274c
+#+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.7dc3b7b60595c62f8dd970f6c05fe3d312607cb7cc5b69f58ae410d9ae4ffd33
-#+busybox-mtd-utils.b8334cadc3c32d88259754442595397857076b04f2b7ff9dfa6423059d638251
-#+busybox-shadow.f34c11ffe40dc4aeb018ed0860115135203b47dc8662079384459771505402d0
-#+busybox-su.e6e9417b08d76a7b6bd4cafb582ea79fc21d67dd7202c8f36da6ca6c10ac6cfd
-#+busybox-util-linux-priv.fe8407a7762ebc0804b125f31244fc42f9dc89197bae51ee4fbc04406bdfb7df
-#+busybox-logging.623712e57c085735d389b2f908e1ea2baadff835be7b47ca9ccce7d22fec6dff
-#+busybox-cron.53101fe61ef2d2d23e9a7be7deb587f2f898bf6a4d55f701612a9d3522a8f92a
-#+attr.4df8a66007c9b54fff9f367ced36a003d88b810fbaf3a99634e11be9386e297e
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+diffutils.24eca0a696d51c4fe18eeff95248fefdadbbb726849aab113112df71bb704ca7
-#+patch.95c9bec783a4dffd073983372fb9952b5f686dc3576bdeabd175ea44ec199660
-#+flex.bb8a2badc1b9c5e4f7ed4671e5df3a64c77240c22ca349ed94053546a095141d
-#+bison.cd965483a9f386e1c0d8d48be8b103d96c04f40e28dc396f450720f594118079
-#+rsync.482d99a310fe4ce0290fef1e9a8b12cd6002e44548e32511babefb0997b250f7
-#+execline.ec73c6787ef0d881956fb837789e6a473c89cdb27b4f9fbd5a37898a9f3afe39
-#+s6.fa8d0d8033aaedab1c63c5a20c2870ed08373230c95d8351f9c9019b933e0e57
-#+s6-rc.c6aa1d311a7aa43c5e48f9d992ee093bba358706db7a26d63aeb89b89829bdd4
-#+s6-portable-utils.c0804808faaf2deaf78a0af7e2740a4e842abb758ff2f09695e2c271d47945eb
-#+s6-linux-utils.f7f8f2506c0f9f229cedbafe7bba352a730c1ad6f627b98522a624a868028b09
-#+s6-linux-init.fb58c6d9009a13adc44bb780d8532f79e1d6473a44838f5fe677cf1cc606f6ba
-#+mdevd.d21d8a9f0227638435e0b759438215dea57882b236a86e8fb60ed69e006bd8e5
-#+s6-dns.616cc00904b2702228935d41a1857c8a7ab39ddd0434c2937a879a3277a39332
-#+libressl.2a203c612465b8b8cb0aaa2ea8f17bda8848442cadc3e881ccb51d17617ae2f5
-#+s6-networking.7e321390b4e7b529582758b66ea39f81a64c368be6a7247bb86a8ede6b06bd64
-#+zsh.50b0fe630f2d5ddbe51a36ba7884be91a5c15ab95e13f8263dd2d7d66250f8f5
-#+pthbs-banginstall.2dd016dd341fe9efe7cfe92c022f13264e0946c144a1f30da9b2d1190662f058
-#+aat.738f2999ee5a47a40c028bb2c2eec6c52d112763d95cc31b115a06a1e5962138
-#+confz.5e2b0dbf2f649f321e2827578800fb9d2f22ef3042c32aab5a6ad972b8b7cac9
-#+containers.9e71321c183bde58cf483e2c9a94d4495cfa4ea5eecee4daeaf80ec6bd41497a
-#+fileset.fab019da70446bb5342023abc0102a860fac4578aff92a9529ec46a8289da9c3
-#+logincaps.bd8ccf7ef490d0ece4edddc7667bf7e7c50d100f708b67880f3bb78b196f570e
-#+snaprep.9d17a18a0b12128a1ab242bb2556cffc0a00d421f4a75463f88a817e855ac41c
-#+curl.9d4cfc6e80aceca8f089e2a656236b0e7af987bc677769cee48a165feabbd43b
-#+git.e6177ca34066c2e25a1c62b9b5dcfcfd01847ec39130182fd5f3a67096093ed8
-#+xbps.fafd552737d53ce93b27c20629629cb3979f44693861f4023bf0a13bdc8f3a61
-#+apk-tools.88f1ee907868f3ad55cb7a6f1dcedebc58feb53171ea0b2e816f28fa2253b771
-#+getent.9030e22ab2424a35586ef14c53494d9016573f2cc8854b8528940aea76035fc5
-#+getconf.a26e723c0b53e150997cd5f0147e6660ab2d8847a504ea94865624b20e1ff501
-#+iconv.5bf8733465da0a683d1cc711a577214e1872ee1e47e780558a0af827a60b44b5
-#+libcap.d1371bcd4132215289259226f215b7e950a936a9d208408fb28f497ffd918312
-#+applyuidgid-caps.d1e9a66bfd2e493b768aec9421cc329d04adb4fb5acf49d0068e58330127cce4
-#+ccx-utils.9a09ff0654f51bd2e9d09d8aabdc1130fb28177fb573bf864762c5b0ecfea3be
-#+user-env.35c87df7d94082c553246c2100678cbda310c690ccdb739f98f7046b72df415a
-#+strace.8e9294ac9a28e9f42ee8ad519794b830bfd61eb020a5f7d09ae9dce6aa5f96a3
-#+mlog.74cc18d92e541a5dc9aeb019d6eac5abea67ed268df73a4a5887c70d1f49ec24
-#+findutils.9029d157542e2a7b3200caf0210ee41c68c52e657ca7d009ccd064aabb1f3721
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+nvi.14d32964bb3e136507a7375f493728d2eb5356dca4a3c473c46fa7af540c0f49
-#+squashfs-tools.37b37ac5e4af3f6a3b097b50c443c756e723055f11d313febb346a191dee1531
-#+mandoc.337d52f28d2da9cb636d4917ee45cd9119c517b1c2034e7532554747fb3e1e96
-#+tinyssh.b476e3e4dd069844730f101e3030171c2a7fb0d5d80498ae45074f8d47410663-
\ No newline at end of file
+#+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
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.72cc6042b882082c7cbfed17c89285926cd297f02d997e25901bcfc3b318bb21-
\ No newline at end of file
+#+linux-qemu-guest.2146f6782e67214c7ad7ee82b2c006ba2f2cd852ed4df91c86decd5c41d0e7ae+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/xbps b/variants/ccx-x86_64/xbps
@@ -1,45 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+libarchive.5fd7814dc4b0077c9cbc1b9ae7241d8767c8b0ef0bab6e278694fa153f66a9bd
-#+libressl.2a203c612465b8b8cb0aaa2ea8f17bda8848442cadc3e881ccb51d17617ae2f5
-#+pkgconf-pkg-config.36a9dc4c92d6d644f3a0e9b3399397e26b8e5c86c16ffe2c23dc7397cebd5f6d
+#+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
 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+m4.2f11520ee4dee19e3911857ae1fe0a484cc48676b0efa28328cdc29e73be5b6b
-#+netbsd-curses.fa6a5ef3cc156caf8afa419cf413e785383f30fabe50f0afa369af655e250638
-#+libbsd.45a2c3fb0da4dbe6f116c92539a0238416c97a28f860dcb0af469d21f556bf61
+#+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
 #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config
 #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:.
 
@@ -63,8 +63,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
diff --git a/variants/ccx-x86_64/zstd b/variants/ccx-x86_64/zstd
@@ -1,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.93d6139b71ac18f42eb02925e7226038144d04961c0b4c112e5be5f772627b6c
-#+busybox-bzip2.6c49c39277dd1e0b85b20877e71b969cc15100907cf8009aba9e925a1474f3ce
-#+busybox-gzip.06989dbadb3c0a66aba72e1bf26e7350e136be11297b5e36eb7dc35bfc8a4a97
-#+busybox-lzop.05430954d76bef7b16ebef79d4e7d3cc5981aa460533c1500227c263b9e2b030
-#+busybox-unzip.10f466c98bdaf2dee54bf229788fecd0c55ffb3c40883c410e43434202b54f83
-#+busybox-xz.50b2503b3ee5125bc5d8cd9f195e9e1cf6b2f52eeb9d4f6f2061aec93d429b68
-#+busybox-cpio.964aa23ef1a039d59b1d16c32b57771a16974ce339313e66005bcac45a27126e
-#+busybox-dpkg.54b47d186bda6fb59ccf2d320b4c4650333e76e910de115b8298f84aaaf10508
-#+busybox-rpm.1b8d68bab2209cf5cf3f10cc74193a3b55e10abc8150c2a2d65f46b9e0605890
-#+busybox-tar.dc68713790af299c4d512c073d79946433420b80a16679fcdbc2e03db18d46cd
-#+busybox-ed.a2861b4b0db556960865733ccf33befe69bf853727ade499f38152fd826c8032
-#+busybox-sed.6703b0fc8c710abce939c13eb222e00452a312edc2b648383d99cb5c52f7a911
-#+busybox-vi.37018503d6945f940e89e4f85b926a86ccb5a7bc776fe8c7f214e5ea1b42ce45
-#+busybox-xxd.8496a4601aff219835c584c191d314974319ffcc185212fd77d29b9a6ae6e1eb
-#+busybox-process-extra.8ded10eec67bdfb91865615128e65bb430b68772206e9974d8a859db6c5d1ec8
-#+busybox-procps.d180811c1a853de916bd18ee1adc9db62e95f8c0c5a054197aeb4e11267d8f55
-#+busybox-psmisc.7ba78d3511915ddb5a1f726624ddd7b6c7305a37c6d2a0a92c4b10a9c43bc31a
-#+busybox-ash.be6ed0f3d5dc3235762b7c8b4b106cd0a0f6ed18ff9c28a7ccebc7b95f797c24
-#+busybox-bc.de1af5daf95b74a5ab066038647c261dc6396c94fc2e783647072a7a8777c830
-#+busybox-coreutils.0fe5fa053563d5918bfbe1d8f8af42205d9d5aed4dfdef7912a931e67e52de81
-#+busybox-coreutils-extra.b9341abe1de0860c43f55b38ef0cc12001141286c424524884b5afef578ec28b
-#+busybox-daemontools.bbe9e7d9b5c4810a952b1c411689587b6f3a07cf0116941c5638c7603e4a0cee
-#+busybox-grep.cfad76e95ff8f73a651be868b6430714c3dc5aefe2a571276b62e4d9996fc8ba
-#+busybox-misc.dfec182a6cc454cca92a9299f740f36c89d2c8960d8b739647971624632f2eb2
-#+busybox-sh.0041ef31951eacbfb813ccbbcb61b85d5e0eb522de4bf6b7e983a7724a7eaa0c
-#+busybox-util-linux-unpriv.b6430db3f7924bb459ce54e30520e449c285b11f5955fb73124cefc0336c7af8
-#+busybox-findutils.60c33a5532f6875a99697b21666dc844205b9f1a5b69abe734e7a857e5cd129b
-#+nawk.3e23d51100f5fea24a21e8434dda90fbe979bdf52347d841bcfdf53fd2bd61da
-#+musl-cross-make.c42369d14dfd3a2d5a4f754c369fb48a12bca98311967b1cf439e5a4b25676b5
-#+gnu-make.e48f7c55d32e73c90212f350c229fdf5d3c0e52044e479c6ed9a1d264472b250
-#+busybox-diffutils.38a604877dfc8221bf2e0230c744461404d4c52cb5de38979250d040961cb113
+#+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
 #@untar:-z:sha256:98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+zsh.8de132d9d29951de50aad1da41d31ab7bb6fc6181f7223790a27e83bf30cf7d5
-#+pthbs-banginstall.41366c70334ffa036a8846c5b8adce50964b72901b9ce3a570cab76f3405b680
+#+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
 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat
 
 
diff --git a/variants/root-x86_64/abduco b/variants/root-x86_64/abduco
@@ -1,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
+#+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
 #@git:8c32909a159aaa9484c82b71f05b7a73321eb491:abduco
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
+#+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
 #@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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+patch.a2c1457b8dfa83cf2419f5d96715f718c4509ece6f07a4a35f63dcb9805d4f75
-#+libressl.6827d08fdfbe6fffa98708a502d625310c8207879bb87a70a58c370e71a38564
-#+zstd.9e56e29a15a5c102cca43c4a646e71fbad2287d9bebf10e90b44eeae03a57712
-#+pkgconf-pkg-config.c17df74ecd45509505d695015f50a52d04af411e71fcbaeae36d78fce94714e5
+#+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
 #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch
 #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools
 
@@ -41,8 +41,8 @@
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+skalibs.9c116306190124d4180131a1da17059e59bc15038c0f78f967f0821c71154a63
-#+libcap.7cb2b5fef97fa3b00202efffa6d24dd409d1a5f177011ebe4a4417bb57304a43
+#+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
 #@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+m4.63af8be5af3779f83406e93230438dc81f2418bef73652510f2478e7b6a2ebd4
+#+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
 #@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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+m4.63af8be5af3779f83406e93230438dc81f2418bef73652510f2478e7b6a2ebd4
+#+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
 #@untar:-z:sha256:39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87:.
 
 
@@ -60,8 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.32c8340da510d38fd23185d7d33531ac1522a6ab72f4dfb2b4f6a0c15c317928
-#+gnu-make.411b4e10d12f074a58a97e9ace0752bfc91edd828e78415c69afd0d71d70b507
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+m4.fbf240f6f38b68ebad61c9856c178ebfe6f66fc6e4feb1fafc2f6575b150e12f
-#+nawk.f693cc9a360afa00381350243fad82275ec5781c1916597df5ee0072912dea37
+#+musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
+#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+m4.d058098030688ce2ed0667b44392bd4ad76c2701f6574040bd81c43e0fab6ffe
+#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
 #@sha256:a119e7e50cae23feaad160a533d69a90073a519521924da56abc74724cec65c6:merged.patch
 #@untar:-z:sha256:0cdd76777a0dfd3dd3a63f215f030208ddb91c2361d2bcc02acec0f1c16b6a2e:.
 
@@ -34,8 +34,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.f693cc9a360afa00381350243fad82275ec5781c1916597df5ee0072912dea37
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+m4.63af8be5af3779f83406e93230438dc81f2418bef73652510f2478e7b6a2ebd4
-#+flex.59820588bada75994b41d523132689c18833d853f0dcc5f3ea07386eb688dadf
+#+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
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 
@@ -62,8 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+gnu-make.411b4e10d12f074a58a97e9ace0752bfc91edd828e78415c69afd0d71d70b507
-#+musl-cross-make.32c8340da510d38fd23185d7d33531ac1522a6ab72f4dfb2b4f6a0c15c317928-
\ No newline at end of file
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
+#+musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27+
\ 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.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.411b4e10d12f074a58a97e9ace0752bfc91edd828e78415c69afd0d71d70b507
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
+#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
+#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
 #@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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-attr b/variants/root-x86_64/busybox-attr
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-awk b/variants/root-x86_64/busybox-awk
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-bc b/variants/root-x86_64/busybox-bc
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-bzip2 b/variants/root-x86_64/busybox-bzip2
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-chpst b/variants/root-x86_64/busybox-chpst
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-console b/variants/root-x86_64/busybox-console
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-coreutils b/variants/root-x86_64/busybox-coreutils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-coreutils-extra b/variants/root-x86_64/busybox-coreutils-extra
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-cpio b/variants/root-x86_64/busybox-cpio
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-cron b/variants/root-x86_64/busybox-cron
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-daemontools b/variants/root-x86_64/busybox-daemontools
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-diffutils b/variants/root-x86_64/busybox-diffutils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-dosfstools b/variants/root-x86_64/busybox-dosfstools
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-dpkg b/variants/root-x86_64/busybox-dpkg
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-e2fsprogs b/variants/root-x86_64/busybox-e2fsprogs
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-ed b/variants/root-x86_64/busybox-ed
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-findutils b/variants/root-x86_64/busybox-findutils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-getty b/variants/root-x86_64/busybox-getty
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-grep b/variants/root-x86_64/busybox-grep
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-gzip b/variants/root-x86_64/busybox-gzip
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-iproute2 b/variants/root-x86_64/busybox-iproute2
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-iputils b/variants/root-x86_64/busybox-iputils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-kbd b/variants/root-x86_64/busybox-kbd
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-linux-extra b/variants/root-x86_64/busybox-linux-extra
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-logging b/variants/root-x86_64/busybox-logging
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-login b/variants/root-x86_64/busybox-login
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-lzop b/variants/root-x86_64/busybox-lzop
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-misc b/variants/root-x86_64/busybox-misc
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-modutils b/variants/root-x86_64/busybox-modutils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-mtd-utils b/variants/root-x86_64/busybox-mtd-utils
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-net-misc b/variants/root-x86_64/busybox-net-misc
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-net-tools b/variants/root-x86_64/busybox-net-tools
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-process-extra b/variants/root-x86_64/busybox-process-extra
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-procps b/variants/root-x86_64/busybox-procps
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-psmisc b/variants/root-x86_64/busybox-psmisc
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-rpm b/variants/root-x86_64/busybox-rpm
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-sed b/variants/root-x86_64/busybox-sed
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-sh b/variants/root-x86_64/busybox-sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-shadow b/variants/root-x86_64/busybox-shadow
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-su b/variants/root-x86_64/busybox-su
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-tar b/variants/root-x86_64/busybox-tar
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-traceroute b/variants/root-x86_64/busybox-traceroute
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-unzip b/variants/root-x86_64/busybox-unzip
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-util-linux-priv b/variants/root-x86_64/busybox-util-linux-priv
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-util-linux-unpriv b/variants/root-x86_64/busybox-util-linux-unpriv
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-vi b/variants/root-x86_64/busybox-vi
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-wget b/variants/root-x86_64/busybox-wget
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-xxd b/variants/root-x86_64/busybox-xxd
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-xz b/variants/root-x86_64/busybox-xz
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+busybox.ce5254c704269750fbf0bd597dc21f765db3feb7825bf3199443436edaa09ca3
 
 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.32c8340da510d38fd23185d7d33531ac1522a6ab72f4dfb2b4f6a0c15c317928
-#+gnu-make.411b4e10d12f074a58a97e9ace0752bfc91edd828e78415c69afd0d71d70b507
-#+nawk.f693cc9a360afa00381350243fad82275ec5781c1916597df5ee0072912dea37
+#+musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
+#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
+#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
 #@git:8d7ae80eda7e08ee361f8793683ae58216caf720:busybox
 #@sha256:13ed92216aef70e6fc431b2e66a9b20a71b5f4b69a3d7a84acbc4d1210d6ea6a:busybox/.config
 
 PATH="$pthbs_build_environment/command:$PATH"
-mcm=/versions/musl-cross-make.32c8340da510d38fd23185d7d33531ac1522a6ab72f4dfb2b4f6a0c15c317928
-make=/versions/gnu-make.411b4e10d12f074a58a97e9ace0752bfc91edd828e78415c69afd0d71d70b507
+mcm=/versions/musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
+make=/versions/gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
 
 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.d6020711dbc027dd194308a4c92f82c594449504111f2b93175a231146289b08
-#+gnu-make.d63240ca6240bc8dade4a9eb74e8f49f2a5b8a9cb582167e02198f216721b316
-#+busybox.9134675065f82f71c419d4947849934fa6c0cbe0de0bda89c4822f5388af3d46
-#+nawk.f693cc9a360afa00381350243fad82275ec5781c1916597df5ee0072912dea37
+#+musl-cross-make.f8a57d7546c64c62e14d1d4b4a09fd10dc77cfc4a37744b75fac6bb5b8bdcb72
+#+gnu-make.99fe3011f86e41833c1116b7b47d2c478ecbacb4f09734045b71df5d0c99534f
+#+busybox.9624330e831e939cd8c151ee92f591249d816c6ccac4d4bcfeaf1ec34c83a4c8
+#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
 #@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.cdea4aca64fb2f6d8681ad283ef9be1a56a0515fc1756d3d02d1d4d97e3d2ee5
-#+gnu-make.d63240ca6240bc8dade4a9eb74e8f49f2a5b8a9cb582167e02198f216721b316
+#+musl-cross-make.3a7d0ecaebf339449fdbcf279f0e7a0af8562f98e5d2f4384136f29afa0a0d52
+#+gnu-make.99fe3011f86e41833c1116b7b47d2c478ecbacb4f09734045b71df5d0c99534f
 #@git:8d7ae80eda7e08ee361f8793683ae58216caf720:busybox
 #@sha256:13ed92216aef70e6fc431b2e66a9b20a71b5f4b69a3d7a84acbc4d1210d6ea6a:busybox/.config
 
-mcm=/versions/musl-cross-make.cdea4aca64fb2f6d8681ad283ef9be1a56a0515fc1756d3d02d1d4d97e3d2ee5
-make=/versions/gnu-make.d63240ca6240bc8dade4a9eb74e8f49f2a5b8a9cb582167e02198f216721b316
+mcm=/versions/musl-cross-make.3a7d0ecaebf339449fdbcf279f0e7a0af8562f98e5d2f4384136f29afa0a0d52
+make=/versions/gnu-make.99fe3011f86e41833c1116b7b47d2c478ecbacb4f09734045b71df5d0c99534f
 
 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+certdata2pem.3073c436d9ce1d2061814e2f8d0b3b3f063a4f3b8ca7bbe65ef1182347f663ad
+#+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
 #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:.
 
 
diff --git a/variants/root-x86_64/ccx-utils b/variants/root-x86_64/ccx-utils
@@ -1,44 +1,44 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+skalibs.9c116306190124d4180131a1da17059e59bc15038c0f78f967f0821c71154a63
-#+s6.2c7bc8b422bcc8f405da4f7e8c253464a29cba23e3dd37be59a13d5fae3024ab
+#+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
 #@git:461a9ec198c1e2b9c39a34e21786747dbb8671b4:ccx-utils
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
diff --git a/variants/root-x86_64/certdata2pem b/variants/root-x86_64/certdata2pem
@@ -1,41 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
+#+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
 #@sha256:064f7d41106cd9efa08b9e68cf049f44e3be55666bd2ab96d02c508293b8dce7:certdata2pem.c
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+zsh.8de132d9d29951de50aad1da41d31ab7bb6fc6181f7223790a27e83bf30cf7d5
-#+pthbs-banginstall.41366c70334ffa036a8846c5b8adce50964b72901b9ce3a570cab76f3405b680
+#+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
 #@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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-dosfstools.98587ba22b6bd601a91a1f5a73c0edc14038129338c475894940780960e07e14
-#+busybox-e2fsprogs.a10bf77d2c72eeb3634fd5b67a791e9f9fd889d3b1e5e8b7bc40f55e29963732
-#+busybox-iproute2.7ecefb8fb6927b73f1589ed3e902b13b74bd0acac724b80da906a8c536cd7601
-#+busybox-iputils.0d709d89f126377720fed0b3b23032834ea833c04bc5660895766f7b3a67c19e
-#+busybox-net-misc.403e058a724e18ffe6ba31d19b49fbe5fdc0c04dd95f9c9d876bb3a57dd59664
-#+busybox-net-tools.2274049da9c55e277412d1c3fba639bbfed81b5ba466d1e2bbb1a3a1e4e05b18
-#+busybox-traceroute.7cdce450f1b62ec7ecbc88d6993842613e3b168cd69d409dec5dc118ce250dff
-#+busybox-wget.4f0aa594e3ce7201ff4efa39bb891af5f82ab6e5b885932204419b0ba1ab6775
-#+busybox-chpst.46d1cccd8950abfa8479022b4ee8c9f30a068004af47943daa7e03505a03a066
-#+busybox-console.d21ec583b723076accbc85c159dd2e644cb169d12964b6c3915b17a094e0ce40
-#+busybox-getty.3d226cb37c1ba7397c8f059f9b380cd35be60b6e27c0ec22b7c3aea2ba010542
+#+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.26fdba68b1a222d8899efba006540dfd9c48e7f2be64e5365c5e8d3232e8c083
-#+busybox-mtd-utils.6271fc72ba6cfd73c8a0321436497efaa6ded2b09a5d69007aefca88bf9cf914
-#+busybox-shadow.adb33086098147ca37d1970d011359ce7e54a1bedce73ec26524a1e47e48308c
-#+busybox-su.d49f13217d1a208d121cd271d25c47363ff7af3031e6229b9ffe344db663c7cc
-#+busybox-util-linux-priv.5f29bd71ed8b27e2bdfcf6582438e331a21742d10464863bedbe135f457c7d52
-#+busybox-logging.0419bbfd02f6955640a6ec1a2171eb801c2498d1f723629f2202379ee7d97a7b
-#+busybox-cron.65d59b41752764cbfde1077008fd9809af79c29f0e7b189c206c328ddc41bbca
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+busybox-login.000b58c01fc8b146a7bca13c673c841430b16851bc359ec6a85a830cc9b15ffc
-#+execline.3e4dd5f034f9acef05c7227b9652d10dc2b6b2cbd79c1ff7b259a653b015f48c
-#+s6.2c7bc8b422bcc8f405da4f7e8c253464a29cba23e3dd37be59a13d5fae3024ab
-#+ccx-utils.d9aedf1f40e4f17c4abbcf970a5f7218c1808fdb8ae379eb4f0b5275108ab7cd
-#+applyuidgid-caps.0652e330f4dba17d4ac30e83bdff8d0307f57fcd616959f4139f996480318619
-#+easyseccomp.36a12a7e1e924190bd3fe717750c74b51af7c7ede8b32b06a1ca5ea5e0fd6a22
-#+mlog.cb5accd215d87f6d05907986cb760546b1270d46bb252dea3486740408afac1b
-#+abduco.345dbfb211c5358bcb0986fb2108098405f3a914aefa959db3fa6241af5646aa
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
+#+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
 #@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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+zsh.8de132d9d29951de50aad1da41d31ab7bb6fc6181f7223790a27e83bf30cf7d5
-#+pthbs-banginstall.41366c70334ffa036a8846c5b8adce50964b72901b9ce3a570cab76f3405b680
-#+execline.3e4dd5f034f9acef05c7227b9652d10dc2b6b2cbd79c1ff7b259a653b015f48c
-#+alpine-keys.68a70acb2e245c5ce0256a9fdb8254c0bcab71cc67689fcba963a61158484e5e
-#+apk-tools.6b8404c36363fa507b913e8883ce568ff121d0004797ca366b997bf0f9a8de25
-#+xbps.131d563fac1c6910ae5e03ba3b31b3fde45f796816491fa038ec3cb7e0b0e539
-#+container-bin-image.0f20b0047ed930a3cf129706947b1764df3fc956de86fee1f8aea9d99504dc6b
+#+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
 #@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.6b8404c36363fa507b913e8883ce568ff121d0004797ca366b997bf0f9a8de25/command/apk.static' "${dest}/deps/command/"
-ln -sf '/versions/xbps.131d563fac1c6910ae5e03ba3b31b3fde45f796816491fa038ec3cb7e0b0e539/command/xbps-install.static' "${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/"
 
-for f in '/versions/alpine-keys.68a70acb2e245c5ce0256a9fdb8254c0bcab71cc67689fcba963a61158484e5e'/keys/alpine/*/*; do
+for f in '/versions/alpine-keys.3906069a8d4c9d871a59de81397d8b54b7f9f81dc18f73a2c705e218d056581b'/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.68a70acb2e245c5ce0256a9fdb8254c0bcab71cc67689fcb
 done
  
 mkdir -p "${dest}/deps/keys/void"
-for f in '/versions/xbps.131d563fac1c6910ae5e03ba3b31b3fde45f796816491fa038ec3cb7e0b0e539'/keys/void/*; do
+for f in '/versions/xbps.41ed375b0206ad8a1702f4acbd37a641bf0dd86874908c8450ab04a7714223e8'/keys/void/*; do
 	ln -sf "$f" "${dest}/deps/keys/void/"
 done
 
-test -d '/versions/container-bin-image.0f20b0047ed930a3cf129706947b1764df3fc956de86fee1f8aea9d99504dc6b/container-bin-image'
-test -f '/versions/container-bin-image.0f20b0047ed930a3cf129706947b1764df3fc956de86fee1f8aea9d99504dc6b/container-bin-image/if'
-ln -sf '/versions/container-bin-image.0f20b0047ed930a3cf129706947b1764df3fc956de86fee1f8aea9d99504dc6b/container-bin-image' "${dest}/deps/"
+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/"
  
 
 
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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-dosfstools.98587ba22b6bd601a91a1f5a73c0edc14038129338c475894940780960e07e14
-#+busybox-e2fsprogs.a10bf77d2c72eeb3634fd5b67a791e9f9fd889d3b1e5e8b7bc40f55e29963732
-#+busybox-iproute2.7ecefb8fb6927b73f1589ed3e902b13b74bd0acac724b80da906a8c536cd7601
-#+busybox-iputils.0d709d89f126377720fed0b3b23032834ea833c04bc5660895766f7b3a67c19e
-#+busybox-net-misc.403e058a724e18ffe6ba31d19b49fbe5fdc0c04dd95f9c9d876bb3a57dd59664
-#+busybox-net-tools.2274049da9c55e277412d1c3fba639bbfed81b5ba466d1e2bbb1a3a1e4e05b18
-#+busybox-traceroute.7cdce450f1b62ec7ecbc88d6993842613e3b168cd69d409dec5dc118ce250dff
-#+busybox-wget.4f0aa594e3ce7201ff4efa39bb891af5f82ab6e5b885932204419b0ba1ab6775
-#+busybox-chpst.46d1cccd8950abfa8479022b4ee8c9f30a068004af47943daa7e03505a03a066
-#+busybox-console.d21ec583b723076accbc85c159dd2e644cb169d12964b6c3915b17a094e0ce40
-#+busybox-getty.3d226cb37c1ba7397c8f059f9b380cd35be60b6e27c0ec22b7c3aea2ba010542
+#+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.26fdba68b1a222d8899efba006540dfd9c48e7f2be64e5365c5e8d3232e8c083
-#+busybox-mtd-utils.6271fc72ba6cfd73c8a0321436497efaa6ded2b09a5d69007aefca88bf9cf914
-#+busybox-shadow.adb33086098147ca37d1970d011359ce7e54a1bedce73ec26524a1e47e48308c
-#+busybox-su.d49f13217d1a208d121cd271d25c47363ff7af3031e6229b9ffe344db663c7cc
-#+busybox-util-linux-priv.5f29bd71ed8b27e2bdfcf6582438e331a21742d10464863bedbe135f457c7d52
-#+busybox-logging.0419bbfd02f6955640a6ec1a2171eb801c2498d1f723629f2202379ee7d97a7b
-#+busybox-cron.65d59b41752764cbfde1077008fd9809af79c29f0e7b189c206c328ddc41bbca
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+execline.3e4dd5f034f9acef05c7227b9652d10dc2b6b2cbd79c1ff7b259a653b015f48c
-#+s6.2c7bc8b422bcc8f405da4f7e8c253464a29cba23e3dd37be59a13d5fae3024ab
-#+s6-portable-utils.064090e9546e018b6833fc6404691b4b2d2b1a26004cd4fc5ff93c5869ff99ff
-#+s6-linux-utils.20d37ed8e0a0ec96bfcc208b52b93d1cae7cfec490ece77d926b14b8309eabc5
-#+zsh.8de132d9d29951de50aad1da41d31ab7bb6fc6181f7223790a27e83bf30cf7d5
-#+confz.b411f6e57c5c81a8a6c5045a5b158340a5a24bc5ea8da6f16ab44550c3c9883b
-#+containers.85d43b57d0d90ce44391410117f659a17f60c44ac439321a27823126519d968d
-#+xbps.131d563fac1c6910ae5e03ba3b31b3fde45f796816491fa038ec3cb7e0b0e539
-#+zstd.9e56e29a15a5c102cca43c4a646e71fbad2287d9bebf10e90b44eeae03a57712
-#+apk-tools.6b8404c36363fa507b913e8883ce568ff121d0004797ca366b997bf0f9a8de25
-#+alpine-keys.68a70acb2e245c5ce0256a9fdb8254c0bcab71cc67689fcba963a61158484e5e
-#+getent.914306e8fe1f20998d03eca19c4b0d9158ff9e4c119b2c62537cd3ad4e27129f
-#+fileset.7b225733db52e26a46c2f376b7ed4cb9866536cf27ad977b5b5920a5c48db4f1
-#+ccx-utils.d9aedf1f40e4f17c4abbcf970a5f7218c1808fdb8ae379eb4f0b5275108ab7cd
-#+easyseccomp.36a12a7e1e924190bd3fe717750c74b51af7c7ede8b32b06a1ca5ea5e0fd6a22
-#+findutils.e89f105e3728c9b749ed3ed4460c0fc7d25431fef03c3f1a5469d411aba57720
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb-
\ No newline at end of file
+#+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
diff --git a/variants/root-x86_64/curl b/variants/root-x86_64/curl
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+m4.63af8be5af3779f83406e93230438dc81f2418bef73652510f2478e7b6a2ebd4
-#+libressl.6827d08fdfbe6fffa98708a502d625310c8207879bb87a70a58c370e71a38564
+#+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
 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:.
 
 
@@ -61,8 +61,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-dosfstools.98587ba22b6bd601a91a1f5a73c0edc14038129338c475894940780960e07e14
-#+busybox-e2fsprogs.a10bf77d2c72eeb3634fd5b67a791e9f9fd889d3b1e5e8b7bc40f55e29963732
-#+busybox-iproute2.7ecefb8fb6927b73f1589ed3e902b13b74bd0acac724b80da906a8c536cd7601
-#+busybox-iputils.0d709d89f126377720fed0b3b23032834ea833c04bc5660895766f7b3a67c19e
-#+busybox-net-misc.403e058a724e18ffe6ba31d19b49fbe5fdc0c04dd95f9c9d876bb3a57dd59664
-#+busybox-net-tools.2274049da9c55e277412d1c3fba639bbfed81b5ba466d1e2bbb1a3a1e4e05b18
-#+busybox-traceroute.7cdce450f1b62ec7ecbc88d6993842613e3b168cd69d409dec5dc118ce250dff
-#+busybox-wget.4f0aa594e3ce7201ff4efa39bb891af5f82ab6e5b885932204419b0ba1ab6775
-#+busybox-chpst.46d1cccd8950abfa8479022b4ee8c9f30a068004af47943daa7e03505a03a066
-#+busybox-console.d21ec583b723076accbc85c159dd2e644cb169d12964b6c3915b17a094e0ce40
-#+busybox-getty.3d226cb37c1ba7397c8f059f9b380cd35be60b6e27c0ec22b7c3aea2ba010542
+#+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.26fdba68b1a222d8899efba006540dfd9c48e7f2be64e5365c5e8d3232e8c083
-#+busybox-mtd-utils.6271fc72ba6cfd73c8a0321436497efaa6ded2b09a5d69007aefca88bf9cf914
-#+busybox-shadow.adb33086098147ca37d1970d011359ce7e54a1bedce73ec26524a1e47e48308c
-#+busybox-su.d49f13217d1a208d121cd271d25c47363ff7af3031e6229b9ffe344db663c7cc
-#+busybox-util-linux-priv.5f29bd71ed8b27e2bdfcf6582438e331a21742d10464863bedbe135f457c7d52
-#+busybox-logging.0419bbfd02f6955640a6ec1a2171eb801c2498d1f723629f2202379ee7d97a7b
-#+busybox-cron.65d59b41752764cbfde1077008fd9809af79c29f0e7b189c206c328ddc41bbca
-#+attr.71d0c97847fbcff42a38020356a5623c001e198bb39868dde8afbd0561f08eca
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+diffutils.f854301a85a3c79d9720218b00cf93548217370d41c4193f3956bd0992ea1b21
-#+patch.a2c1457b8dfa83cf2419f5d96715f718c4509ece6f07a4a35f63dcb9805d4f75
-#+flex.59820588bada75994b41d523132689c18833d853f0dcc5f3ea07386eb688dadf
-#+bison.c5eac37cf833471fa226408b8594197c13dec5ee2b27cf6065e0d71e2f9820b3
-#+rsync.da0d0ceb6305f070da1b9e881db8ada0adef6e6876060eac1f883f3a03589c18
-#+execline.3e4dd5f034f9acef05c7227b9652d10dc2b6b2cbd79c1ff7b259a653b015f48c
-#+s6.2c7bc8b422bcc8f405da4f7e8c253464a29cba23e3dd37be59a13d5fae3024ab
-#+s6-rc.43bf54589d21a6b85064587050ce4979802d13790148132e007f654bc9c6092a
-#+s6-portable-utils.064090e9546e018b6833fc6404691b4b2d2b1a26004cd4fc5ff93c5869ff99ff
-#+s6-linux-utils.20d37ed8e0a0ec96bfcc208b52b93d1cae7cfec490ece77d926b14b8309eabc5
-#+s6-linux-init.ce05d6d3a650909642406e5106ca26852898535b6891b0a20ed5d14ba113b36a
-#+mdevd.46cd009435bd6036df1de68911a5a73be931123e96e1af33ed95965b650c58ce
-#+s6-dns.ecbcd6b629a90c393e2cabc0e0ac1716f622d634c4da72c916a8fe4739687fef
-#+libressl.6827d08fdfbe6fffa98708a502d625310c8207879bb87a70a58c370e71a38564
-#+s6-networking.b2ee2749129ff17451853f6985e397a4ebdeaedc20cb38c2f141d4c6e7a8265f
-#+zsh.8de132d9d29951de50aad1da41d31ab7bb6fc6181f7223790a27e83bf30cf7d5
-#+pthbs-banginstall.41366c70334ffa036a8846c5b8adce50964b72901b9ce3a570cab76f3405b680
-#+aat.23a2d37cba278ac83d08e2c901e8f249a0e9bcd8b0c85fe74ebb8698505592eb
-#+confz.b411f6e57c5c81a8a6c5045a5b158340a5a24bc5ea8da6f16ab44550c3c9883b
-#+containers.85d43b57d0d90ce44391410117f659a17f60c44ac439321a27823126519d968d
-#+fileset.7b225733db52e26a46c2f376b7ed4cb9866536cf27ad977b5b5920a5c48db4f1
-#+logincaps.9f87fd3f0cf5083a4620631a6b95edbfd09f3e07b3c04d0f92b25843cfba6c37
-#+snaprep.8350a2af15b64b87a7cad4d4abe910a37a31b7f24b312d528c5c99df02b7e919
-#+curl.41f9e7478d3b57303c9b23dc96b2bd47bcd7b90263b4fb1f42a9cb202df35e46
-#+git.a8e67225275ca7b13d1b537bf2d2c03ee2e71ac40249bc19b48127c8c633191c
-#+xbps.131d563fac1c6910ae5e03ba3b31b3fde45f796816491fa038ec3cb7e0b0e539
-#+apk-tools.6b8404c36363fa507b913e8883ce568ff121d0004797ca366b997bf0f9a8de25
-#+getent.914306e8fe1f20998d03eca19c4b0d9158ff9e4c119b2c62537cd3ad4e27129f
-#+getconf.a2249804d64f3e2e0380c43aa78c179534ba5c8ddfb5c57740c6c664d161e63a
-#+iconv.2d19fb8dc5c6ab33cbcfa16f9656587819d709d0fbd361206476915440b4c1ab
-#+libcap.7cb2b5fef97fa3b00202efffa6d24dd409d1a5f177011ebe4a4417bb57304a43
-#+applyuidgid-caps.0652e330f4dba17d4ac30e83bdff8d0307f57fcd616959f4139f996480318619
-#+ccx-utils.d9aedf1f40e4f17c4abbcf970a5f7218c1808fdb8ae379eb4f0b5275108ab7cd
-#+user-env.3fe7d65c473770d1f79a2c3eeac6c877440370f366d0ca910360486757c220c6
-#+strace.056dcaaf1ccb1b728ede8cd0ca09d4cb134ffded75110ca5fed32f8000532cd3
-#+mlog.cb5accd215d87f6d05907986cb760546b1270d46bb252dea3486740408afac1b
-#+findutils.e89f105e3728c9b749ed3ed4460c0fc7d25431fef03c3f1a5469d411aba57720
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+nvi.9d057db979867283de33020893c901c3f1da7166892e2655af6d15b0bca29733
-#+squashfs-tools.17590e2f8d4b55faca1b1822a2e41b35c3bf4b96eb8e61aa3163565b3c5e2ba5
-#+mandoc.0d3becf9228dce20e8ea750f3f2a299466d1778051d5389949035a50b27ce105
-#+tinyssh.d792157f240c6fa9124a4fec24583112b3da0c634e2039181ba6db00f2146ce6
-#+system-config.ff6af9e8cee7086606defba374b10a867d1b2d9d9cceab623a048800ea956a78
-#+system-config-rc.4e9eeaeb629adca8e54629a87f65c6d9cb320324b7b1bd7c8324f77d3df23bda
-#+system-config-scripts.2e0beaea2a3423eb8a071a0c2f000dd87a905482b3c765b1ef8a2bb8e6ace0bc
-#+system-config-init.f2e1e97d2a97c6616fbb1820913331c8f46ce36b65f49a32336f514c1a258a9d
-#+system-config-zsh.3545f7463c3f9ab14db5ad1c7785ea093954ef2cad29452c750ce739010a3368
-#+busybox-modutils.93d416beb5674f923667d1ea46141f25757bb42a2c6d05d1aa6fdc870e47d38d-
\ No newline at end of file
+#+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
diff --git a/variants/root-x86_64/diffutils b/variants/root-x86_64/diffutils
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+m4.63af8be5af3779f83406e93230438dc81f2418bef73652510f2478e7b6a2ebd4
+#+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
 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:.
 
 
@@ -60,8 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+ocaml.293f69432db655ea7e83aa8e981fe88e3b4792029babc088b2997a4ddb3daa66
+#+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
 #@untar:-z:sha256:579c738f8ca191ba0a9b22dbe78f1377542442c9827cf4939f8964f09f9edb28:.
 
 
@@ -49,7 +49,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/versions/musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/versions/musl.771c30950c892f46bf06accc9e76f3ba1d9def6aa765b8eb27b5b9bd2c173784/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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+m4.63af8be5af3779f83406e93230438dc81f2418bef73652510f2478e7b6a2ebd4
-#+patch.a2c1457b8dfa83cf2419f5d96715f718c4509ece6f07a4a35f63dcb9805d4f75
-#+flex.59820588bada75994b41d523132689c18833d853f0dcc5f3ea07386eb688dadf
-#+bison.c5eac37cf833471fa226408b8594197c13dec5ee2b27cf6065e0d71e2f9820b3
-#+libseccomp.1f4d09edcf21d66c9a22888ec2dacd718151dd36c0c35f96cac02e17e4ae6dbb
-#+error-standalone.c0da25634f5bc700ecf05344c49cba1198208774066e16488e305cf0e785f66b
-#+argp-standalone.2085fdd8929b4603177eb50b57410afa613d63a249ccaa2625f3f1a84488abaf
+#+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
 #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp
 #@sha256:eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10:easyseccomp_fix_includes.patch
 #@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
@@ -68,8 +68,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
+#+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
 #@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+skalibs.9c116306190124d4180131a1da17059e59bc15038c0f78f967f0821c71154a63
+#+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
 #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline
 
 
@@ -46,7 +46,7 @@ cd 'execline'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.9c116306190124d4180131a1da17059e59bc15038c0f78f967f0821c71154a63/sysdeps' \
+	--with-sysdeps='/versions/skalibs.8f3de7084813874998086223e969bb8bac426263e91a38ef555eaf0ad86f4a26/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.32c8340da510d38fd23185d7d33531ac1522a6ab72f4dfb2b4f6a0c15c317928
-#+gnu-make.411b4e10d12f074a58a97e9ace0752bfc91edd828e78415c69afd0d71d70b507
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+nawk.f693cc9a360afa00381350243fad82275ec5781c1916597df5ee0072912dea37
-#+skalibs.894b810290c1c41e6115b0ab7fe9264c77096f7c8831e7073e12f60a58825b19
+#+musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
+#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
+#+skalibs.51fd2f76304c28a7c4462038e0f290fd05f2773d7d32cc74b1a96dfd9c41f95c
 #@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.894b810290c1c41e6115b0ab7fe9264c77096f7c8831e7073e12f60a58825b19/sysdeps' \
+	--with-sysdeps='/versions/skalibs.51fd2f76304c28a7c4462038e0f290fd05f2773d7d32cc74b1a96dfd9c41f95c/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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+zsh.8de132d9d29951de50aad1da41d31ab7bb6fc6181f7223790a27e83bf30cf7d5
-#+pthbs-banginstall.41366c70334ffa036a8846c5b8adce50964b72901b9ce3a570cab76f3405b680
+#+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
 #@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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+m4.63af8be5af3779f83406e93230438dc81f2418bef73652510f2478e7b6a2ebd4
+#+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
 #@untar:-J:sha256:1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5:.
 
 
@@ -60,8 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.f693cc9a360afa00381350243fad82275ec5781c1916597df5ee0072912dea37
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+m4.63af8be5af3779f83406e93230438dc81f2418bef73652510f2478e7b6a2ebd4
+#+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
 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
 
 
@@ -60,8 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.32c8340da510d38fd23185d7d33531ac1522a6ab72f4dfb2b4f6a0c15c317928
-#+gnu-make.411b4e10d12f074a58a97e9ace0752bfc91edd828e78415c69afd0d71d70b507
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+nawk.f693cc9a360afa00381350243fad82275ec5781c1916597df5ee0072912dea37
-#+musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gmp.fa91cddb37bb82f7b3ca1a19db4fae25f7c7a7b7bc81d056f0da8df2ae6190ff
-#+mpc.08c23e900434dd4c9704ff821b18eb715d203cf535bd8a571e1bf12a0cb6bdd5
-#+mpfr.c6f5b634fd29ad4f44ff79d1e4f259442aa44ee11cdad8c663dee914f2b030b3
+#+musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
+#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
+#+musl.771c30950c892f46bf06accc9e76f3ba1d9def6aa765b8eb27b5b9bd2c173784
+#+gmp.155e1bf4fd18a05787f8337216e8ae191649fc56bc32a9b404e8cdafaa9ea8ec
+#+mpc.af26e7419d54dde5bf39d321dfd3f596caca97c3a6c273bc56019b99c3c4a0c1
+#+mpfr.0eb8d7edd191d65c58cc1fa186d0b38d3bb3b6754876f22cb7167d29ffe3bd5f
 #@sha256:62eb68290502d54b16457509aa0c3995a84116408e6b593d676b9f4c03b6b160:merged.patch
 #@untar:-J:sha256:e0dc77297625631ac8e50fa92fffefe899a4eb702592da5c32ef04e2293aca3a:.
 
@@ -15,8 +15,8 @@
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
@@ -47,10 +47,10 @@ patch -p1 <../merged.patch
 export TZ=UTC
 export SOURCE_DATE_EPOCH=1748000928
 
-mcm=/versions/musl-cross-make.32c8340da510d38fd23185d7d33531ac1522a6ab72f4dfb2b4f6a0c15c317928
+mcm=/versions/musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
 mcm_bin=$mcm/bin/x86_64-linux-musl
-binutils_cmd=/versions/binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934
-musl=/versions/musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
+binutils_cmd=/versions/binutils.3f071a6b087aef967f5924d2d214fe161bea2f1161f7b26a6641d3811dac2677
+musl=/versions/musl.771c30950c892f46bf06accc9e76f3ba1d9def6aa765b8eb27b5b9bd2c173784
 build_env_static
 
 sysroot="${pthbs_workdir}/sysroot"
diff --git a/variants/root-x86_64/getconf b/variants/root-x86_64/getconf
@@ -1,41 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
+#+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
 #@sha256:d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c:getconf.c
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
diff --git a/variants/root-x86_64/getent b/variants/root-x86_64/getent
@@ -1,41 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
+#+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
 #@sha256:002c1a216f6bed0f816ab1cfebde94a0b127193ef410c36b2190599983e015b8:getent.c
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+m4.63af8be5af3779f83406e93230438dc81f2418bef73652510f2478e7b6a2ebd4
-#+libressl.6827d08fdfbe6fffa98708a502d625310c8207879bb87a70a58c370e71a38564
-#+curl.41f9e7478d3b57303c9b23dc96b2bd47bcd7b90263b4fb1f42a9cb202df35e46
+#+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
 #@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.32c8340da510d38fd23185d7d33531ac1522a6ab72f4dfb2b4f6a0c15c317928
-#+gnu-make.411b4e10d12f074a58a97e9ace0752bfc91edd828e78415c69afd0d71d70b507
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+m4.fbf240f6f38b68ebad61c9856c178ebfe6f66fc6e4feb1fafc2f6575b150e12f
-#+nawk.f693cc9a360afa00381350243fad82275ec5781c1916597df5ee0072912dea37
+#+musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
+#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+m4.d058098030688ce2ed0667b44392bd4ad76c2701f6574040bd81c43e0fab6ffe
+#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
 #@untar:-J:sha256:a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898:.
 
 
@@ -33,8 +33,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.411b4e10d12f074a58a97e9ace0752bfc91edd828e78415c69afd0d71d70b507
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+nawk.f693cc9a360afa00381350243fad82275ec5781c1916597df5ee0072912dea37
+#+musl-cross-make.b30043074842621af7d8ffee676b68eeebf6b7d96d959c99229495bfad426d6a
+#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -32,8 +32,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.32c8340da510d38fd23185d7d33531ac1522a6ab72f4dfb2b4f6a0c15c317928
-#+nawk.f693cc9a360afa00381350243fad82275ec5781c1916597df5ee0072912dea37
+#+musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
+#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -37,7 +37,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'make-4.4.1'
 
 
-mcm=/versions/musl-cross-make.32c8340da510d38fd23185d7d33531ac1522a6ab72f4dfb2b4f6a0c15c317928
+mcm=/versions/musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
 
 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.d6020711dbc027dd194308a4c92f82c594449504111f2b93175a231146289b08
-#+gnu-make.d63240ca6240bc8dade4a9eb74e8f49f2a5b8a9cb582167e02198f216721b316
-#+busybox.9134675065f82f71c419d4947849934fa6c0cbe0de0bda89c4822f5388af3d46
-#+nawk.f693cc9a360afa00381350243fad82275ec5781c1916597df5ee0072912dea37
+#+musl-cross-make.f8a57d7546c64c62e14d1d4b4a09fd10dc77cfc4a37744b75fac6bb5b8bdcb72
+#+gnu-make.99fe3011f86e41833c1116b7b47d2c478ecbacb4f09734045b71df5d0c99534f
+#+busybox.9624330e831e939cd8c151ee92f591249d816c6ccac4d4bcfeaf1ec34c83a4c8
+#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
 #@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.cdea4aca64fb2f6d8681ad283ef9be1a56a0515fc1756d3d02d1d4d97e3d2ee5
+#+musl-cross-make.3a7d0ecaebf339449fdbcf279f0e7a0af8562f98e5d2f4384136f29afa0a0d52
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -30,7 +30,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'make-4.4.1'
 
 
-mcm=/versions/musl-cross-make.cdea4aca64fb2f6d8681ad283ef9be1a56a0515fc1756d3d02d1d4d97e3d2ee5
+mcm=/versions/musl-cross-make.3a7d0ecaebf339449fdbcf279f0e7a0af8562f98e5d2f4384136f29afa0a0d52
 
 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+m4.63af8be5af3779f83406e93230438dc81f2418bef73652510f2478e7b6a2ebd4
+#+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
 #@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:.
 
 
@@ -60,8 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
diff --git a/variants/root-x86_64/iconv b/variants/root-x86_64/iconv
@@ -1,41 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
+#+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
 #@sha256:f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7:iconv.c
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+m4.63af8be5af3779f83406e93230438dc81f2418bef73652510f2478e7b6a2ebd4
+#+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
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 
@@ -61,8 +61,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+m4.63af8be5af3779f83406e93230438dc81f2418bef73652510f2478e7b6a2ebd4
+#+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
 #@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:.
 
 
@@ -60,8 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+m4.63af8be5af3779f83406e93230438dc81f2418bef73652510f2478e7b6a2ebd4
-#+libmd.bf1285ca6538ed40c69a55501364df5786d2a8d149affa20617c823001ccd8b4
+#+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
 #@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:.
 
 
@@ -61,8 +61,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
diff --git a/variants/root-x86_64/libcap b/variants/root-x86_64/libcap
@@ -1,44 +1,44 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+pkgconf-pkg-config.c17df74ecd45509505d695015f50a52d04af411e71fcbaeae36d78fce94714e5
+#+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
 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.32c8340da510d38fd23185d7d33531ac1522a6ab72f4dfb2b4f6a0c15c317928
-#+gnu-make.411b4e10d12f074a58a97e9ace0752bfc91edd828e78415c69afd0d71d70b507
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+nawk.f693cc9a360afa00381350243fad82275ec5781c1916597df5ee0072912dea37
+#+musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
+#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
 #@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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+m4.63af8be5af3779f83406e93230438dc81f2418bef73652510f2478e7b6a2ebd4
-#+flex.59820588bada75994b41d523132689c18833d853f0dcc5f3ea07386eb688dadf
-#+bison.c5eac37cf833471fa226408b8594197c13dec5ee2b27cf6065e0d71e2f9820b3
-#+musl-fts.884ffc9d9340869093f935d9850d4d3cce9a98c963cede5f4132de20e59f7169
+#+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
 #@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:.
 
 
@@ -63,8 +63,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
diff --git a/variants/root-x86_64/libelf b/variants/root-x86_64/libelf
@@ -1,44 +1,44 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+zstd.9e56e29a15a5c102cca43c4a646e71fbad2287d9bebf10e90b44eeae03a57712
+#+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
 #@git:288355d104ff9930520c0283fe82556c6cc5c16f:libelf
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+m4.63af8be5af3779f83406e93230438dc81f2418bef73652510f2478e7b6a2ebd4
+#+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
 #@untar:-J:sha256:1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332:.
 
 
@@ -60,8 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+m4.63af8be5af3779f83406e93230438dc81f2418bef73652510f2478e7b6a2ebd4
-#+ca-certificates-wip-donotuse.0f26b47b4546346bcb5bb2dc1b39cf264149326e02ed13ae47ba89c05f35a738
+#+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
 #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c
 #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:.
 
@@ -62,8 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
@@ -101,7 +101,7 @@ make DESTDIR="$pthbs_destdir" install
 
 cd ..
 gcc ./c_rehash.c -o c_rehash --static -static -I"$pthbs_destdir/$prefix/include" -L"$pthbs_destdir/$prefix/library" -lssl -lcrypto
-cp -vs '/versions/ca-certificates-wip-donotuse.0f26b47b4546346bcb5bb2dc1b39cf264149326e02ed13ae47ba89c05f35a738/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
+cp -vs '/versions/ca-certificates-wip-donotuse.d3f6c89d6c1922a76d0185519377a4d5189a723ff77687cad9d374237c64e0c5/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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+m4.63af8be5af3779f83406e93230438dc81f2418bef73652510f2478e7b6a2ebd4
-#+pkgconf-pkg-config.c17df74ecd45509505d695015f50a52d04af411e71fcbaeae36d78fce94714e5
-#+gperf.5b12f58eb8e728f0b6008ec9f898c955a3c0cc26711c359844227ab447b4f192
+#+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
 #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:.
 
 
@@ -62,8 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+m4.63af8be5af3779f83406e93230438dc81f2418bef73652510f2478e7b6a2ebd4
+#+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
 #@untar:-z:sha256:ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157:.
 
 
@@ -60,8 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-modutils.93d416beb5674f923667d1ea46141f25757bb42a2c6d05d1aa6fdc870e47d38d
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+findutils.e89f105e3728c9b749ed3ed4460c0fc7d25431fef03c3f1a5469d411aba57720
-#+diffutils.f854301a85a3c79d9720218b00cf93548217370d41c4193f3956bd0992ea1b21
-#+patch.a2c1457b8dfa83cf2419f5d96715f718c4509ece6f07a4a35f63dcb9805d4f75
-#+flex.59820588bada75994b41d523132689c18833d853f0dcc5f3ea07386eb688dadf
-#+bison.c5eac37cf833471fa226408b8594197c13dec5ee2b27cf6065e0d71e2f9820b3
-#+rsync.da0d0ceb6305f070da1b9e881db8ada0adef6e6876060eac1f883f3a03589c18
-#+zstd.9e56e29a15a5c102cca43c4a646e71fbad2287d9bebf10e90b44eeae03a57712
-#+libelf.a34b00a7f95742bd3f0ee46ceac8c25377176985c92284c25cc7804669480db1
-#+pkgconf-pkg-config.c17df74ecd45509505d695015f50a52d04af411e71fcbaeae36d78fce94714e5
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
+#+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
 #@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.32c8340da510d38fd23185d7d33531ac1522a6ab72f4dfb2b4f6a0c15c317928
-#+gnu-make.411b4e10d12f074a58a97e9ace0752bfc91edd828e78415c69afd0d71d70b507
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+nawk.f693cc9a360afa00381350243fad82275ec5781c1916597df5ee0072912dea37
-#+skalibs.894b810290c1c41e6115b0ab7fe9264c77096f7c8831e7073e12f60a58825b19
-#+execline.0eb0935639ed55b8948221824f1af13a1df21af537b12b7405e3bcf9441be47a
-#+libcap.694c788eed0aa82c02dd1f4150b1c8dcfcba50ffb61afb794b6269e90601a747
+#+musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
+#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
+#+skalibs.51fd2f76304c28a7c4462038e0f290fd05f2773d7d32cc74b1a96dfd9c41f95c
+#+execline.9daf9a7bdd9682fe29bcbfa885d1af832bc41a23ab3c03147b3f32de809bcc87
+#+libcap.13625f68ef32f55914e874346d14cf327d6cecf239850dbfd25b7f010e29796c
 #@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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+zsh.8de132d9d29951de50aad1da41d31ab7bb6fc6181f7223790a27e83bf30cf7d5
-#+pthbs-banginstall.41366c70334ffa036a8846c5b8adce50964b72901b9ce3a570cab76f3405b680
-#+execline.3e4dd5f034f9acef05c7227b9652d10dc2b6b2cbd79c1ff7b259a653b015f48c
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+ccx-utils.d9aedf1f40e4f17c4abbcf970a5f7218c1808fdb8ae379eb4f0b5275108ab7cd
+#+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
 #@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.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+nawk.f693cc9a360afa00381350243fad82275ec5781c1916597df5ee0072912dea37
+#+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
 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
 
 
@@ -59,8 +59,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.32c8340da510d38fd23185d7d33531ac1522a6ab72f4dfb2b4f6a0c15c317928
-#+gnu-make.411b4e10d12f074a58a97e9ace0752bfc91edd828e78415c69afd0d71d70b507
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+nawk.f693cc9a360afa00381350243fad82275ec5781c1916597df5ee0072912dea37
+#+musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
+#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
 
 
@@ -32,8 +32,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
+#+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
 #@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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+zsh.8de132d9d29951de50aad1da41d31ab7bb6fc6181f7223790a27e83bf30cf7d5
-#+pthbs-banginstall.41366c70334ffa036a8846c5b8adce50964b72901b9ce3a570cab76f3405b680
+#+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
 #@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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+skalibs.9c116306190124d4180131a1da17059e59bc15038c0f78f967f0821c71154a63
-#+execline.3e4dd5f034f9acef05c7227b9652d10dc2b6b2cbd79c1ff7b259a653b015f48c
+#+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
 #@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd
 
 
@@ -47,7 +47,7 @@ cd 'mdevd'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.9c116306190124d4180131a1da17059e59bc15038c0f78f967f0821c71154a63/sysdeps' \
+	--with-sysdeps='/versions/skalibs.8f3de7084813874998086223e969bb8bac426263e91a38ef555eaf0ad86f4a26/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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-dosfstools.98587ba22b6bd601a91a1f5a73c0edc14038129338c475894940780960e07e14
-#+busybox-e2fsprogs.a10bf77d2c72eeb3634fd5b67a791e9f9fd889d3b1e5e8b7bc40f55e29963732
-#+busybox-iproute2.7ecefb8fb6927b73f1589ed3e902b13b74bd0acac724b80da906a8c536cd7601
-#+busybox-iputils.0d709d89f126377720fed0b3b23032834ea833c04bc5660895766f7b3a67c19e
-#+busybox-net-misc.403e058a724e18ffe6ba31d19b49fbe5fdc0c04dd95f9c9d876bb3a57dd59664
-#+busybox-net-tools.2274049da9c55e277412d1c3fba639bbfed81b5ba466d1e2bbb1a3a1e4e05b18
-#+busybox-traceroute.7cdce450f1b62ec7ecbc88d6993842613e3b168cd69d409dec5dc118ce250dff
-#+busybox-wget.4f0aa594e3ce7201ff4efa39bb891af5f82ab6e5b885932204419b0ba1ab6775
-#+busybox-chpst.46d1cccd8950abfa8479022b4ee8c9f30a068004af47943daa7e03505a03a066
-#+busybox-console.d21ec583b723076accbc85c159dd2e644cb169d12964b6c3915b17a094e0ce40
-#+busybox-getty.3d226cb37c1ba7397c8f059f9b380cd35be60b6e27c0ec22b7c3aea2ba010542
+#+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.26fdba68b1a222d8899efba006540dfd9c48e7f2be64e5365c5e8d3232e8c083
-#+busybox-mtd-utils.6271fc72ba6cfd73c8a0321436497efaa6ded2b09a5d69007aefca88bf9cf914
-#+busybox-shadow.adb33086098147ca37d1970d011359ce7e54a1bedce73ec26524a1e47e48308c
-#+busybox-su.d49f13217d1a208d121cd271d25c47363ff7af3031e6229b9ffe344db663c7cc
-#+busybox-util-linux-priv.5f29bd71ed8b27e2bdfcf6582438e331a21742d10464863bedbe135f457c7d52
-#+busybox-logging.0419bbfd02f6955640a6ec1a2171eb801c2498d1f723629f2202379ee7d97a7b
-#+busybox-cron.65d59b41752764cbfde1077008fd9809af79c29f0e7b189c206c328ddc41bbca
-#+execline.3e4dd5f034f9acef05c7227b9652d10dc2b6b2cbd79c1ff7b259a653b015f48c
-#+s6.2c7bc8b422bcc8f405da4f7e8c253464a29cba23e3dd37be59a13d5fae3024ab
-#+mdev-scripts.0136a9787119cb7a97ba9336f33172ee83b7f19fdc5d68e10523b43d9c4d6ada
-#+mdevd.46cd009435bd6036df1de68911a5a73be931123e96e1af33ed95965b650c58ce
-#+busybox-modutils.93d416beb5674f923667d1ea46141f25757bb42a2c6d05d1aa6fdc870e47d38d-
\ No newline at end of file
+#+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
diff --git a/variants/root-x86_64/mlog b/variants/root-x86_64/mlog
@@ -1,42 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
+#+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
 #@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.32c8340da510d38fd23185d7d33531ac1522a6ab72f4dfb2b4f6a0c15c317928
-#+gnu-make.411b4e10d12f074a58a97e9ace0752bfc91edd828e78415c69afd0d71d70b507
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+m4.fbf240f6f38b68ebad61c9856c178ebfe6f66fc6e4feb1fafc2f6575b150e12f
-#+nawk.f693cc9a360afa00381350243fad82275ec5781c1916597df5ee0072912dea37
-#+gmp.fa91cddb37bb82f7b3ca1a19db4fae25f7c7a7b7bc81d056f0da8df2ae6190ff
-#+mpfr.c6f5b634fd29ad4f44ff79d1e4f259442aa44ee11cdad8c663dee914f2b030b3
+#+musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
+#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+m4.d058098030688ce2ed0667b44392bd4ad76c2701f6574040bd81c43e0fab6ffe
+#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
+#+gmp.155e1bf4fd18a05787f8337216e8ae191649fc56bc32a9b404e8cdafaa9ea8ec
+#+mpfr.0eb8d7edd191d65c58cc1fa186d0b38d3bb3b6754876f22cb7167d29ffe3bd5f
 #@untar:-z:sha256:ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8:.
 
 
@@ -35,8 +35,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.32c8340da510d38fd23185d7d33531ac1522a6ab72f4dfb2b4f6a0c15c317928
-#+gnu-make.411b4e10d12f074a58a97e9ace0752bfc91edd828e78415c69afd0d71d70b507
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+m4.fbf240f6f38b68ebad61c9856c178ebfe6f66fc6e4feb1fafc2f6575b150e12f
-#+nawk.f693cc9a360afa00381350243fad82275ec5781c1916597df5ee0072912dea37
-#+gmp.fa91cddb37bb82f7b3ca1a19db4fae25f7c7a7b7bc81d056f0da8df2ae6190ff
+#+musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
+#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+m4.d058098030688ce2ed0667b44392bd4ad76c2701f6574040bd81c43e0fab6ffe
+#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
+#+gmp.155e1bf4fd18a05787f8337216e8ae191649fc56bc32a9b404e8cdafaa9ea8ec
 #@untar:-J:sha256:b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01:.
 
 
@@ -34,8 +34,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.32c8340da510d38fd23185d7d33531ac1522a6ab72f4dfb2b4f6a0c15c317928
-#+gnu-make.411b4e10d12f074a58a97e9ace0752bfc91edd828e78415c69afd0d71d70b507
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+nawk.f693cc9a360afa00381350243fad82275ec5781c1916597df5ee0072912dea37
+#+musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
+#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
 #@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.32c8340da510d38fd23185d7d33531ac1522a6ab72f4dfb2b4f6a0c15c317928
+mcm=/versions/musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
 
 ./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.32c8340da510d38fd23185d7d33531ac1522a6ab72f4dfb2b4f6a0c15c317928
-#+gnu-make.411b4e10d12f074a58a97e9ace0752bfc91edd828e78415c69afd0d71d70b507
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+nawk.f693cc9a360afa00381350243fad82275ec5781c1916597df5ee0072912dea37
+#+musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
+#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
 #@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: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.f693cc9a360afa00381350243fad82275ec5781c1916597df5ee0072912dea37
+#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
 #@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.cdea4aca64fb2f6d8681ad283ef9be1a56a0515fc1756d3d02d1d4d97e3d2ee5
-#+gnu-make.d63240ca6240bc8dade4a9eb74e8f49f2a5b8a9cb582167e02198f216721b316
-#+busybox.9134675065f82f71c419d4947849934fa6c0cbe0de0bda89c4822f5388af3d46
-#+nawk.f693cc9a360afa00381350243fad82275ec5781c1916597df5ee0072912dea37
+#+musl-cross-make.3a7d0ecaebf339449fdbcf279f0e7a0af8562f98e5d2f4384136f29afa0a0d52
+#+gnu-make.99fe3011f86e41833c1116b7b47d2c478ecbacb4f09734045b71df5d0c99534f
+#+busybox.9624330e831e939cd8c151ee92f591249d816c6ccac4d4bcfeaf1ec34c83a4c8
+#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
 #@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.f693cc9a360afa00381350243fad82275ec5781c1916597df5ee0072912dea37
+#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
 #@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,42 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
+#+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
 #@untar:-z:sha256:49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
diff --git a/variants/root-x86_64/nawk b/variants/root-x86_64/nawk
@@ -1,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.f693cc9a360afa00381350243fad82275ec5781c1916597df5ee0072912dea37
-#+bison.c5eac37cf833471fa226408b8594197c13dec5ee2b27cf6065e0d71e2f9820b3
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
+#+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
 #@untar:-z:sha256:e031b1e1d2b230f276f975bffb923f0ea15f798c839d15a3f26a1a39448e32d7:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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,8 +11,8 @@
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
+#+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
 #@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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+m4.63af8be5af3779f83406e93230438dc81f2418bef73652510f2478e7b6a2ebd4
-#+netbsd-curses.84af436de892763e50fb2a451c1cce238d5cceb12e8328cccb8e8e2b994f48ae
+#+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
 #@untar:-z:sha256:755b87aa1e25c24c4c1668de5573d7d9a327b529423ce3ad9ee753bfb2296e33:.
 
 
@@ -61,8 +61,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+ocaml.293f69432db655ea7e83aa8e981fe88e3b4792029babc088b2997a4ddb3daa66
-#+ocaml-findlib.7d12ed462c18c90a62dcc77a4b50b06443e95349a5e074f229c9fac86af038dc
-#+ocamlbuild.4a8ea9848688d212a5fb16beae6433f33147261d6a9681e2d8d8565b9040b92e
-#+opam.6b3519e8aa8ae828170deaae3a0e5ed491d3bd52d487b33709add97c5dd6e675
-#+ocaml-topkg.dd881735911a235e89a91815d0f6a0e771313461d435d963ccc5cfe788604d25
+#+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
 #@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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+ocaml.293f69432db655ea7e83aa8e981fe88e3b4792029babc088b2997a4ddb3daa66
-#+dune.7a65aa17c8dbec478ccf93aafe2fbfd57fd2f88caaf6625d744a65be9b7d8f2c
-#+ocaml_intrinsics_kernel.df9cec7be136092d218144f768ec47460d154bf0a1ec425df733995bf07f4afc
-#+ocaml-sexplib0.064491cd09168023afe78dd38863231a41de98bfd94d4e993c6eafdcb6bfce51
+#+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
 #@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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+ocaml.293f69432db655ea7e83aa8e981fe88e3b4792029babc088b2997a4ddb3daa66
-#+ocaml-findlib.7d12ed462c18c90a62dcc77a4b50b06443e95349a5e074f229c9fac86af038dc
-#+ocamlbuild.4a8ea9848688d212a5fb16beae6433f33147261d6a9681e2d8d8565b9040b92e
-#+opam.6b3519e8aa8ae828170deaae3a0e5ed491d3bd52d487b33709add97c5dd6e675
-#+ocaml-topkg.dd881735911a235e89a91815d0f6a0e771313461d435d963ccc5cfe788604d25
-#+ocaml-astring.ef3d114c600d3a322864cb09829a504aba8b745fb467a821a091c1a921b0650f
-#+ocaml-fpath.1db4f641707b5b52391ac168947d914c3b2db0b525b6f942a942c7f8f2e0f01e
-#+ocaml-rresult.dfcd51e44d3401f2924a71f41ef76a74da8d586de3d90306e734266c61b87462
-#+ocaml-fmt.6da9c81595aaeaa6816b1ca6d180965f09856b093ab804fb96cf2d8d32e66a1e
-#+ocaml-logs.c2e56842fa574b98383a78ee5dd0ace015881d3e4f3a7c8a0330f5bf549c9fed
-#+ocaml-mtime.15a0b5a46722214978b87b2b1594451ce5278d261f5aaa9eb1cdf1a6132a43eb
+#+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
 #@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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+ocaml.293f69432db655ea7e83aa8e981fe88e3b4792029babc088b2997a4ddb3daa66
-#+ocaml-findlib.7d12ed462c18c90a62dcc77a4b50b06443e95349a5e074f229c9fac86af038dc
-#+ocamlbuild.4a8ea9848688d212a5fb16beae6433f33147261d6a9681e2d8d8565b9040b92e
-#+opam.6b3519e8aa8ae828170deaae3a0e5ed491d3bd52d487b33709add97c5dd6e675
-#+ocaml-topkg.dd881735911a235e89a91815d0f6a0e771313461d435d963ccc5cfe788604d25
+#+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
 #@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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+ocaml.293f69432db655ea7e83aa8e981fe88e3b4792029babc088b2997a4ddb3daa66
-#+dune.7a65aa17c8dbec478ccf93aafe2fbfd57fd2f88caaf6625d744a65be9b7d8f2c
+#+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
 #@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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+ocaml.293f69432db655ea7e83aa8e981fe88e3b4792029babc088b2997a4ddb3daa66
-#+dune.7a65aa17c8dbec478ccf93aafe2fbfd57fd2f88caaf6625d744a65be9b7d8f2c
-#+ocamlbuild.4a8ea9848688d212a5fb16beae6433f33147261d6a9681e2d8d8565b9040b92e
+#+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
 #@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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+m4.63af8be5af3779f83406e93230438dc81f2418bef73652510f2478e7b6a2ebd4
-#+netbsd-curses.84af436de892763e50fb2a451c1cce238d5cceb12e8328cccb8e8e2b994f48ae
-#+ocaml.293f69432db655ea7e83aa8e981fe88e3b4792029babc088b2997a4ddb3daa66
-#+ocamlbuild.4a8ea9848688d212a5fb16beae6433f33147261d6a9681e2d8d8565b9040b92e
+#+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
 #@untar:-z:sha256:662c910f774e9fee3a19c4e057f380581ab2fc4ee52da4761304ac9c31b8869d:.
 
 
@@ -53,7 +53,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/versions/musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/versions/musl.771c30950c892f46bf06accc9e76f3ba1d9def6aa765b8eb27b5b9bd2c173784/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.293f69432db655ea7e83aa8e981fe88e3b4792029babc088b2997a4ddb3daa66"
+stdlib="$pthbs_destdir/versions/ocaml.3cef599bb2d79ed5c803ff43addda5097f2deac41baf2541e45e6b3ed3faa7b3"
 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+ocaml.293f69432db655ea7e83aa8e981fe88e3b4792029babc088b2997a4ddb3daa66
-#+ocaml-findlib.7d12ed462c18c90a62dcc77a4b50b06443e95349a5e074f229c9fac86af038dc
-#+ocamlbuild.4a8ea9848688d212a5fb16beae6433f33147261d6a9681e2d8d8565b9040b92e
-#+opam.6b3519e8aa8ae828170deaae3a0e5ed491d3bd52d487b33709add97c5dd6e675
-#+ocaml-topkg.dd881735911a235e89a91815d0f6a0e771313461d435d963ccc5cfe788604d25
-#+ocaml-cmdliner.bc9e8287641877e96e3aafe57cedae139ccb5628245a17102104b455364fdba4
+#+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
 #@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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+ocaml.293f69432db655ea7e83aa8e981fe88e3b4792029babc088b2997a4ddb3daa66
-#+ocaml-findlib.7d12ed462c18c90a62dcc77a4b50b06443e95349a5e074f229c9fac86af038dc
-#+ocamlbuild.4a8ea9848688d212a5fb16beae6433f33147261d6a9681e2d8d8565b9040b92e
-#+opam.6b3519e8aa8ae828170deaae3a0e5ed491d3bd52d487b33709add97c5dd6e675
-#+ocaml-topkg.dd881735911a235e89a91815d0f6a0e771313461d435d963ccc5cfe788604d25
-#+ocaml-astring.ef3d114c600d3a322864cb09829a504aba8b745fb467a821a091c1a921b0650f
+#+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
 #@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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+ocaml.293f69432db655ea7e83aa8e981fe88e3b4792029babc088b2997a4ddb3daa66
-#+ocaml-findlib.7d12ed462c18c90a62dcc77a4b50b06443e95349a5e074f229c9fac86af038dc
-#+ocamlbuild.4a8ea9848688d212a5fb16beae6433f33147261d6a9681e2d8d8565b9040b92e
-#+opam.6b3519e8aa8ae828170deaae3a0e5ed491d3bd52d487b33709add97c5dd6e675
-#+ocaml-topkg.dd881735911a235e89a91815d0f6a0e771313461d435d963ccc5cfe788604d25
-#+ocaml-mtime.15a0b5a46722214978b87b2b1594451ce5278d261f5aaa9eb1cdf1a6132a43eb
-#+ocaml-cmdliner.bc9e8287641877e96e3aafe57cedae139ccb5628245a17102104b455364fdba4
-#+ocaml-fmt.6da9c81595aaeaa6816b1ca6d180965f09856b093ab804fb96cf2d8d32e66a1e
+#+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
 #@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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+ocaml.293f69432db655ea7e83aa8e981fe88e3b4792029babc088b2997a4ddb3daa66
-#+dune.7a65aa17c8dbec478ccf93aafe2fbfd57fd2f88caaf6625d744a65be9b7d8f2c
+#+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
 #@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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+ocaml.293f69432db655ea7e83aa8e981fe88e3b4792029babc088b2997a4ddb3daa66
-#+ocaml-findlib.7d12ed462c18c90a62dcc77a4b50b06443e95349a5e074f229c9fac86af038dc
-#+ocamlbuild.4a8ea9848688d212a5fb16beae6433f33147261d6a9681e2d8d8565b9040b92e
-#+opam.6b3519e8aa8ae828170deaae3a0e5ed491d3bd52d487b33709add97c5dd6e675
-#+ocaml-topkg.dd881735911a235e89a91815d0f6a0e771313461d435d963ccc5cfe788604d25
+#+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
 #@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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+ocaml.293f69432db655ea7e83aa8e981fe88e3b4792029babc088b2997a4ddb3daa66
-#+dune.7a65aa17c8dbec478ccf93aafe2fbfd57fd2f88caaf6625d744a65be9b7d8f2c
+#+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
 #@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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+ocaml.293f69432db655ea7e83aa8e981fe88e3b4792029babc088b2997a4ddb3daa66
-#+dune.7a65aa17c8dbec478ccf93aafe2fbfd57fd2f88caaf6625d744a65be9b7d8f2c
-#+ocaml-compiler-libs.a13312a2fd749fec82f0dba8d523430824759800fb6360048dcde00a566ddbee
-#+ocaml-cppo.6258fd295557be1952a7e012468347d30cd3659db4e71c5f5af54c53f66fd184
-#+ocaml-findlib.7d12ed462c18c90a62dcc77a4b50b06443e95349a5e074f229c9fac86af038dc
-#+ocaml-ppx_derivers.3248c9d0e33861549d380a85181751c734311f14f4e081e20aae809f3bf2f3d5
-#+ocaml-ppxlib.ad328c62a274e40eb4362af249e0e261f93176dca450ab978bbefd21474a07ab
-#+ocaml-sexplib0.064491cd09168023afe78dd38863231a41de98bfd94d4e993c6eafdcb6bfce51
-#+ocaml-stdlib-shims.26cdc7ae9391177f91bc0a755a2d8870b74a3a8bc34117fb68d7325a2882b203
+#+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
 #@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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+ocaml.293f69432db655ea7e83aa8e981fe88e3b4792029babc088b2997a4ddb3daa66
-#+dune.7a65aa17c8dbec478ccf93aafe2fbfd57fd2f88caaf6625d744a65be9b7d8f2c
-#+ocaml-compiler-libs.a13312a2fd749fec82f0dba8d523430824759800fb6360048dcde00a566ddbee
-#+ocaml-ppx_derivers.3248c9d0e33861549d380a85181751c734311f14f4e081e20aae809f3bf2f3d5
-#+ocaml-sexplib0.064491cd09168023afe78dd38863231a41de98bfd94d4e993c6eafdcb6bfce51
-#+ocaml-stdlib-shims.26cdc7ae9391177f91bc0a755a2d8870b74a3a8bc34117fb68d7325a2882b203
+#+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
 #@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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+ocaml.293f69432db655ea7e83aa8e981fe88e3b4792029babc088b2997a4ddb3daa66
-#+ocaml-findlib.7d12ed462c18c90a62dcc77a4b50b06443e95349a5e074f229c9fac86af038dc
-#+ocamlbuild.4a8ea9848688d212a5fb16beae6433f33147261d6a9681e2d8d8565b9040b92e
-#+opam.6b3519e8aa8ae828170deaae3a0e5ed491d3bd52d487b33709add97c5dd6e675
-#+ocaml-topkg.dd881735911a235e89a91815d0f6a0e771313461d435d963ccc5cfe788604d25
+#+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
 #@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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+ocaml.293f69432db655ea7e83aa8e981fe88e3b4792029babc088b2997a4ddb3daa66
-#+dune.7a65aa17c8dbec478ccf93aafe2fbfd57fd2f88caaf6625d744a65be9b7d8f2c
+#+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
 #@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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+ocaml.293f69432db655ea7e83aa8e981fe88e3b4792029babc088b2997a4ddb3daa66
-#+dune.7a65aa17c8dbec478ccf93aafe2fbfd57fd2f88caaf6625d744a65be9b7d8f2c
+#+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
 #@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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+ocaml.293f69432db655ea7e83aa8e981fe88e3b4792029babc088b2997a4ddb3daa66
-#+ocaml-findlib.7d12ed462c18c90a62dcc77a4b50b06443e95349a5e074f229c9fac86af038dc
-#+ocamlbuild.4a8ea9848688d212a5fb16beae6433f33147261d6a9681e2d8d8565b9040b92e
-#+opam.6b3519e8aa8ae828170deaae3a0e5ed491d3bd52d487b33709add97c5dd6e675
+#+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
 #@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.293f69432db655ea7e83aa8e981fe88e3b4792029babc088b2997a4ddb3daa66
-#+dune.7a65aa17c8dbec478ccf93aafe2fbfd57fd2f88caaf6625d744a65be9b7d8f2c
-#+ocamlbuild.4a8ea9848688d212a5fb16beae6433f33147261d6a9681e2d8d8565b9040b92e
-#+ocaml-base.6f1342cf619ef0975b13406f879e9e0b60abc0c317e84fa35a83c99ec4183858
-#+opam.6b3519e8aa8ae828170deaae3a0e5ed491d3bd52d487b33709add97c5dd6e675
-#+ocaml-bos.8474384a9f9fb0714f00f077f16a15c8c0324d8c60c675e50ba9749225e25479
-#+ocaml-lun.388bc14eb5065f75e66dd22974f6f3083f8ca989ff4f9a1a3f37f9f8d431cc50
-#+ocaml-ppx_deriving.5209ac895450aabe145af87e6b0b03ed3c8ad8ffc75299d4c6db49823486a0fd-
\ No newline at end of file
+#+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
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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+m4.63af8be5af3779f83406e93230438dc81f2418bef73652510f2478e7b6a2ebd4
+#+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
 #@untar:-J:sha256:dfaa8a2e11c799bc1765d8bef44911406ee5f4803027190382a939f88c912266:.
 
 
diff --git a/variants/root-x86_64/ocaml_intrinsics_kernel b/variants/root-x86_64/ocaml_intrinsics_kernel
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+ocaml.293f69432db655ea7e83aa8e981fe88e3b4792029babc088b2997a4ddb3daa66
-#+dune.7a65aa17c8dbec478ccf93aafe2fbfd57fd2f88caaf6625d744a65be9b7d8f2c
+#+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
 #@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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+m4.63af8be5af3779f83406e93230438dc81f2418bef73652510f2478e7b6a2ebd4
-#+ocaml.293f69432db655ea7e83aa8e981fe88e3b4792029babc088b2997a4ddb3daa66
+#+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
 #@untar:-z:sha256:2ba6857f2991b7f69368e8db818b163d31cf5a367f15f5953bf8f01a77b3d4fc:.
 
 
@@ -51,7 +51,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/versions/musl.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/versions/musl.771c30950c892f46bf06accc9e76f3ba1d9def6aa765b8eb27b5b9bd2c173784/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.293f69432db655ea7e83aa8e981fe88e3b4792029babc088b2997a4ddb3daa66"
+stdlib="$pthbs_destdir/versions/ocaml.3cef599bb2d79ed5c803ff43addda5097f2deac41baf2541e45e6b3ed3faa7b3"
 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.9134675065f82f71c419d4947849934fa6c0cbe0de0bda89c4822f5388af3d46
-#+nawk.f693cc9a360afa00381350243fad82275ec5781c1916597df5ee0072912dea37
-#+gnu-make.d63240ca6240bc8dade4a9eb74e8f49f2a5b8a9cb582167e02198f216721b316
-#+musl-cross-make.cdea4aca64fb2f6d8681ad283ef9be1a56a0515fc1756d3d02d1d4d97e3d2ee5-
\ No newline at end of file
+#+busybox.9624330e831e939cd8c151ee92f591249d816c6ccac4d4bcfeaf1ec34c83a4c8
+#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
+#+gnu-make.99fe3011f86e41833c1116b7b47d2c478ecbacb4f09734045b71df5d0c99534f
+#+musl-cross-make.3a7d0ecaebf339449fdbcf279f0e7a0af8562f98e5d2f4384136f29afa0a0d52+
\ 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.d6020711dbc027dd194308a4c92f82c594449504111f2b93175a231146289b08
-#+busybox.1198036c14f4ef7de7af989ac544ce7b5d88534962da2cc42d9b5595a86c392e
-#+gnu-make.27f1a16b6c4af273e52ec79cd40929126b33b4e0359d187155f0b0cb4ee56398-
\ No newline at end of file
+#+musl-cross-make.f8a57d7546c64c62e14d1d4b4a09fd10dc77cfc4a37744b75fac6bb5b8bdcb72
+#+busybox.887d2c60c63969374570037aef768a6956781b9330040bf4dfad409f211dea53
+#+gnu-make.f2d80c84e3be014077ece04ffe3a678d0cd258f37035ca9afcc1bf4b74d99c8c+
\ 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+diffutils.f854301a85a3c79d9720218b00cf93548217370d41c4193f3956bd0992ea1b21
-#+patch.a2c1457b8dfa83cf2419f5d96715f718c4509ece6f07a4a35f63dcb9805d4f75
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+getconf.a2249804d64f3e2e0380c43aa78c179534ba5c8ddfb5c57740c6c664d161e63a
-#+ocaml.293f69432db655ea7e83aa8e981fe88e3b4792029babc088b2997a4ddb3daa66
-#+dune.7a65aa17c8dbec478ccf93aafe2fbfd57fd2f88caaf6625d744a65be9b7d8f2c
+#+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
 #@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.7a65aa17c8dbec478ccf93aafe2fbfd57fd2f88caaf6625d744a65be9b7d8f2c/command/dune' \
+	--with-dune='/versions/dune.b95531c089c7ae1ed6c8b5e2f5a7ea3643502a9e133deb3b712c185a253aac8e/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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+m4.63af8be5af3779f83406e93230438dc81f2418bef73652510f2478e7b6a2ebd4
+#+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
 #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:.
 
 
@@ -60,8 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+m4.63af8be5af3779f83406e93230438dc81f2418bef73652510f2478e7b6a2ebd4
+#+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
 #@untar:-J:sha256:3a224f2accf091b77a5781316e27b9ee3ba82c083cc2e539e08940b68a44fec5:.
 
 
@@ -60,8 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+pkgconf.32649a592d86f93f7968a0ae0b039ee3136550bc8d7dc1863be572f48fe0cdb2
+#+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
 
 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+m4.63af8be5af3779f83406e93230438dc81f2418bef73652510f2478e7b6a2ebd4
+#+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
 #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:.
 
 
@@ -60,8 +60,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+zsh.8de132d9d29951de50aad1da41d31ab7bb6fc6181f7223790a27e83bf30cf7d5
+#+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
 #@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.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+nawk.f693cc9a360afa00381350243fad82275ec5781c1916597df5ee0072912dea37
-#+execline.0eb0935639ed55b8948221824f1af13a1df21af537b12b7405e3bcf9441be47a
-#+lnstools.4cd9dc1e63902226eb24b30e6285408ea3a8fa37c5fefd0251f013c6686109ea
-#+sandbox_rootfs.382198fee3635139e88c54e1ce7f7d86827deffed58c97346a35575e18abfe6a
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
+#+execline.9daf9a7bdd9682fe29bcbfa885d1af832bc41a23ab3c03147b3f32de809bcc87
+#+lnstools.9bc9ec5a0e37d86e446308a7fb6a289ee98bafc2529f9b5685b5b46597eb337b
+#+sandbox_rootfs.e32ab59191a6e8de80ac30c308afc087ad815fe828644050575ad1375d6f0d4a
 #@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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+m4.63af8be5af3779f83406e93230438dc81f2418bef73652510f2478e7b6a2ebd4
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+popt.40799a6d2b0164b7d751ff30883e3a6eb0cc0656ec9a9a7ccaef41f433e42b4c
-#+libressl.6827d08fdfbe6fffa98708a502d625310c8207879bb87a70a58c370e71a38564
-#+zstd.9e56e29a15a5c102cca43c4a646e71fbad2287d9bebf10e90b44eeae03a57712
+#+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
 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:.
 
 
@@ -63,8 +63,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+skalibs.9c116306190124d4180131a1da17059e59bc15038c0f78f967f0821c71154a63
-#+execline.3e4dd5f034f9acef05c7227b9652d10dc2b6b2cbd79c1ff7b259a653b015f48c
+#+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
 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6
 
 
@@ -47,7 +47,7 @@ cd 's6'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.9c116306190124d4180131a1da17059e59bc15038c0f78f967f0821c71154a63/sysdeps' \
+	--with-sysdeps='/versions/skalibs.8f3de7084813874998086223e969bb8bac426263e91a38ef555eaf0ad86f4a26/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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+skalibs.9c116306190124d4180131a1da17059e59bc15038c0f78f967f0821c71154a63
+#+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
 #@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns
 
 
@@ -46,7 +46,7 @@ cd 's6-dns'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.9c116306190124d4180131a1da17059e59bc15038c0f78f967f0821c71154a63/sysdeps' \
+	--with-sysdeps='/versions/skalibs.8f3de7084813874998086223e969bb8bac426263e91a38ef555eaf0ad86f4a26/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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+skalibs.9c116306190124d4180131a1da17059e59bc15038c0f78f967f0821c71154a63
-#+execline.3e4dd5f034f9acef05c7227b9652d10dc2b6b2cbd79c1ff7b259a653b015f48c
-#+s6.2c7bc8b422bcc8f405da4f7e8c253464a29cba23e3dd37be59a13d5fae3024ab
+#+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
 #@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.9c116306190124d4180131a1da17059e59bc15038c0f78f967f0821c71154a63/sysdeps' \
+	--with-sysdeps='/versions/skalibs.8f3de7084813874998086223e969bb8bac426263e91a38ef555eaf0ad86f4a26/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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+skalibs.9c116306190124d4180131a1da17059e59bc15038c0f78f967f0821c71154a63
+#+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
 #@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.9c116306190124d4180131a1da17059e59bc15038c0f78f967f0821c71154a63/sysdeps' \
+	--with-sysdeps='/versions/skalibs.8f3de7084813874998086223e969bb8bac426263e91a38ef555eaf0ad86f4a26/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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+skalibs.9c116306190124d4180131a1da17059e59bc15038c0f78f967f0821c71154a63
-#+execline.3e4dd5f034f9acef05c7227b9652d10dc2b6b2cbd79c1ff7b259a653b015f48c
-#+s6.2c7bc8b422bcc8f405da4f7e8c253464a29cba23e3dd37be59a13d5fae3024ab
-#+s6-dns.ecbcd6b629a90c393e2cabc0e0ac1716f622d634c4da72c916a8fe4739687fef
-#+libressl.6827d08fdfbe6fffa98708a502d625310c8207879bb87a70a58c370e71a38564
+#+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
 #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking
 
 
@@ -50,7 +50,7 @@ cd 's6-networking'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.9c116306190124d4180131a1da17059e59bc15038c0f78f967f0821c71154a63/sysdeps' \
+	--with-sysdeps='/versions/skalibs.8f3de7084813874998086223e969bb8bac426263e91a38ef555eaf0ad86f4a26/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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+skalibs.9c116306190124d4180131a1da17059e59bc15038c0f78f967f0821c71154a63
+#+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
 #@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.9c116306190124d4180131a1da17059e59bc15038c0f78f967f0821c71154a63/sysdeps' \
+	--with-sysdeps='/versions/skalibs.8f3de7084813874998086223e969bb8bac426263e91a38ef555eaf0ad86f4a26/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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+skalibs.9c116306190124d4180131a1da17059e59bc15038c0f78f967f0821c71154a63
-#+execline.3e4dd5f034f9acef05c7227b9652d10dc2b6b2cbd79c1ff7b259a653b015f48c
-#+s6.2c7bc8b422bcc8f405da4f7e8c253464a29cba23e3dd37be59a13d5fae3024ab
+#+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
 #@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc
 
 
@@ -48,7 +48,7 @@ cd 's6-rc'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.9c116306190124d4180131a1da17059e59bc15038c0f78f967f0821c71154a63/sysdeps' \
+	--with-sysdeps='/versions/skalibs.8f3de7084813874998086223e969bb8bac426263e91a38ef555eaf0ad86f4a26/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,17 +1,17 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.32c8340da510d38fd23185d7d33531ac1522a6ab72f4dfb2b4f6a0c15c317928
-#+gnu-make.411b4e10d12f074a58a97e9ace0752bfc91edd828e78415c69afd0d71d70b507
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+nawk.f693cc9a360afa00381350243fad82275ec5781c1916597df5ee0072912dea37
-#+skalibs.894b810290c1c41e6115b0ab7fe9264c77096f7c8831e7073e12f60a58825b19
+#+musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
+#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
+#+skalibs.51fd2f76304c28a7c4462038e0f290fd05f2773d7d32cc74b1a96dfd9c41f95c
 #@sha256:8d716caa5ea940bbbb8f68ac0907cea36773c183bd4c1eebad030f6cc7deaec9:argv0exec.c
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.4cd9dc1e63902226eb24b30e6285408ea3a8fa37c5fefd0251f013c6686109ea
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+execline.0eb0935639ed55b8948221824f1af13a1df21af537b12b7405e3bcf9441be47a
-#+sandbox_rootfs.382198fee3635139e88c54e1ce7f7d86827deffed58c97346a35575e18abfe6a
-#+pthbs-sandbox-rootns.41dff4c7103d8d7a97a0364c720ef6f7f09e2f3c3a12fcd7298a3f2a037f0c2b-
\ No newline at end of file
+#+lnstools.9bc9ec5a0e37d86e446308a7fb6a289ee98bafc2529f9b5685b5b46597eb337b
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+execline.9daf9a7bdd9682fe29bcbfa885d1af832bc41a23ab3c03147b3f32de809bcc87
+#+sandbox_rootfs.e32ab59191a6e8de80ac30c308afc087ad815fe828644050575ad1375d6f0d4a
+#+pthbs-sandbox-rootns.fa5bd36eff98d48f338f70e44f88ebd6d877e31721a16aea18c97c7cfcd2376b+
\ 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
+#+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
 #@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.32c8340da510d38fd23185d7d33531ac1522a6ab72f4dfb2b4f6a0c15c317928
-#+gnu-make.411b4e10d12f074a58a97e9ace0752bfc91edd828e78415c69afd0d71d70b507
-#+busybox.3dcaebb29d41a6922a969e285bb6fb556acdb34572e22917fb71c0420c060a4f
-#+nawk.f693cc9a360afa00381350243fad82275ec5781c1916597df5ee0072912dea37
+#+musl-cross-make.8d03ad9476b1e620d7ccc5503ffe78582a12636f9ebde05d34b66f877ef9ff27
+#+gnu-make.01f652b40f2c8a67eb7d6d2611cbdb69209f09f3d7dd0d7820172c8377217993
+#+busybox.9200d635d5b976de1941170df212f1036c463875d0c444adfbb771ef2bb78b37
+#+nawk.87707fde454d90b07dc29cf8b9c876c0868ee89d2789cab6aade2a1a0a200638
 #@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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+zsh.8de132d9d29951de50aad1da41d31ab7bb6fc6181f7223790a27e83bf30cf7d5
-#+pthbs-banginstall.41366c70334ffa036a8846c5b8adce50964b72901b9ce3a570cab76f3405b680
+#+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
 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep
 
 
diff --git a/variants/root-x86_64/squashfs-tools b/variants/root-x86_64/squashfs-tools
@@ -1,45 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+attr.71d0c97847fbcff42a38020356a5623c001e198bb39868dde8afbd0561f08eca
-#+zstd.9e56e29a15a5c102cca43c4a646e71fbad2287d9bebf10e90b44eeae03a57712
+#+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
 #@untar:-z:sha256:4672b5c47d9418d3a5ae5b243defc6d9eae8275b9771022247c6a6082c815914:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+m4.63af8be5af3779f83406e93230438dc81f2418bef73652510f2478e7b6a2ebd4
-#+patch.a2c1457b8dfa83cf2419f5d96715f718c4509ece6f07a4a35f63dcb9805d4f75
-#+libunwind.6130c8985e2a116f184d80ececd9e3cbae3d60c87e1f0f5520bbf80798f6f9b8
+#+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
 #@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch
 #@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:.
 
@@ -63,8 +63,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-dosfstools.98587ba22b6bd601a91a1f5a73c0edc14038129338c475894940780960e07e14
-#+busybox-e2fsprogs.a10bf77d2c72eeb3634fd5b67a791e9f9fd889d3b1e5e8b7bc40f55e29963732
-#+busybox-iproute2.7ecefb8fb6927b73f1589ed3e902b13b74bd0acac724b80da906a8c536cd7601
-#+busybox-iputils.0d709d89f126377720fed0b3b23032834ea833c04bc5660895766f7b3a67c19e
-#+busybox-net-misc.403e058a724e18ffe6ba31d19b49fbe5fdc0c04dd95f9c9d876bb3a57dd59664
-#+busybox-net-tools.2274049da9c55e277412d1c3fba639bbfed81b5ba466d1e2bbb1a3a1e4e05b18
-#+busybox-traceroute.7cdce450f1b62ec7ecbc88d6993842613e3b168cd69d409dec5dc118ce250dff
-#+busybox-wget.4f0aa594e3ce7201ff4efa39bb891af5f82ab6e5b885932204419b0ba1ab6775
-#+busybox-chpst.46d1cccd8950abfa8479022b4ee8c9f30a068004af47943daa7e03505a03a066
-#+busybox-console.d21ec583b723076accbc85c159dd2e644cb169d12964b6c3915b17a094e0ce40
-#+busybox-getty.3d226cb37c1ba7397c8f059f9b380cd35be60b6e27c0ec22b7c3aea2ba010542
-
-#+busybox-linux-extra.26fdba68b1a222d8899efba006540dfd9c48e7f2be64e5365c5e8d3232e8c083
-#+busybox-mtd-utils.6271fc72ba6cfd73c8a0321436497efaa6ded2b09a5d69007aefca88bf9cf914
-#+busybox-shadow.adb33086098147ca37d1970d011359ce7e54a1bedce73ec26524a1e47e48308c
-#+busybox-su.d49f13217d1a208d121cd271d25c47363ff7af3031e6229b9ffe344db663c7cc
-#+busybox-util-linux-priv.5f29bd71ed8b27e2bdfcf6582438e331a21742d10464863bedbe135f457c7d52
-#+busybox-logging.0419bbfd02f6955640a6ec1a2171eb801c2498d1f723629f2202379ee7d97a7b
-#+busybox-cron.65d59b41752764cbfde1077008fd9809af79c29f0e7b189c206c328ddc41bbca
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+diffutils.f854301a85a3c79d9720218b00cf93548217370d41c4193f3956bd0992ea1b21
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+aat.23a2d37cba278ac83d08e2c901e8f249a0e9bcd8b0c85fe74ebb8698505592eb
-#+fileset.7b225733db52e26a46c2f376b7ed4cb9866536cf27ad977b5b5920a5c48db4f1
-#+rsync.da0d0ceb6305f070da1b9e881db8ada0adef6e6876060eac1f883f3a03589c18
-#+execline.3e4dd5f034f9acef05c7227b9652d10dc2b6b2cbd79c1ff7b259a653b015f48c
-#+kbd.e86abb1c5daa4f8dca0599d0cac56da0f4b15a71c42890eb27dae39ffb243fb1
-#+mdevd.46cd009435bd6036df1de68911a5a73be931123e96e1af33ed95965b650c58ce
-#+s6-linux-utils.20d37ed8e0a0ec96bfcc208b52b93d1cae7cfec490ece77d926b14b8309eabc5
-#+s6-rc.43bf54589d21a6b85064587050ce4979802d13790148132e007f654bc9c6092a
-#+s6.2c7bc8b422bcc8f405da4f7e8c253464a29cba23e3dd37be59a13d5fae3024ab
-#+zsh.8de132d9d29951de50aad1da41d31ab7bb6fc6181f7223790a27e83bf30cf7d5
-#+libcgroup.0d07d29e7e7e87bfc2bc8513dd02aea08aea714a635c0e3f385dd784a1ee5088
-#+system-config-scripts.2e0beaea2a3423eb8a071a0c2f000dd87a905482b3c765b1ef8a2bb8e6ace0bc
-#+logincaps.9f87fd3f0cf5083a4620631a6b95edbfd09f3e07b3c04d0f92b25843cfba6c37
-#+busybox-modutils.93d416beb5674f923667d1ea46141f25757bb42a2c6d05d1aa6fdc870e47d38d
+#+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
 #@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.68e0dd225c2f30dad2497a29b1cd9c6ce432887b0723c39f77f7b12181d1ea44' \
-	'pthbs_path_mdevd=/versions/env.310ea22131f6b6d82fe24c7b2678ca2f65eaf5b19d81211624a77d0720afa5ee' \
+	'pthbs_path_containers=/versions/env.cf9c3b06f7f76403524c3143f6178a928cd7755113818bbd681c6aef472261dd' \
+	'pthbs_path_mdevd=/versions/env.ba4e9e9af1e5ed753cba5bc37cf2984bfe8ef764b323ec03c3617a185afc1551' \
 	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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-dosfstools.98587ba22b6bd601a91a1f5a73c0edc14038129338c475894940780960e07e14
-#+busybox-e2fsprogs.a10bf77d2c72eeb3634fd5b67a791e9f9fd889d3b1e5e8b7bc40f55e29963732
-#+busybox-iproute2.7ecefb8fb6927b73f1589ed3e902b13b74bd0acac724b80da906a8c536cd7601
-#+busybox-iputils.0d709d89f126377720fed0b3b23032834ea833c04bc5660895766f7b3a67c19e
-#+busybox-net-misc.403e058a724e18ffe6ba31d19b49fbe5fdc0c04dd95f9c9d876bb3a57dd59664
-#+busybox-net-tools.2274049da9c55e277412d1c3fba639bbfed81b5ba466d1e2bbb1a3a1e4e05b18
-#+busybox-traceroute.7cdce450f1b62ec7ecbc88d6993842613e3b168cd69d409dec5dc118ce250dff
-#+busybox-wget.4f0aa594e3ce7201ff4efa39bb891af5f82ab6e5b885932204419b0ba1ab6775
-#+busybox-chpst.46d1cccd8950abfa8479022b4ee8c9f30a068004af47943daa7e03505a03a066
-#+busybox-console.d21ec583b723076accbc85c159dd2e644cb169d12964b6c3915b17a094e0ce40
-#+busybox-getty.3d226cb37c1ba7397c8f059f9b380cd35be60b6e27c0ec22b7c3aea2ba010542
-
-#+busybox-linux-extra.26fdba68b1a222d8899efba006540dfd9c48e7f2be64e5365c5e8d3232e8c083
-#+busybox-mtd-utils.6271fc72ba6cfd73c8a0321436497efaa6ded2b09a5d69007aefca88bf9cf914
-#+busybox-shadow.adb33086098147ca37d1970d011359ce7e54a1bedce73ec26524a1e47e48308c
-#+busybox-su.d49f13217d1a208d121cd271d25c47363ff7af3031e6229b9ffe344db663c7cc
-#+busybox-util-linux-priv.5f29bd71ed8b27e2bdfcf6582438e331a21742d10464863bedbe135f457c7d52
-#+busybox-logging.0419bbfd02f6955640a6ec1a2171eb801c2498d1f723629f2202379ee7d97a7b
-#+busybox-cron.65d59b41752764cbfde1077008fd9809af79c29f0e7b189c206c328ddc41bbca
-#+s6.2c7bc8b422bcc8f405da4f7e8c253464a29cba23e3dd37be59a13d5fae3024ab
-#+s6-rc.43bf54589d21a6b85064587050ce4979802d13790148132e007f654bc9c6092a
-#+s6-portable-utils.064090e9546e018b6833fc6404691b4b2d2b1a26004cd4fc5ff93c5869ff99ff
-#+s6-linux-init.ce05d6d3a650909642406e5106ca26852898535b6891b0a20ed5d14ba113b36a
-#+execline.3e4dd5f034f9acef05c7227b9652d10dc2b6b2cbd79c1ff7b259a653b015f48c
-#+system-config-rc.4e9eeaeb629adca8e54629a87f65c6d9cb320324b7b1bd7c8324f77d3df23bda
+#+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
 
 
 # - build script start -
@@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-s6rcdb=/versions/system-config-rc.4e9eeaeb629adca8e54629a87f65c6d9cb320324b7b1bd7c8324f77d3df23bda/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.7fe5365ae17253c2b6eac2fb94ec6dd9936c71f718a12eed63aa3f14ad9fe0f3/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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+s6-rc.43bf54589d21a6b85064587050ce4979802d13790148132e007f654bc9c6092a
-#+fileset.7b225733db52e26a46c2f376b7ed4cb9866536cf27ad977b5b5920a5c48db4f1
-#+system-config.ff6af9e8cee7086606defba374b10a867d1b2d9d9cceab623a048800ea956a78
+#+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
 
 
 # - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-src=/versions/system-config.ff6af9e8cee7086606defba374b10a867d1b2d9d9cceab623a048800ea956a78/config/s6-rc-source
+src=/versions/system-config.91e918b82a5be7a19840fdd849061e8a812c398cfa81fd298361825e872975ef/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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+zsh.8de132d9d29951de50aad1da41d31ab7bb6fc6181f7223790a27e83bf30cf7d5
-#+pthbs-banginstall.41366c70334ffa036a8846c5b8adce50964b72901b9ce3a570cab76f3405b680
+#+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
 #@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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+zsh.8de132d9d29951de50aad1da41d31ab7bb6fc6181f7223790a27e83bf30cf7d5
+#+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
 #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh
 
 
diff --git a/variants/root-x86_64/tinyssh b/variants/root-x86_64/tinyssh
@@ -1,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
+#+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
 #@untar:-z:sha256:f3ae622c765db4e0d791ea90a9feba39d7f693ef9cb949a797f7ad6b404a2d61:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.dd5070a72cc0229582a0418767c0302a87a0360ab2b5778ea7fa1b2e1430dba1
-#+gcc.395f282fb70014d27ad644ad563a193cacbe2f2ca0dbe36516e94f68a4343d42
-#+binutils.137eb7b423ed4cbea9cf9a3831544770c4dc57087ee97ac08866e4a1a1cbd934-
\ No newline at end of file
+#+musl.771c30950c892f46bf06accc9e76f3ba1d9def6aa765b8eb27b5b9bd2c173784
+#+gcc.5f46eb64db64effdaeb2a2a79dd978e7fc0b865881ad70031716080ed0ad3cb5
+#+binutils.3f071a6b087aef967f5924d2d214fe161bea2f1161f7b26a6641d3811dac2677+
\ 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+execline.3e4dd5f034f9acef05c7227b9652d10dc2b6b2cbd79c1ff7b259a653b015f48c
-#+pthbs-banginstall.41366c70334ffa036a8846c5b8adce50964b72901b9ce3a570cab76f3405b680
+#+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
 #@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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-dosfstools.98587ba22b6bd601a91a1f5a73c0edc14038129338c475894940780960e07e14
-#+busybox-e2fsprogs.a10bf77d2c72eeb3634fd5b67a791e9f9fd889d3b1e5e8b7bc40f55e29963732
-#+busybox-iproute2.7ecefb8fb6927b73f1589ed3e902b13b74bd0acac724b80da906a8c536cd7601
-#+busybox-iputils.0d709d89f126377720fed0b3b23032834ea833c04bc5660895766f7b3a67c19e
-#+busybox-net-misc.403e058a724e18ffe6ba31d19b49fbe5fdc0c04dd95f9c9d876bb3a57dd59664
-#+busybox-net-tools.2274049da9c55e277412d1c3fba639bbfed81b5ba466d1e2bbb1a3a1e4e05b18
-#+busybox-traceroute.7cdce450f1b62ec7ecbc88d6993842613e3b168cd69d409dec5dc118ce250dff
-#+busybox-wget.4f0aa594e3ce7201ff4efa39bb891af5f82ab6e5b885932204419b0ba1ab6775
-#+busybox-chpst.46d1cccd8950abfa8479022b4ee8c9f30a068004af47943daa7e03505a03a066
-#+busybox-console.d21ec583b723076accbc85c159dd2e644cb169d12964b6c3915b17a094e0ce40
-#+busybox-getty.3d226cb37c1ba7397c8f059f9b380cd35be60b6e27c0ec22b7c3aea2ba010542
+#+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.26fdba68b1a222d8899efba006540dfd9c48e7f2be64e5365c5e8d3232e8c083
-#+busybox-mtd-utils.6271fc72ba6cfd73c8a0321436497efaa6ded2b09a5d69007aefca88bf9cf914
-#+busybox-shadow.adb33086098147ca37d1970d011359ce7e54a1bedce73ec26524a1e47e48308c
-#+busybox-su.d49f13217d1a208d121cd271d25c47363ff7af3031e6229b9ffe344db663c7cc
-#+busybox-util-linux-priv.5f29bd71ed8b27e2bdfcf6582438e331a21742d10464863bedbe135f457c7d52
-#+busybox-logging.0419bbfd02f6955640a6ec1a2171eb801c2498d1f723629f2202379ee7d97a7b
-#+busybox-cron.65d59b41752764cbfde1077008fd9809af79c29f0e7b189c206c328ddc41bbca
-#+attr.71d0c97847fbcff42a38020356a5623c001e198bb39868dde8afbd0561f08eca
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+diffutils.f854301a85a3c79d9720218b00cf93548217370d41c4193f3956bd0992ea1b21
-#+patch.a2c1457b8dfa83cf2419f5d96715f718c4509ece6f07a4a35f63dcb9805d4f75
-#+flex.59820588bada75994b41d523132689c18833d853f0dcc5f3ea07386eb688dadf
-#+bison.c5eac37cf833471fa226408b8594197c13dec5ee2b27cf6065e0d71e2f9820b3
-#+rsync.da0d0ceb6305f070da1b9e881db8ada0adef6e6876060eac1f883f3a03589c18
-#+execline.3e4dd5f034f9acef05c7227b9652d10dc2b6b2cbd79c1ff7b259a653b015f48c
-#+s6.2c7bc8b422bcc8f405da4f7e8c253464a29cba23e3dd37be59a13d5fae3024ab
-#+s6-rc.43bf54589d21a6b85064587050ce4979802d13790148132e007f654bc9c6092a
-#+s6-portable-utils.064090e9546e018b6833fc6404691b4b2d2b1a26004cd4fc5ff93c5869ff99ff
-#+s6-linux-utils.20d37ed8e0a0ec96bfcc208b52b93d1cae7cfec490ece77d926b14b8309eabc5
-#+s6-linux-init.ce05d6d3a650909642406e5106ca26852898535b6891b0a20ed5d14ba113b36a
-#+mdevd.46cd009435bd6036df1de68911a5a73be931123e96e1af33ed95965b650c58ce
-#+s6-dns.ecbcd6b629a90c393e2cabc0e0ac1716f622d634c4da72c916a8fe4739687fef
-#+libressl.6827d08fdfbe6fffa98708a502d625310c8207879bb87a70a58c370e71a38564
-#+s6-networking.b2ee2749129ff17451853f6985e397a4ebdeaedc20cb38c2f141d4c6e7a8265f
-#+zsh.8de132d9d29951de50aad1da41d31ab7bb6fc6181f7223790a27e83bf30cf7d5
-#+pthbs-banginstall.41366c70334ffa036a8846c5b8adce50964b72901b9ce3a570cab76f3405b680
-#+aat.23a2d37cba278ac83d08e2c901e8f249a0e9bcd8b0c85fe74ebb8698505592eb
-#+confz.b411f6e57c5c81a8a6c5045a5b158340a5a24bc5ea8da6f16ab44550c3c9883b
-#+containers.85d43b57d0d90ce44391410117f659a17f60c44ac439321a27823126519d968d
-#+fileset.7b225733db52e26a46c2f376b7ed4cb9866536cf27ad977b5b5920a5c48db4f1
-#+logincaps.9f87fd3f0cf5083a4620631a6b95edbfd09f3e07b3c04d0f92b25843cfba6c37
-#+snaprep.8350a2af15b64b87a7cad4d4abe910a37a31b7f24b312d528c5c99df02b7e919
-#+curl.41f9e7478d3b57303c9b23dc96b2bd47bcd7b90263b4fb1f42a9cb202df35e46
-#+git.a8e67225275ca7b13d1b537bf2d2c03ee2e71ac40249bc19b48127c8c633191c
-#+xbps.131d563fac1c6910ae5e03ba3b31b3fde45f796816491fa038ec3cb7e0b0e539
-#+apk-tools.6b8404c36363fa507b913e8883ce568ff121d0004797ca366b997bf0f9a8de25
-#+getent.914306e8fe1f20998d03eca19c4b0d9158ff9e4c119b2c62537cd3ad4e27129f
-#+getconf.a2249804d64f3e2e0380c43aa78c179534ba5c8ddfb5c57740c6c664d161e63a
-#+iconv.2d19fb8dc5c6ab33cbcfa16f9656587819d709d0fbd361206476915440b4c1ab
-#+libcap.7cb2b5fef97fa3b00202efffa6d24dd409d1a5f177011ebe4a4417bb57304a43
-#+applyuidgid-caps.0652e330f4dba17d4ac30e83bdff8d0307f57fcd616959f4139f996480318619
-#+ccx-utils.d9aedf1f40e4f17c4abbcf970a5f7218c1808fdb8ae379eb4f0b5275108ab7cd
-#+user-env.3fe7d65c473770d1f79a2c3eeac6c877440370f366d0ca910360486757c220c6
-#+strace.056dcaaf1ccb1b728ede8cd0ca09d4cb134ffded75110ca5fed32f8000532cd3
-#+mlog.cb5accd215d87f6d05907986cb760546b1270d46bb252dea3486740408afac1b
-#+findutils.e89f105e3728c9b749ed3ed4460c0fc7d25431fef03c3f1a5469d411aba57720
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+nvi.9d057db979867283de33020893c901c3f1da7166892e2655af6d15b0bca29733
-#+squashfs-tools.17590e2f8d4b55faca1b1822a2e41b35c3bf4b96eb8e61aa3163565b3c5e2ba5
-#+mandoc.0d3becf9228dce20e8ea750f3f2a299466d1778051d5389949035a50b27ce105
-#+tinyssh.d792157f240c6fa9124a4fec24583112b3da0c634e2039181ba6db00f2146ce6-
\ No newline at end of file
+#+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
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.6c3f86553f77e33c9ecf791568eaf9c99073e48cc27b0dd34284c11566e00a9a-
\ No newline at end of file
+#+linux-qemu-guest.ef4cec5f7a8ba34fe90c9fe5d135d26d49a19a3423358da6f258bac995d78adb+
\ No newline at end of file
diff --git a/variants/root-x86_64/xbps b/variants/root-x86_64/xbps
@@ -1,45 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+libarchive.b102314c44243a4f7b3e86622dd8d6e3bf745ded9d27cf201d1b613b7c56fdac
-#+libressl.6827d08fdfbe6fffa98708a502d625310c8207879bb87a70a58c370e71a38564
-#+pkgconf-pkg-config.c17df74ecd45509505d695015f50a52d04af411e71fcbaeae36d78fce94714e5
+#+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
 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 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.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+m4.63af8be5af3779f83406e93230438dc81f2418bef73652510f2478e7b6a2ebd4
-#+netbsd-curses.84af436de892763e50fb2a451c1cce238d5cceb12e8328cccb8e8e2b994f48ae
-#+libbsd.6a55a2429a1608b6ba47c5dc9f6f50c333a7449800b93609bbd23295ff1b33d7
+#+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
 #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config
 #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:.
 
@@ -63,8 +63,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
diff --git a/variants/root-x86_64/zstd b/variants/root-x86_64/zstd
@@ -1,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.f56a4006dc83c032b0fb268678c51575efedb923ecad16c43e42440c826f8dce
-#+busybox-bzip2.816cd1df06e4a3e3e7639539f92aa3efa20903f41352b12dacbf91941c860c19
-#+busybox-gzip.4e0c889122bce5adabd27a46b783a778417f25f14a87d5d7f8114ee429f96ba8
-#+busybox-lzop.dc5825c836471e82f720c3bee2813f70bc2b9c146dadc090bc8ade286d770c0e
-#+busybox-unzip.d7fd9730e89eb146194b0feac49c040e5e277e5ec7290d2bffe3cde1293ab061
-#+busybox-xz.9a723b758538a0d320702f923b77d9a820ba0ea30c08ab84bbe7b8a557b0fa51
-#+busybox-cpio.65d5bd4ef96ffc82e841454c9e9db93ec094fb0efcb6090b9522b4fd8a830e57
-#+busybox-dpkg.63c3e6f66f3c6f8cb74dd5de72e7b2b44925aa569082b60b62a519f5cbdda0e1
-#+busybox-rpm.46454e4d4bb516b86795c4e7405f6e2d4253f22720061b92c8feafbe2c67c2c8
-#+busybox-tar.cdbb7ed495164a394584a564ea18e12f1f34491b18c052b37fae486d390a8e9c
-#+busybox-ed.48b4eac9ad3b1737cbe2c570da132dfb34f409d926614fc7b7dba8e72a73066f
-#+busybox-sed.03a7abbf5681e71330971ff712af6d8ed76a27c7eef0ca8cdde734f85eba2a62
-#+busybox-vi.247aa2cb8a26f8bf9e72329565e535757da9b8c24b0890857bb42de4ded21853
-#+busybox-xxd.5b1480cdf12946247db14be746df99e483866f234aca68f40a849756deaa49c7
-#+busybox-process-extra.5a1fe466ba1a28df010a6c3607bebd44064a6c32d2c40ce0fba17108d25155c9
-#+busybox-procps.1ffb2a6316c9fa6ee1840b55dc00a142ca528142b4dd0359bfd22981e27f5bd5
-#+busybox-psmisc.7a6c6fe5e2767b27ff124ba6fd97ffef0d32b7fab762746d88928f737dff3d5c
-#+busybox-ash.6a80b9194cc55a6875dd4d6f0e83d89023f342b8f14173d0ce0ab890a77a5547
-#+busybox-bc.990e56a6c5dd733b52f84735a4224236c5de36212e64f717662d334fd6601788
-#+busybox-coreutils.d8cdfdc90de0f4d0ca2d8821aefdfc53ac6424336f937b6f28b44ab4bbe9db9d
-#+busybox-coreutils-extra.e47e1d9eb5c714704b6f13c09f53d637ac9095dceb5c7fc0abc6a9a6cbe69079
-#+busybox-daemontools.bfaf6ef439e17d4f285f8ecd32a448e077a5dd1c74576d028a67faf64e64a09e
-#+busybox-grep.aabb0da305ad349741965aa7dd67c0892137475f6c6d6f7c43641e63a3aefe81
-#+busybox-misc.c8b041c28313e82cf0b375a5e5a2a4edbc1d00d46f732722208797254e6ad010
-#+busybox-sh.d9624bc71c2e1e697006db789e1c264e5aa4ede4c23cb3f990d3d64fe10e7eb4
-#+busybox-util-linux-unpriv.02196df55c0ff811a5de9f317c32806403bd808b9f6ce40d26ce5fb0a1ca697a
-#+busybox-findutils.177fea9c63bcb001598ac0ff3094fae92c3cdf8693a06bfc40bb069404d567d6
-#+nawk.0e57f8738d7bc705e3ec6a63692a0141764209930ff994d6824c3c4c384ae1cb
-#+musl-cross-make.0725ca7333c58666f4014a289ae268038c13740b303a3f94ce289dc2ce807784
-#+gnu-make.09d122265acd584180c227917595e5e5ce40bcf08d59aae05137f9e23549e392
-#+busybox-diffutils.aaaf342383aa0f7f9600160abb8330125187b6d8441efda7f00ef489507e16fe
+#+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
 #@untar:-z:sha256:98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
+	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 LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"