mrrl

commit 075a382524f0a6cfa2aa56d2e5259422bfe1394a
parent 61ff1428d3e1abb34de6f57f4447f95bd12c9dab
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Sat,  6 Dec 2025 22:18:47 +0000

bootstrap

Diffstat:
M
templates/functions/build_env_static
 | 
4
++--
M
variants/ccx-x86_64/aat
 | 
60
++++++++++++++++++++++++++++++------------------------------
M
variants/ccx-x86_64/abduco
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/alpine-keys
 | 
56
++++++++++++++++++++++++++++----------------------------
M
variants/ccx-x86_64/apk-tools
 | 
78
+++++++++++++++++++++++++++++++++++++++---------------------------------------
M
variants/ccx-x86_64/applyuidgid-caps
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/argp-standalone
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/attr
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/binutils
 | 
14
+++++++-------
M
variants/ccx-x86_64/bison
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/bootstrap.environment
 | 
8
++++----
M
variants/ccx-x86_64/busybox
 | 
10
+++++-----
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-i2c-tools
 | 
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
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
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
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/certdata2pem
 | 
66
+++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/confz
 | 
60
++++++++++++++++++++++++++++++------------------------------
M
variants/ccx-x86_64/container-bin-image
 | 
112
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/ccx-x86_64/containers
 | 
84
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/ccx-x86_64/containers.environment
 | 
128
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/ccx-x86_64/curl
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/default.environment
 | 
198
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/ccx-x86_64/diffutils
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/dune
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/easyseccomp
 | 
84
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/ccx-x86_64/error-standalone
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/execline
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/execline:bootstrap
 | 
12
++++++------
M
variants/ccx-x86_64/fileset
 | 
60
++++++++++++++++++++++++++++++------------------------------
M
variants/ccx-x86_64/findutils
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/flex
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/gcc
 | 
24
++++++++++++------------
M
variants/ccx-x86_64/getconf
 | 
66
+++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/getent
 | 
66
+++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/git
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/gmp
 | 
14
+++++++-------
M
variants/ccx-x86_64/gnu-make
 | 
16
++++++++--------
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
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/iconv
 | 
66
+++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/kbd
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/kernel.environment
 | 
6
+++---
M
variants/ccx-x86_64/libarchive
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/libbsd
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/libcap
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/libcap:bootstrap
 | 
8
++++----
M
variants/ccx-x86_64/libcgroup
 | 
78
+++++++++++++++++++++++++++++++++++++++---------------------------------------
M
variants/ccx-x86_64/libelf
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/libmd
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/libressl
 | 
76
++++++++++++++++++++++++++++++++++++++--------------------------------------
M
variants/ccx-x86_64/libseccomp
 | 
76
++++++++++++++++++++++++++++++++++++++--------------------------------------
M
variants/ccx-x86_64/libunwind
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/linux
 | 
82
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/ccx-x86_64/linux-qemu-guest
 | 
82
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/ccx-x86_64/lnstools:bootstrap
 | 
14
+++++++-------
M
variants/ccx-x86_64/logincaps
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/m4
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/m4:bootstrap
 | 
12
++++++------
M
variants/ccx-x86_64/mandoc
 | 
66
+++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/mdev-scripts
 | 
60
++++++++++++++++++++++++++++++------------------------------
M
variants/ccx-x86_64/mdevd
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/mdevd.environment
 | 
102
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/ccx-x86_64/mlog
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
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
 | 
6
+++---
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
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/nawk
 | 
66
+++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/nawk:bootstrap
 | 
4
++--
M
variants/ccx-x86_64/netbsd-curses
 | 
64
++++++++++++++++++++++++++++++++--------------------------------
M
variants/ccx-x86_64/nvi
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/ocaml-astring
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/ocaml-base
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/ocaml-bos
 | 
86
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/ccx-x86_64/ocaml-cmdliner
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/ocaml-compiler-libs
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/ocaml-cppo
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/ocaml-findlib
 | 
78
+++++++++++++++++++++++++++++++++++++++---------------------------------------
M
variants/ccx-x86_64/ocaml-fmt
 | 
76
++++++++++++++++++++++++++++++++++++++--------------------------------------
M
variants/ccx-x86_64/ocaml-fpath
 | 
76
++++++++++++++++++++++++++++++++++++++--------------------------------------
M
variants/ccx-x86_64/ocaml-logs
 | 
80
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/ccx-x86_64/ocaml-lun
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/ocaml-mtime
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/ocaml-ppx_derivers
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/ocaml-ppx_deriving
 | 
82
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/ccx-x86_64/ocaml-ppxlib
 | 
76
++++++++++++++++++++++++++++++++++++++--------------------------------------
M
variants/ccx-x86_64/ocaml-rresult
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/ocaml-sexplib0
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/ocaml-stdlib-shims
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/ocaml-topkg
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/ocaml.environment
 | 
18
+++++++++---------
M
variants/ccx-x86_64/ocaml:dynlink
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/ocaml_intrinsics_kernel
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/ocamlbuild
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/oldbootstrap.environment
 | 
10
+++++-----
M
variants/ccx-x86_64/oldsystem.environment
 | 
8
++++----
M
variants/ccx-x86_64/opam
 | 
76
++++++++++++++++++++++++++++++++++++++--------------------------------------
M
variants/ccx-x86_64/patch
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/pkgconf
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/pkgconf-pkg-config
 | 
54
+++++++++++++++++++++++++++---------------------------
M
variants/ccx-x86_64/popt
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/pthbs-banginstall
 | 
58
+++++++++++++++++++++++++++++-----------------------------
M
variants/ccx-x86_64/pthbs-sandbox-rootns
 | 
10
+++++-----
M
variants/ccx-x86_64/rsync
 | 
78
+++++++++++++++++++++++++++++++++++++++---------------------------------------
M
variants/ccx-x86_64/s6
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/s6-dns
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/s6-linux-init
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/s6-linux-utils
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/s6-networking
 | 
76
++++++++++++++++++++++++++++++++++++++--------------------------------------
M
variants/ccx-x86_64/s6-portable-utils
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/s6-rc
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/sandbox_rootfs
 | 
14
+++++++-------
M
variants/ccx-x86_64/sandbox_rootns.environment
 | 
8
++++----
M
variants/ccx-x86_64/skalibs
 | 
64
++++++++++++++++++++++++++++++++--------------------------------
M
variants/ccx-x86_64/skalibs:bootstrap
 | 
8
++++----
M
variants/ccx-x86_64/snaprep
 | 
60
++++++++++++++++++++++++++++++------------------------------
M
variants/ccx-x86_64/squashfs-tools
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/strace
 | 
76
++++++++++++++++++++++++++++++++++++++--------------------------------------
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
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/toolchain.environment
 | 
8
++++----
M
variants/ccx-x86_64/user-env
 | 
60
++++++++++++++++++++++++++++++------------------------------
M
variants/ccx-x86_64/userspace.environment
 | 
186
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/ccx-x86_64/vm.environment
 | 
4
++--
M
variants/ccx-x86_64/xbps
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/zsh
 | 
76
++++++++++++++++++++++++++++++++++++++--------------------------------------
M
variants/ccx-x86_64/zstd
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/aat
 | 
60
++++++++++++++++++++++++++++++------------------------------
M
variants/root-x86_64/abduco
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/alpine-keys
 | 
56
++++++++++++++++++++++++++++----------------------------
M
variants/root-x86_64/apk-tools
 | 
78
+++++++++++++++++++++++++++++++++++++++---------------------------------------
M
variants/root-x86_64/applyuidgid-caps
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/argp-standalone
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/attr
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/binutils
 | 
14
+++++++-------
M
variants/root-x86_64/bison
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/bootstrap.environment
 | 
8
++++----
M
variants/root-x86_64/busybox
 | 
10
+++++-----
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-i2c-tools
 | 
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
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/certdata2pem
 | 
66
+++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/confz
 | 
60
++++++++++++++++++++++++++++++------------------------------
M
variants/root-x86_64/container-bin-image
 | 
112
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/root-x86_64/containers
 | 
84
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/root-x86_64/containers.environment
 | 
128
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/root-x86_64/curl
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/default.environment
 | 
198
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/root-x86_64/diffutils
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/dune
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/easyseccomp
 | 
84
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/root-x86_64/error-standalone
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/execline
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/execline:bootstrap
 | 
12
++++++------
M
variants/root-x86_64/fileset
 | 
60
++++++++++++++++++++++++++++++------------------------------
M
variants/root-x86_64/findutils
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/flex
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/gcc
 | 
24
++++++++++++------------
M
variants/root-x86_64/getconf
 | 
66
+++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/getent
 | 
66
+++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/git
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/gmp
 | 
14
+++++++-------
M
variants/root-x86_64/gnu-make
 | 
16
++++++++--------
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
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/iconv
 | 
66
+++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/kbd
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/libarchive
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/libbsd
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/libcap
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/libcap:bootstrap
 | 
8
++++----
M
variants/root-x86_64/libcgroup
 | 
78
+++++++++++++++++++++++++++++++++++++++---------------------------------------
M
variants/root-x86_64/libelf
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/libmd
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/libressl
 | 
76
++++++++++++++++++++++++++++++++++++++--------------------------------------
M
variants/root-x86_64/libseccomp
 | 
76
++++++++++++++++++++++++++++++++++++++--------------------------------------
M
variants/root-x86_64/libunwind
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/linux-qemu-guest
 | 
82
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/root-x86_64/lnstools:bootstrap
 | 
14
+++++++-------
M
variants/root-x86_64/logincaps
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/m4
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/m4:bootstrap
 | 
12
++++++------
M
variants/root-x86_64/mandoc
 | 
66
+++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/mdev-scripts
 | 
60
++++++++++++++++++++++++++++++------------------------------
M
variants/root-x86_64/mdevd
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/mdevd.environment
 | 
102
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/root-x86_64/mlog
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
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
 | 
6
+++---
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
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/nawk
 | 
66
+++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/nawk:bootstrap
 | 
4
++--
M
variants/root-x86_64/netbsd-curses
 | 
64
++++++++++++++++++++++++++++++++--------------------------------
M
variants/root-x86_64/nvi
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/ocaml-astring
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/ocaml-base
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/ocaml-bos
 | 
86
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/root-x86_64/ocaml-cmdliner
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/ocaml-compiler-libs
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/ocaml-cppo
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/ocaml-findlib
 | 
78
+++++++++++++++++++++++++++++++++++++++---------------------------------------
M
variants/root-x86_64/ocaml-fmt
 | 
76
++++++++++++++++++++++++++++++++++++++--------------------------------------
M
variants/root-x86_64/ocaml-fpath
 | 
76
++++++++++++++++++++++++++++++++++++++--------------------------------------
M
variants/root-x86_64/ocaml-logs
 | 
80
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/root-x86_64/ocaml-lun
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/ocaml-mtime
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/ocaml-ppx_derivers
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/ocaml-ppx_deriving
 | 
82
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/root-x86_64/ocaml-ppxlib
 | 
76
++++++++++++++++++++++++++++++++++++++--------------------------------------
M
variants/root-x86_64/ocaml-rresult
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/ocaml-sexplib0
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/ocaml-stdlib-shims
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/ocaml-topkg
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/ocaml.environment
 | 
18
+++++++++---------
M
variants/root-x86_64/ocaml:dynlink
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/ocaml_intrinsics_kernel
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/ocamlbuild
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/oldbootstrap.environment
 | 
10
+++++-----
M
variants/root-x86_64/oldsystem.environment
 | 
8
++++----
M
variants/root-x86_64/opam
 | 
76
++++++++++++++++++++++++++++++++++++++--------------------------------------
M
variants/root-x86_64/patch
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/pkgconf
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/pkgconf-pkg-config
 | 
54
+++++++++++++++++++++++++++---------------------------
M
variants/root-x86_64/popt
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/pthbs-banginstall
 | 
58
+++++++++++++++++++++++++++++-----------------------------
M
variants/root-x86_64/pthbs-sandbox-rootns
 | 
10
+++++-----
M
variants/root-x86_64/rsync
 | 
78
+++++++++++++++++++++++++++++++++++++++---------------------------------------
M
variants/root-x86_64/s6
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/s6-dns
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/s6-linux-init
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/s6-linux-utils
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/s6-networking
 | 
76
++++++++++++++++++++++++++++++++++++++--------------------------------------
M
variants/root-x86_64/s6-portable-utils
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/s6-rc
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/sandbox_rootfs
 | 
14
+++++++-------
M
variants/root-x86_64/sandbox_rootns.environment
 | 
8
++++----
M
variants/root-x86_64/skalibs
 | 
64
++++++++++++++++++++++++++++++++--------------------------------
M
variants/root-x86_64/skalibs:bootstrap
 | 
8
++++----
M
variants/root-x86_64/snaprep
 | 
60
++++++++++++++++++++++++++++++------------------------------
M
variants/root-x86_64/squashfs-tools
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/strace
 | 
76
++++++++++++++++++++++++++++++++++++++--------------------------------------
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
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/toolchain.environment
 | 
8
++++----
M
variants/root-x86_64/user-env
 | 
60
++++++++++++++++++++++++++++++------------------------------
M
variants/root-x86_64/userspace.environment
 | 
186
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/root-x86_64/vm.environment
 | 
4
++--
M
variants/root-x86_64/xbps
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/zsh
 | 
76
++++++++++++++++++++++++++++++++++++++--------------------------------------
M
variants/root-x86_64/zstd
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------

378 files changed, 8340 insertions(+), 8340 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=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/{{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.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+zsh.ee349aab3a21daf6db99d54262751751665b54037d11b1d899a68ae234bf1dbb
-#+pthbs-banginstall.af55b280ba52f0bc586b9401c4249d98f16181f53075a6164df9bf623fa0b6f6
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+zsh.c18cb977aed1960f5d8dbc037d4a593cd76c6f427dbcac528cfc5396faa22c95
+#+pthbs-banginstall.5e06e2e7e8bbdb1ce1fc8f5bfff237bc4aa4216a693288af5542d309bbc33cfb
 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat
 
 
diff --git a/variants/ccx-x86_64/abduco b/variants/ccx-x86_64/abduco
@@ -1,45 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
 #@git:8c32909a159aaa9484c82b71f05b7a73321eb491:abduco
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
 #@git:c7b36ed27103ee3f9aa01905ba1fac2d606079cf:alpine-keys
 
 
diff --git a/variants/ccx-x86_64/apk-tools b/variants/ccx-x86_64/apk-tools
@@ -1,41 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+patch.88eb6fdfb3d7c4f06a0b07eeaf01a98d7a76514513d1bf315b15641b13f65d89
-#+libressl.eb59c31f4d7d554558bbebc0cd49ca5506d1719675d3bfb85f75c58a39209769
-#+zstd.1569f38bd278d090a1b5e64f314bea51347ea0be2036cb7baf1b3d2a47c7b915
-#+pkgconf-pkg-config.751fa6d0cec8733f5f6f87a764ecb38665e08371b66220bfb8f4337c43467ceb
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+patch.e9a7ef2dff4418f508b5904ad3d1ca1cfeab715d66e64f90aa92ef611ba9b91d
+#+libressl.e7ddd3146693cfd7ded9b86eb6fe85adb21eb314ad6ad5cad17285dbdf2349cb
+#+zstd.9dec917aa5ba4aa34436cb4d6b49b09398784ac819e04fa89bf4449afe7babce
+#+pkgconf-pkg-config.c15392f5ccbe7242db2b1a726068d860e1c7728516554d4e07de10b5ce6f0cce
 #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch
 #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools
 
@@ -43,8 +43,8 @@
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,45 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+skalibs.a48948090ab54ec83826836c1ac62c695ce7d0ee5e4796e2d4f5440b09958e36
-#+libcap.750cbbdb22c88c8210b5a729f4103d9966edec5300f54836cb1e7b8b5dabb3c7
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+skalibs.d463d1a0670a2e946091d17cd63f183d01e49f1a90ee26bf3668671bbe65f1c3
+#+libcap.854415ab12199c235370336a17e3fa5444433054117bdbc78c7b5f11ec33dc1a
 #@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+m4.b00a09f5b43913f8946dba11c3723b43861682d7388e2450c29008fd06410a9b
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+m4.fb13925f91290359b578e4c460aa68463e98bf8b7ba9d7544f772411b3560dfa
 #@untar:-z:sha256:c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6:.
 #@untar::sha256:a4facc0856b512ad8ab5aed7b07e14a9629aaf042b1e92377ba22fcfc4c4205b:argp-standalone-1.5.0
 
diff --git a/variants/ccx-x86_64/attr b/variants/ccx-x86_64/attr
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+m4.b00a09f5b43913f8946dba11c3723b43861682d7388e2450c29008fd06410a9b
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+m4.fb13925f91290359b578e4c460aa68463e98bf8b7ba9d7544f772411b3560dfa
 #@untar:-z:sha256:39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87:.
 
 
@@ -62,8 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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.fe5b8fb14a97368eeb9a18695bc5e42b89b89cc1918e73925b341f2d5174badd
-#+gnu-make.32f731a10e47dcd22d87f98a23e1584ec1cd16e42934c425a64a879a721b42c1
-#+busybox.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+m4.497542688b61fc8003159e488f389b851343aa4c0b9d1ac56802354f41a51e2a
-#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
+#+musl-cross-make.4822b5d4510d4789a1d2bbaf35ccec858fceca577a876b12a41f58c9f3564903
+#+gnu-make.83b64092bf223a05632a95eacc87603af46b6fe80e7ea8a421d56971ae58994e
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+m4.150cb17ee7a9dc8cc25d1e93e85e9c4386714c0f9074001244a7de2f8fa5778d
+#+nawk.133881466458aeb9ec5ae77ee85d226125bf174c340683c9455d9668d915c65f
 #@sha256:a119e7e50cae23feaad160a533d69a90073a519521924da56abc74724cec65c6:merged.patch
 #@untar:-z:sha256:0cdd76777a0dfd3dd3a63f215f030208ddb91c2361d2bcc02acec0f1c16b6a2e:.
 
@@ -34,8 +34,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+m4.b00a09f5b43913f8946dba11c3723b43861682d7388e2450c29008fd06410a9b
-#+flex.62db98abe810d7e7101d2fc7b345620f25ed2b014aa9b3edcfc9cbcd81576cad
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.133881466458aeb9ec5ae77ee85d226125bf174c340683c9455d9668d915c65f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+m4.fb13925f91290359b578e4c460aa68463e98bf8b7ba9d7544f772411b3560dfa
+#+flex.3d914abbd2a9680ad091088e45500d9be2f4e210f8adb5c1aeda5c8217e254f2
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 
@@ -64,8 +64,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+gnu-make.32f731a10e47dcd22d87f98a23e1584ec1cd16e42934c425a64a879a721b42c1
-#+musl-cross-make.fe5b8fb14a97368eeb9a18695bc5e42b89b89cc1918e73925b341f2d5174badd-
\ No newline at end of file
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+gnu-make.83b64092bf223a05632a95eacc87603af46b6fe80e7ea8a421d56971ae58994e
+#+musl-cross-make.4822b5d4510d4789a1d2bbaf35ccec858fceca577a876b12a41f58c9f3564903+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/busybox b/variants/ccx-x86_64/busybox
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.32f731a10e47dcd22d87f98a23e1584ec1cd16e42934c425a64a879a721b42c1
-#+busybox.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.83b64092bf223a05632a95eacc87603af46b6fe80e7ea8a421d56971ae58994e
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
 #@sha256:31b8f61d2173fa36d4409e8e91f52088691d6ba4db13efe19ea7ae7512e64275: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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/busybox-i2c-tools b/variants/ccx-x86_64/busybox-i2c-tools
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
 
 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.fe5b8fb14a97368eeb9a18695bc5e42b89b89cc1918e73925b341f2d5174badd
-#+gnu-make.32f731a10e47dcd22d87f98a23e1584ec1cd16e42934c425a64a879a721b42c1
-#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
+#+musl-cross-make.4822b5d4510d4789a1d2bbaf35ccec858fceca577a876b12a41f58c9f3564903
+#+gnu-make.83b64092bf223a05632a95eacc87603af46b6fe80e7ea8a421d56971ae58994e
+#+nawk.133881466458aeb9ec5ae77ee85d226125bf174c340683c9455d9668d915c65f
 #@git:8d7ae80eda7e08ee361f8793683ae58216caf720:busybox
 #@sha256:13ed92216aef70e6fc431b2e66a9b20a71b5f4b69a3d7a84acbc4d1210d6ea6a:busybox/.config
 
 PATH="$pthbs_build_environment/command:$PATH"
-mcm=/home/ccx/versions/musl-cross-make.fe5b8fb14a97368eeb9a18695bc5e42b89b89cc1918e73925b341f2d5174badd
-make=/home/ccx/versions/gnu-make.32f731a10e47dcd22d87f98a23e1584ec1cd16e42934c425a64a879a721b42c1
+mcm=/home/ccx/versions/musl-cross-make.4822b5d4510d4789a1d2bbaf35ccec858fceca577a876b12a41f58c9f3564903
+make=/home/ccx/versions/gnu-make.83b64092bf223a05632a95eacc87603af46b6fe80e7ea8a421d56971ae58994e
 
 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,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+linux-qemu-guest.515bfeca53caf2766343387ff811a6f287987d7ca360fb59a243a7d551969e52
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
+#+linux-qemu-guest.4f819c31d741260c030178bedb5ffb1b4af6791891d8acae94ade509e983f204
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
 #@sha256:ccb459010923e1a9b49cb39d45bc93d0fc8749acea6efd7b19cfb00e76a5562e:busybox/.config
 #@git:3621595939e43a831d66f6b757d4f410029bff95:busybox
 
@@ -62,7 +62,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.515bfeca53caf2766343387ff811a6f287987d7ca360fb59a243a7d551969e52"
+CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux-qemu-guest.4f819c31d741260c030178bedb5ffb1b4af6791891d8acae94ade509e983f204"
 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.3e9a10d515ab8608f8eda7125d1b223da285a62e85a87a56be316a539821605c
-#+gnu-make.aa211b51bd7f8182794c40f039947bdf19ade8460ebfc071f9f33e6fb91a968e
-#+busybox.5792386228c725ccfeffe301dd3918f307e1f4d1391f7bdef45910089bdea8cc
-#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
+#+musl-cross-make.994dc371f73f122cbdd8222bcaa5686ac53d16fcc70e15ebca11e0182682ea59
+#+gnu-make.f3cf710c2b4871789f1b4d5ee4aea115fc579185d1b9d1a4b64f76f5032f0a12
+#+busybox.4f65f9428816f38411fe246d2b3d20e096986db501a16cdd561b7813bcde1119
+#+nawk.133881466458aeb9ec5ae77ee85d226125bf174c340683c9455d9668d915c65f
 #@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.e4db999a4586836d858df99d45eee1aaa59d4fed1a5fa24f0365db08cddb59de
-#+gnu-make.aa211b51bd7f8182794c40f039947bdf19ade8460ebfc071f9f33e6fb91a968e
+#+musl-cross-make.dde976ac2e04234c87656960596a2ae9e59c087f47b0cd218cb40a397225f2fc
+#+gnu-make.f3cf710c2b4871789f1b4d5ee4aea115fc579185d1b9d1a4b64f76f5032f0a12
 #@git:8d7ae80eda7e08ee361f8793683ae58216caf720:busybox
 #@sha256:13ed92216aef70e6fc431b2e66a9b20a71b5f4b69a3d7a84acbc4d1210d6ea6a:busybox/.config
 
-mcm=/home/ccx/versions/musl-cross-make.e4db999a4586836d858df99d45eee1aaa59d4fed1a5fa24f0365db08cddb59de
-make=/home/ccx/versions/gnu-make.aa211b51bd7f8182794c40f039947bdf19ade8460ebfc071f9f33e6fb91a968e
+mcm=/home/ccx/versions/musl-cross-make.dde976ac2e04234c87656960596a2ae9e59c087f47b0cd218cb40a397225f2fc
+make=/home/ccx/versions/gnu-make.f3cf710c2b4871789f1b4d5ee4aea115fc579185d1b9d1a4b64f76f5032f0a12
 
 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.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+certdata2pem.d00ef5c64724f9090a3ec7f4491f9fa5d05811ec7d1b3572bd5ee1fbb83cd0dd
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+certdata2pem.d5994279519baa0f10a5938b5f48a35098b30ea30f0abd2aaa3c288ea6193953
 #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:.
 
 
diff --git a/variants/ccx-x86_64/ccx-utils b/variants/ccx-x86_64/ccx-utils
@@ -1,46 +1,46 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+skalibs.a48948090ab54ec83826836c1ac62c695ce7d0ee5e4796e2d4f5440b09958e36
-#+s6.8deb9ec8d0a8ae11e26d257dc2758926f4ba6a06878bf4a41d8d4a6d7f92d8a9
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+skalibs.d463d1a0670a2e946091d17cd63f183d01e49f1a90ee26bf3668671bbe65f1c3
+#+s6.77d8e9da89a1d70ee688f4c300822b34e58c8a29852a438a94af602c1a6b0a79
 #@git:461a9ec198c1e2b9c39a34e21786747dbb8671b4:ccx-utils
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
 #@sha256:064f7d41106cd9efa08b9e68cf049f44e3be55666bd2ab96d02c508293b8dce7:certdata2pem.c
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+zsh.ee349aab3a21daf6db99d54262751751665b54037d11b1d899a68ae234bf1dbb
-#+pthbs-banginstall.af55b280ba52f0bc586b9401c4249d98f16181f53075a6164df9bf623fa0b6f6
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+zsh.c18cb977aed1960f5d8dbc037d4a593cd76c6f427dbcac528cfc5396faa22c95
+#+pthbs-banginstall.5e06e2e7e8bbdb1ce1fc8f5bfff237bc4aa4216a693288af5542d309bbc33cfb
 #@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.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-dosfstools.16727cc8658113bb122138369782454da365b3b58a836c3d121dc1e33715e959
-#+busybox-e2fsprogs.43d5502e98949ae562201994091cca87fe4d8615fd3fd2117d8516255cb0b7a0
-#+busybox-iproute2.d5c34edb1340261d45f3ac4fda2a8540ad08e332c9add318409bb16297a64a77
-#+busybox-iputils.435e53d6548bb9e0703642319c1d31b8f246352d1547e3bc54dff31e6b717859
-#+busybox-net-misc.a400a88a61fc252c78ae2d47505607aae84055b1ae2dab52e55f74dc1a512073
-#+busybox-net-tools.fab6319189927d49c0d71246013e5202404e491236d85a3840595193413daa7b
-#+busybox-traceroute.cc7d0f8f408c0dd5eab7570633c8641e3ae08a612b03ebb605bce40f5bcc2efa
-#+busybox-wget.96f8f9a1207c82f19600b61ea3270ccf89dcb5692b183b280f7b3a0483fbe0c6
-#+busybox-chpst.0381a6f70ba800567f5c083be6270b8da1c6a878b790012a6d3920ea88ed4d3e
-#+busybox-console.f260f339ee8cbfe2bed840f9e1343045e5ee12ea7b812363c50e6c1c45724a4d
-#+busybox-getty.24925a5face8b6448b0a3c29ee42d85f2ce47b21af4bb3b781656ceb2f45c060
-#+busybox-i2c-tools.ba0a5d246fba4448fa37a815e47f37915ff4e5bbed1ac680bcce7e1d92c5a931
-#+busybox-linux-extra.48c450436c3bd540ebce5857ad85f19f4097aed01b22a4fcc4b9ef246715439c
-#+busybox-mtd-utils.0baa7458d448b7a719f2f883ca916a6781981b74786f0edf14b612e65d11a92a
-#+busybox-shadow.cb4254ceafadee6a474304f2f77dee0b349d2dfff1f1f686e386e87873fcb595
-#+busybox-su.5d1429cfdb62a73fc3f75ee167dd40b9d4a4e29ac7b3b839d0c7b6c123b055a7
-#+busybox-util-linux-priv.24ef8c2b2da97c4a268bfcec6537473d2e2d972d3ebe12d514b5de2f9aadfa2a
-#+busybox-logging.ba514b3e11c5d85bc981300ac4d899f78a94726c06eb4f0e77e98b565e55aaad
-#+busybox-cron.37460c5454992ef69ee8b315bf37867776bbac7f4029bcd2dff830d473ca9196
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+busybox-login.2622abab7fc2752c609bf5279754d5353f2614f8d2bd9b389f62317ad36c160d
-#+execline.bbec26b2169c46f9f28f532eef839794ce7b806f9d3f0cac9f0366fe75ee44df
-#+s6.8deb9ec8d0a8ae11e26d257dc2758926f4ba6a06878bf4a41d8d4a6d7f92d8a9
-#+ccx-utils.f1c96c79afebfd4e56350bac185e0c523abe8cd99f47c712e85edfcb46a447ed
-#+applyuidgid-caps.68601a6edc0e5c1c2fa48b5426eb5e48d84f9ace08e929a4a2acbeb58912c65d
-#+easyseccomp.614e6e64e249fe7329411418a140cb07e8240db84db30ff922165e6031ec368a
-#+mlog.a9e77a44eb9c981900a45b452e8e3e8fed94deb71f596166eae43eb5c3dd7c44
-#+abduco.743bae89f2747270b62a3845d7269b13d0168975c77880afb4bd35f77aec64e7
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-dosfstools.bfcb87c8ab3b53b795be2df7f0b6d9950067202769ed44c140412d077d812cd8
+#+busybox-e2fsprogs.2bb11a8756e0a3269f9b129cfa4cd00b9285383a56c37955d985f85e9104a03c
+#+busybox-iproute2.a8e13c22ef8720f5241193c9f0f149454e133c0ff887eb94fec54a973e3e7127
+#+busybox-iputils.3c4c12e3114797ae9e0004fa17a6ce4681699a8aa63292f0cc52fe712b69406f
+#+busybox-net-misc.f7975ccd34c507613e987ec1287f24e7d2748dbef8e1745b02501cc2b6343a3d
+#+busybox-net-tools.7a5764d707f5ebc74279132e77e643a0df9c0d486424fb1c20995964cf226cd6
+#+busybox-traceroute.d81da318b810cdecf23a0753e101d01cffa47a341c1f18d0440988d777f167e2
+#+busybox-wget.1f84ea03b3321fec5cfc7e12251831a41b661ccfcab9fd5564b76a001d2429b9
+#+busybox-chpst.c56d51c49eab5fa32e222445870737d09488c2b3b1d4c643ef55786a9c2af8c4
+#+busybox-console.1b6927bd4530f5fcab7c8198c2622579fee89b2280272c6a8be7b87fa1ad1fb1
+#+busybox-getty.f5ee09f5db734e123c3f1f2fa6a0a3df963dbf958ad092b4ae4dd355630f9938
+#+busybox-i2c-tools.10ac11fd994a2564466a128d499eab896807ab7e85869685dff9de02a110b387
+#+busybox-linux-extra.ce805f0ba9c349397a33ac4034861b1849e74f9eb2725af66ec0c04607e4cdc5
+#+busybox-mtd-utils.b34b5dd248104986ce12544a1b79a4b497db9ee1b6b037585ac6c06e4c8fb1c3
+#+busybox-shadow.3087c231c23c2c6cde36f741a53b7f2d2b54a65f77c9599e0ae980d6956d30ff
+#+busybox-su.a9cd5844c9b074746553c1941b34b0f1c9245cc5a42eccc6070ad2e1835414de
+#+busybox-util-linux-priv.022f2c9ee0fd5fedb75ff14c65bbd524c822eed4cbebe0b3a35d2c4abd287ab9
+#+busybox-logging.816ba4ebe2403fb1705f96de5d726bbeeb53848721184f1e56f02ca5d81c5ad7
+#+busybox-cron.16641eaed647b48709dd4dfe4fe49154e8edd778972e183be354c9d821301855
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+busybox-login.12d56e9020b345032432b995645be7833bc2f9910af972b2c3e8be5ca80edd03
+#+execline.bb3f0d8c17461fb7d563a548172b7fa44cf34c5c3711a14e1df0a04896607f37
+#+s6.77d8e9da89a1d70ee688f4c300822b34e58c8a29852a438a94af602c1a6b0a79
+#+ccx-utils.8afebb01beca6e7443278d9c396aaea88a53ee3db084e7b55588e6b023d1a0fb
+#+applyuidgid-caps.bd3dcdf6d522ca614bad74338dd94e02d8d8ca757db36b713942cac83882b720
+#+easyseccomp.7c223c649e0e134168ab848848baab56903b1968ef7b235c3c42eaff090926c7
+#+mlog.0e53fde1c5b8847990b1394f34948bf8b3d4e0e47a73c0ee868d8f034c7a3e60
+#+abduco.253326950313719a1933bc20f23c8a9dfa19bca958ec5a8491c05a8bba2dc1b5
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
 #@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.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+zsh.ee349aab3a21daf6db99d54262751751665b54037d11b1d899a68ae234bf1dbb
-#+pthbs-banginstall.af55b280ba52f0bc586b9401c4249d98f16181f53075a6164df9bf623fa0b6f6
-#+execline.bbec26b2169c46f9f28f532eef839794ce7b806f9d3f0cac9f0366fe75ee44df
-#+alpine-keys.db4a37d367740cedc4d08eff8ba32b754994de9ac9bba53263b63e985568d491
-#+apk-tools.61de386d7b47af77e6d8914eb27aabc03b781985009359bbe9a6261ba19727f2
-#+xbps.3e3fa4a7a4f178e9a655193ad3cd3d1f823bc4f67c9e66852ff744378f7ec415
-#+container-bin-image.c10d81760917e565c67564a1bffd74180c80f4542cc744601b826a85c067595b
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+zsh.c18cb977aed1960f5d8dbc037d4a593cd76c6f427dbcac528cfc5396faa22c95
+#+pthbs-banginstall.5e06e2e7e8bbdb1ce1fc8f5bfff237bc4aa4216a693288af5542d309bbc33cfb
+#+execline.bb3f0d8c17461fb7d563a548172b7fa44cf34c5c3711a14e1df0a04896607f37
+#+alpine-keys.f5f6aff5918561fb6e58c1a2dcd7378d06e8a1a0d6e589a5316342aac9ba645a
+#+apk-tools.c31f5449416052e2ca44cdfe4be7a45c959845e2adec492221e45e7b9a5623a5
+#+xbps.8ea9e86704452913183ebcc34da0fedc6654fb47d9c29adf3facb3c4f7f8afd7
+#+container-bin-image.28ff69936622954d2af1727aecca85247a60793652eae40beb95ad5289cbaa76
 #@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.61de386d7b47af77e6d8914eb27aabc03b781985009359bbe9a6261ba19727f2/command/apk.static' "${dest}/deps/command/"
-ln -sf '/home/ccx/versions/xbps.3e3fa4a7a4f178e9a655193ad3cd3d1f823bc4f67c9e66852ff744378f7ec415/command/xbps-install.static' "${dest}/deps/command/"
+ln -sf '/home/ccx/versions/apk-tools.c31f5449416052e2ca44cdfe4be7a45c959845e2adec492221e45e7b9a5623a5/command/apk.static' "${dest}/deps/command/"
+ln -sf '/home/ccx/versions/xbps.8ea9e86704452913183ebcc34da0fedc6654fb47d9c29adf3facb3c4f7f8afd7/command/xbps-install.static' "${dest}/deps/command/"
 
-for f in '/home/ccx/versions/alpine-keys.db4a37d367740cedc4d08eff8ba32b754994de9ac9bba53263b63e985568d491'/keys/alpine/*/*; do
+for f in '/home/ccx/versions/alpine-keys.f5f6aff5918561fb6e58c1a2dcd7378d06e8a1a0d6e589a5316342aac9ba645a'/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.db4a37d367740cedc4d08eff8ba32b754994de9
 done
  
 mkdir -p "${dest}/deps/keys/void"
-for f in '/home/ccx/versions/xbps.3e3fa4a7a4f178e9a655193ad3cd3d1f823bc4f67c9e66852ff744378f7ec415'/keys/void/*; do
+for f in '/home/ccx/versions/xbps.8ea9e86704452913183ebcc34da0fedc6654fb47d9c29adf3facb3c4f7f8afd7'/keys/void/*; do
 	ln -sf "$f" "${dest}/deps/keys/void/"
 done
 
-test -d '/home/ccx/versions/container-bin-image.c10d81760917e565c67564a1bffd74180c80f4542cc744601b826a85c067595b/container-bin-image'
-test -f '/home/ccx/versions/container-bin-image.c10d81760917e565c67564a1bffd74180c80f4542cc744601b826a85c067595b/container-bin-image/if'
-ln -sf '/home/ccx/versions/container-bin-image.c10d81760917e565c67564a1bffd74180c80f4542cc744601b826a85c067595b/container-bin-image' "${dest}/deps/"
+test -d '/home/ccx/versions/container-bin-image.28ff69936622954d2af1727aecca85247a60793652eae40beb95ad5289cbaa76/container-bin-image'
+test -f '/home/ccx/versions/container-bin-image.28ff69936622954d2af1727aecca85247a60793652eae40beb95ad5289cbaa76/container-bin-image/if'
+ln -sf '/home/ccx/versions/container-bin-image.28ff69936622954d2af1727aecca85247a60793652eae40beb95ad5289cbaa76/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.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-dosfstools.16727cc8658113bb122138369782454da365b3b58a836c3d121dc1e33715e959
-#+busybox-e2fsprogs.43d5502e98949ae562201994091cca87fe4d8615fd3fd2117d8516255cb0b7a0
-#+busybox-iproute2.d5c34edb1340261d45f3ac4fda2a8540ad08e332c9add318409bb16297a64a77
-#+busybox-iputils.435e53d6548bb9e0703642319c1d31b8f246352d1547e3bc54dff31e6b717859
-#+busybox-net-misc.a400a88a61fc252c78ae2d47505607aae84055b1ae2dab52e55f74dc1a512073
-#+busybox-net-tools.fab6319189927d49c0d71246013e5202404e491236d85a3840595193413daa7b
-#+busybox-traceroute.cc7d0f8f408c0dd5eab7570633c8641e3ae08a612b03ebb605bce40f5bcc2efa
-#+busybox-wget.96f8f9a1207c82f19600b61ea3270ccf89dcb5692b183b280f7b3a0483fbe0c6
-#+busybox-chpst.0381a6f70ba800567f5c083be6270b8da1c6a878b790012a6d3920ea88ed4d3e
-#+busybox-console.f260f339ee8cbfe2bed840f9e1343045e5ee12ea7b812363c50e6c1c45724a4d
-#+busybox-getty.24925a5face8b6448b0a3c29ee42d85f2ce47b21af4bb3b781656ceb2f45c060
-#+busybox-i2c-tools.ba0a5d246fba4448fa37a815e47f37915ff4e5bbed1ac680bcce7e1d92c5a931
-#+busybox-linux-extra.48c450436c3bd540ebce5857ad85f19f4097aed01b22a4fcc4b9ef246715439c
-#+busybox-mtd-utils.0baa7458d448b7a719f2f883ca916a6781981b74786f0edf14b612e65d11a92a
-#+busybox-shadow.cb4254ceafadee6a474304f2f77dee0b349d2dfff1f1f686e386e87873fcb595
-#+busybox-su.5d1429cfdb62a73fc3f75ee167dd40b9d4a4e29ac7b3b839d0c7b6c123b055a7
-#+busybox-util-linux-priv.24ef8c2b2da97c4a268bfcec6537473d2e2d972d3ebe12d514b5de2f9aadfa2a
-#+busybox-logging.ba514b3e11c5d85bc981300ac4d899f78a94726c06eb4f0e77e98b565e55aaad
-#+busybox-cron.37460c5454992ef69ee8b315bf37867776bbac7f4029bcd2dff830d473ca9196
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+execline.bbec26b2169c46f9f28f532eef839794ce7b806f9d3f0cac9f0366fe75ee44df
-#+s6.8deb9ec8d0a8ae11e26d257dc2758926f4ba6a06878bf4a41d8d4a6d7f92d8a9
-#+s6-portable-utils.846c9d44606aa4655e4a0e77671a9ec280fe4978c7e8b91db3b64dc8908ff87f
-#+s6-linux-utils.84e7cfd1e09970df46c2091218ec1965078c1569f39969dd70e4e662fb084f5a
-#+zsh.ee349aab3a21daf6db99d54262751751665b54037d11b1d899a68ae234bf1dbb
-#+confz.b582f0f505a780333b257d71c354be12df3ba1c31f72ce01c0dc0661dc914a77
-#+containers.c95b5dcd3aded60d6e33cbda6db287b4a7ba6f873cfc2515c8285be41ebb5f29
-#+xbps.3e3fa4a7a4f178e9a655193ad3cd3d1f823bc4f67c9e66852ff744378f7ec415
-#+zstd.1569f38bd278d090a1b5e64f314bea51347ea0be2036cb7baf1b3d2a47c7b915
-#+apk-tools.61de386d7b47af77e6d8914eb27aabc03b781985009359bbe9a6261ba19727f2
-#+alpine-keys.db4a37d367740cedc4d08eff8ba32b754994de9ac9bba53263b63e985568d491
-#+getent.850d6b44669f809b469d01e98b827de01e59a220c4139f78dd3a42a8ff760e3d
-#+fileset.417d2b56b0d3a38d58781241f29708973f234c77fd39e9005894235980039c0d
-#+ccx-utils.f1c96c79afebfd4e56350bac185e0c523abe8cd99f47c712e85edfcb46a447ed
-#+easyseccomp.614e6e64e249fe7329411418a140cb07e8240db84db30ff922165e6031ec368a
-#+findutils.a9da6321db8f1517a1159820763560207a05dbd08c858108a672cb30b3539b4b
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd-
\ No newline at end of file
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-dosfstools.bfcb87c8ab3b53b795be2df7f0b6d9950067202769ed44c140412d077d812cd8
+#+busybox-e2fsprogs.2bb11a8756e0a3269f9b129cfa4cd00b9285383a56c37955d985f85e9104a03c
+#+busybox-iproute2.a8e13c22ef8720f5241193c9f0f149454e133c0ff887eb94fec54a973e3e7127
+#+busybox-iputils.3c4c12e3114797ae9e0004fa17a6ce4681699a8aa63292f0cc52fe712b69406f
+#+busybox-net-misc.f7975ccd34c507613e987ec1287f24e7d2748dbef8e1745b02501cc2b6343a3d
+#+busybox-net-tools.7a5764d707f5ebc74279132e77e643a0df9c0d486424fb1c20995964cf226cd6
+#+busybox-traceroute.d81da318b810cdecf23a0753e101d01cffa47a341c1f18d0440988d777f167e2
+#+busybox-wget.1f84ea03b3321fec5cfc7e12251831a41b661ccfcab9fd5564b76a001d2429b9
+#+busybox-chpst.c56d51c49eab5fa32e222445870737d09488c2b3b1d4c643ef55786a9c2af8c4
+#+busybox-console.1b6927bd4530f5fcab7c8198c2622579fee89b2280272c6a8be7b87fa1ad1fb1
+#+busybox-getty.f5ee09f5db734e123c3f1f2fa6a0a3df963dbf958ad092b4ae4dd355630f9938
+#+busybox-i2c-tools.10ac11fd994a2564466a128d499eab896807ab7e85869685dff9de02a110b387
+#+busybox-linux-extra.ce805f0ba9c349397a33ac4034861b1849e74f9eb2725af66ec0c04607e4cdc5
+#+busybox-mtd-utils.b34b5dd248104986ce12544a1b79a4b497db9ee1b6b037585ac6c06e4c8fb1c3
+#+busybox-shadow.3087c231c23c2c6cde36f741a53b7f2d2b54a65f77c9599e0ae980d6956d30ff
+#+busybox-su.a9cd5844c9b074746553c1941b34b0f1c9245cc5a42eccc6070ad2e1835414de
+#+busybox-util-linux-priv.022f2c9ee0fd5fedb75ff14c65bbd524c822eed4cbebe0b3a35d2c4abd287ab9
+#+busybox-logging.816ba4ebe2403fb1705f96de5d726bbeeb53848721184f1e56f02ca5d81c5ad7
+#+busybox-cron.16641eaed647b48709dd4dfe4fe49154e8edd778972e183be354c9d821301855
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+execline.bb3f0d8c17461fb7d563a548172b7fa44cf34c5c3711a14e1df0a04896607f37
+#+s6.77d8e9da89a1d70ee688f4c300822b34e58c8a29852a438a94af602c1a6b0a79
+#+s6-portable-utils.85d0328cb6f9453341a044137e06ef8da10a42b1b54038d475ef152b52094b65
+#+s6-linux-utils.e85ed1d9acd43e42cac119f421bf5650512de815b267760772362941831640f3
+#+zsh.c18cb977aed1960f5d8dbc037d4a593cd76c6f427dbcac528cfc5396faa22c95
+#+confz.70b430521bea44b587292b84b9b41f78e73ed2cb84b403b20c02568943ed3a6d
+#+containers.43e524d809d99038b4d2c4b3738abe8e6a5ef513991e3aa5ad622046668522ec
+#+xbps.8ea9e86704452913183ebcc34da0fedc6654fb47d9c29adf3facb3c4f7f8afd7
+#+zstd.9dec917aa5ba4aa34436cb4d6b49b09398784ac819e04fa89bf4449afe7babce
+#+apk-tools.c31f5449416052e2ca44cdfe4be7a45c959845e2adec492221e45e7b9a5623a5
+#+alpine-keys.f5f6aff5918561fb6e58c1a2dcd7378d06e8a1a0d6e589a5316342aac9ba645a
+#+getent.dfac6fb0d000996471c2420701c57b7d9a2fa92353ea3c25a8a023a4cbe8fd5b
+#+fileset.1e59bf6aef0778d1c5bcd1acce4d003771181416712dabf2c5694ddd4641e3fe
+#+ccx-utils.8afebb01beca6e7443278d9c396aaea88a53ee3db084e7b55588e6b023d1a0fb
+#+easyseccomp.7c223c649e0e134168ab848848baab56903b1968ef7b235c3c42eaff090926c7
+#+findutils.991b0d6e817288a8caeab25196bcab1b91f074a1bae4b4a38c0e95da345e3b47
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/curl b/variants/ccx-x86_64/curl
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+m4.b00a09f5b43913f8946dba11c3723b43861682d7388e2450c29008fd06410a9b
-#+libressl.eb59c31f4d7d554558bbebc0cd49ca5506d1719675d3bfb85f75c58a39209769
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+m4.fb13925f91290359b578e4c460aa68463e98bf8b7ba9d7544f772411b3560dfa
+#+libressl.e7ddd3146693cfd7ded9b86eb6fe85adb21eb314ad6ad5cad17285dbdf2349cb
 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:.
 
 
@@ -63,8 +63,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,99 +1,99 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-dosfstools.16727cc8658113bb122138369782454da365b3b58a836c3d121dc1e33715e959
-#+busybox-e2fsprogs.43d5502e98949ae562201994091cca87fe4d8615fd3fd2117d8516255cb0b7a0
-#+busybox-iproute2.d5c34edb1340261d45f3ac4fda2a8540ad08e332c9add318409bb16297a64a77
-#+busybox-iputils.435e53d6548bb9e0703642319c1d31b8f246352d1547e3bc54dff31e6b717859
-#+busybox-net-misc.a400a88a61fc252c78ae2d47505607aae84055b1ae2dab52e55f74dc1a512073
-#+busybox-net-tools.fab6319189927d49c0d71246013e5202404e491236d85a3840595193413daa7b
-#+busybox-traceroute.cc7d0f8f408c0dd5eab7570633c8641e3ae08a612b03ebb605bce40f5bcc2efa
-#+busybox-wget.96f8f9a1207c82f19600b61ea3270ccf89dcb5692b183b280f7b3a0483fbe0c6
-#+busybox-chpst.0381a6f70ba800567f5c083be6270b8da1c6a878b790012a6d3920ea88ed4d3e
-#+busybox-console.f260f339ee8cbfe2bed840f9e1343045e5ee12ea7b812363c50e6c1c45724a4d
-#+busybox-getty.24925a5face8b6448b0a3c29ee42d85f2ce47b21af4bb3b781656ceb2f45c060
-#+busybox-i2c-tools.ba0a5d246fba4448fa37a815e47f37915ff4e5bbed1ac680bcce7e1d92c5a931
-#+busybox-linux-extra.48c450436c3bd540ebce5857ad85f19f4097aed01b22a4fcc4b9ef246715439c
-#+busybox-mtd-utils.0baa7458d448b7a719f2f883ca916a6781981b74786f0edf14b612e65d11a92a
-#+busybox-shadow.cb4254ceafadee6a474304f2f77dee0b349d2dfff1f1f686e386e87873fcb595
-#+busybox-su.5d1429cfdb62a73fc3f75ee167dd40b9d4a4e29ac7b3b839d0c7b6c123b055a7
-#+busybox-util-linux-priv.24ef8c2b2da97c4a268bfcec6537473d2e2d972d3ebe12d514b5de2f9aadfa2a
-#+busybox-logging.ba514b3e11c5d85bc981300ac4d899f78a94726c06eb4f0e77e98b565e55aaad
-#+busybox-cron.37460c5454992ef69ee8b315bf37867776bbac7f4029bcd2dff830d473ca9196
-#+attr.ba3e9238639fddabc02635bf94a9e8033a1046c2b5bb5c2d7461578e374ae3c6
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+diffutils.e402226c91bdbc1d81f520f5774af2a783643de737026e665472fb7605647221
-#+patch.88eb6fdfb3d7c4f06a0b07eeaf01a98d7a76514513d1bf315b15641b13f65d89
-#+flex.62db98abe810d7e7101d2fc7b345620f25ed2b014aa9b3edcfc9cbcd81576cad
-#+bison.7c3b1ba18d3dd2f3165c1ed8ff98b9cfa92e9d3a017d7c330af9774f5b120cab
-#+rsync.4d0fedf27435c67ae74eefc7bc7c3cfc9bb7922b66ab4129796033dc6545c6f7
-#+execline.bbec26b2169c46f9f28f532eef839794ce7b806f9d3f0cac9f0366fe75ee44df
-#+s6.8deb9ec8d0a8ae11e26d257dc2758926f4ba6a06878bf4a41d8d4a6d7f92d8a9
-#+s6-rc.70351deb924e8350349829fd2c97bbc2a492739908f9085288582ca6c871d587
-#+s6-portable-utils.846c9d44606aa4655e4a0e77671a9ec280fe4978c7e8b91db3b64dc8908ff87f
-#+s6-linux-utils.84e7cfd1e09970df46c2091218ec1965078c1569f39969dd70e4e662fb084f5a
-#+s6-linux-init.c8c62d9eea3b970579a4566bfb387e26fc4c414d9838f5bb03c6e7db2e26305c
-#+mdevd.4804daf1c8138b2481d76938ff2f459a284f29d9784eb89fc70bcd88c8506b90
-#+s6-dns.5c2c0f0b5155c9fef8b5bb4e13851018b289f69dc382c94a8f1f84454b007e88
-#+libressl.eb59c31f4d7d554558bbebc0cd49ca5506d1719675d3bfb85f75c58a39209769
-#+s6-networking.e25fab5f4357767f1f56a09a6e9be63c7c1b7ab4b61cf4d062c5948b1ba283a4
-#+zsh.ee349aab3a21daf6db99d54262751751665b54037d11b1d899a68ae234bf1dbb
-#+pthbs-banginstall.af55b280ba52f0bc586b9401c4249d98f16181f53075a6164df9bf623fa0b6f6
-#+aat.486c3e1ae82fb8c6dd2e9b89a0c4cc526c0ce7c10ec2340ef312b96e99fbf4c1
-#+confz.b582f0f505a780333b257d71c354be12df3ba1c31f72ce01c0dc0661dc914a77
-#+containers.c95b5dcd3aded60d6e33cbda6db287b4a7ba6f873cfc2515c8285be41ebb5f29
-#+fileset.417d2b56b0d3a38d58781241f29708973f234c77fd39e9005894235980039c0d
-#+logincaps.b3368a28ddd78ad99995bb54d619d01f03d2912be7e1d1023a51ab98d7a9fac9
-#+snaprep.d10a48feeebcca16d82f294bfb3803b84e766f399c632757712811828f178910
-#+curl.520823366cbce0ec43cd9eeccdf583bd7e6968f36135e7730f9e86666b25b77f
-#+git.574f723681aabb8518d6987e828facfbd00673f9817c7f654b219db6fe6a499b
-#+xbps.3e3fa4a7a4f178e9a655193ad3cd3d1f823bc4f67c9e66852ff744378f7ec415
-#+apk-tools.61de386d7b47af77e6d8914eb27aabc03b781985009359bbe9a6261ba19727f2
-#+getent.850d6b44669f809b469d01e98b827de01e59a220c4139f78dd3a42a8ff760e3d
-#+getconf.1162e2dd7dfcb9ab1837a558881667f4849f0cc45271b57c99716442098570f1
-#+iconv.34dd6a21dad12226eb7466c248f8febb24da4b1e59dad7fdb1d8a1f674d51d2b
-#+libcap.750cbbdb22c88c8210b5a729f4103d9966edec5300f54836cb1e7b8b5dabb3c7
-#+applyuidgid-caps.68601a6edc0e5c1c2fa48b5426eb5e48d84f9ace08e929a4a2acbeb58912c65d
-#+ccx-utils.f1c96c79afebfd4e56350bac185e0c523abe8cd99f47c712e85edfcb46a447ed
-#+user-env.c7a2162bcfd02c49d2431afc1f488aefafff6fe243f12539c29ece7318761a09
-#+strace.48e789c2103ae4d7fe5cd67d6cb3adaabd3a268990d4e2d90810c4fde40d8bda
-#+mlog.a9e77a44eb9c981900a45b452e8e3e8fed94deb71f596166eae43eb5c3dd7c44
-#+findutils.a9da6321db8f1517a1159820763560207a05dbd08c858108a672cb30b3539b4b
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+nvi.8f1d361f56eadbeb1e33cf0d42688d2116645fc9c9c458457e7e4006f38b7a2e
-#+squashfs-tools.70dee5bcbe3c750a8459f2903a34652eb5ba2c0779b3376965418fb7fdf61b0f
-#+mandoc.905ce3656a3c2080f056a156db5052686ce0150e9784ed9b835b5a703b2a9a60
-#+tinyssh.37696e9ad0ec68ba78807e30f7fd2ad7e6f1867ee24708b0ab707fc8914e88f2
-#+system-config.9664205a35a30f34435c0baddc898fde673078c9a2fe332188e037551ab4f46b
-#+system-config-rc.57e30cd2eb5570a9f3020f5ad8bd4cf60b4e22284a46111963dfdc50c1e2c82e
-#+system-config-scripts.d465574a923b465a1404c841703ab1c5300e648c087dcf7f9ddda9facf187b6d
-#+system-config-init.718852a6fb79be3429e4a96233fd48999ff6c41b13895c96b8b500eeb5375db3
-#+system-config-zsh.a810cf97970885845fd81c7fbb659f5fc286ebb77c6b2640d063e380e2dfab24
-#+busybox.c888978fc05492d9ce2330be85e8803a98655195df52293b51930a54539b9c75-
\ No newline at end of file
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-dosfstools.bfcb87c8ab3b53b795be2df7f0b6d9950067202769ed44c140412d077d812cd8
+#+busybox-e2fsprogs.2bb11a8756e0a3269f9b129cfa4cd00b9285383a56c37955d985f85e9104a03c
+#+busybox-iproute2.a8e13c22ef8720f5241193c9f0f149454e133c0ff887eb94fec54a973e3e7127
+#+busybox-iputils.3c4c12e3114797ae9e0004fa17a6ce4681699a8aa63292f0cc52fe712b69406f
+#+busybox-net-misc.f7975ccd34c507613e987ec1287f24e7d2748dbef8e1745b02501cc2b6343a3d
+#+busybox-net-tools.7a5764d707f5ebc74279132e77e643a0df9c0d486424fb1c20995964cf226cd6
+#+busybox-traceroute.d81da318b810cdecf23a0753e101d01cffa47a341c1f18d0440988d777f167e2
+#+busybox-wget.1f84ea03b3321fec5cfc7e12251831a41b661ccfcab9fd5564b76a001d2429b9
+#+busybox-chpst.c56d51c49eab5fa32e222445870737d09488c2b3b1d4c643ef55786a9c2af8c4
+#+busybox-console.1b6927bd4530f5fcab7c8198c2622579fee89b2280272c6a8be7b87fa1ad1fb1
+#+busybox-getty.f5ee09f5db734e123c3f1f2fa6a0a3df963dbf958ad092b4ae4dd355630f9938
+#+busybox-i2c-tools.10ac11fd994a2564466a128d499eab896807ab7e85869685dff9de02a110b387
+#+busybox-linux-extra.ce805f0ba9c349397a33ac4034861b1849e74f9eb2725af66ec0c04607e4cdc5
+#+busybox-mtd-utils.b34b5dd248104986ce12544a1b79a4b497db9ee1b6b037585ac6c06e4c8fb1c3
+#+busybox-shadow.3087c231c23c2c6cde36f741a53b7f2d2b54a65f77c9599e0ae980d6956d30ff
+#+busybox-su.a9cd5844c9b074746553c1941b34b0f1c9245cc5a42eccc6070ad2e1835414de
+#+busybox-util-linux-priv.022f2c9ee0fd5fedb75ff14c65bbd524c822eed4cbebe0b3a35d2c4abd287ab9
+#+busybox-logging.816ba4ebe2403fb1705f96de5d726bbeeb53848721184f1e56f02ca5d81c5ad7
+#+busybox-cron.16641eaed647b48709dd4dfe4fe49154e8edd778972e183be354c9d821301855
+#+attr.c2ff57a1bed67302fbcdf0ff999f17d4e70b1b27271b0c35ededba7ee1e6f9fa
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+diffutils.dc4e82d72a883a620aaf8fd332471005e70ae32b92cc6e8f79885b4eb3e3d497
+#+patch.e9a7ef2dff4418f508b5904ad3d1ca1cfeab715d66e64f90aa92ef611ba9b91d
+#+flex.3d914abbd2a9680ad091088e45500d9be2f4e210f8adb5c1aeda5c8217e254f2
+#+bison.a7e0bdcb32e1cad050a35ac56a54c6329158376eeefeecfaa8cedfc3fc07cb32
+#+rsync.1ea4f55d11562a8a4f1799818b3830fe599b196843ef663068720ce6e26d7ac6
+#+execline.bb3f0d8c17461fb7d563a548172b7fa44cf34c5c3711a14e1df0a04896607f37
+#+s6.77d8e9da89a1d70ee688f4c300822b34e58c8a29852a438a94af602c1a6b0a79
+#+s6-rc.94e274e07193b64198fb057f6af98fe848c3b1b210bfcb1b575ffd1d0e0470ab
+#+s6-portable-utils.85d0328cb6f9453341a044137e06ef8da10a42b1b54038d475ef152b52094b65
+#+s6-linux-utils.e85ed1d9acd43e42cac119f421bf5650512de815b267760772362941831640f3
+#+s6-linux-init.08085df3052dafb659dd1766a4b913a2f2d9fee3089e7ffbf1167ddde1ca4ea2
+#+mdevd.27dffef49b85bcc5b937547e8fbddaa4bad535ed4e878f1cd26606b5b128d4b0
+#+s6-dns.b299ee05cb09ad716fe21c6859cc538619bb45a7152aabf04cb2978aa9f2f1f6
+#+libressl.e7ddd3146693cfd7ded9b86eb6fe85adb21eb314ad6ad5cad17285dbdf2349cb
+#+s6-networking.19a67c271d68387e41586723131ca7970c1c20bc83c7860f7e68c91c5dbc714c
+#+zsh.c18cb977aed1960f5d8dbc037d4a593cd76c6f427dbcac528cfc5396faa22c95
+#+pthbs-banginstall.5e06e2e7e8bbdb1ce1fc8f5bfff237bc4aa4216a693288af5542d309bbc33cfb
+#+aat.687fd1cce9cb3845bfb59ea364b40389f634d049fa124317506bb7210bab1108
+#+confz.70b430521bea44b587292b84b9b41f78e73ed2cb84b403b20c02568943ed3a6d
+#+containers.43e524d809d99038b4d2c4b3738abe8e6a5ef513991e3aa5ad622046668522ec
+#+fileset.1e59bf6aef0778d1c5bcd1acce4d003771181416712dabf2c5694ddd4641e3fe
+#+logincaps.46afd25221c71ce18c4fe3b5436b122344206503c6eec9f67e0393517bf006b3
+#+snaprep.45d19ec25ba284913896d5712cdf3bd2836b6d19c46c0852810ea08e4b040f2c
+#+curl.881c698809162775a5293f2d659d8583be72ff5e8ebf28660a1b608d12b3f5ae
+#+git.28e713481bec04b7af60b1d932525c9395cf17316a7c6e7c30f365965a308ef1
+#+xbps.8ea9e86704452913183ebcc34da0fedc6654fb47d9c29adf3facb3c4f7f8afd7
+#+apk-tools.c31f5449416052e2ca44cdfe4be7a45c959845e2adec492221e45e7b9a5623a5
+#+getent.dfac6fb0d000996471c2420701c57b7d9a2fa92353ea3c25a8a023a4cbe8fd5b
+#+getconf.3e6016c0a6b397f7d15d4495e50b0599cb60d95fcb362b372ae1e3eba25b375d
+#+iconv.f650bafd90aa37f35e48088ee0686bdf28b9b86061f90693abae6bf6ecd5b295
+#+libcap.854415ab12199c235370336a17e3fa5444433054117bdbc78c7b5f11ec33dc1a
+#+applyuidgid-caps.bd3dcdf6d522ca614bad74338dd94e02d8d8ca757db36b713942cac83882b720
+#+ccx-utils.8afebb01beca6e7443278d9c396aaea88a53ee3db084e7b55588e6b023d1a0fb
+#+user-env.7adbd04fa68290438f07feafc535e3e6ee82db634dad36a490afeead72ed6e0a
+#+strace.efcac4444729854963313bd6a3a7cc42e27c30f175b6d911cc174808e10f5367
+#+mlog.0e53fde1c5b8847990b1394f34948bf8b3d4e0e47a73c0ee868d8f034c7a3e60
+#+findutils.991b0d6e817288a8caeab25196bcab1b91f074a1bae4b4a38c0e95da345e3b47
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+nvi.2366d92cfbabeba61dd7171cb067a5a419f019784f1c16e6a5cdd63071cae53a
+#+squashfs-tools.59c20c0cd69c767d7e59ee21073749fd652b19ce3389eb5d3e641126ad20b250
+#+mandoc.d44bf79bcf948842272d7069548cd64582b60b9ef4ce5dc42fab26ae1d50931d
+#+tinyssh.d141b77f1451840da4dd57080d4dacc5afd505c0a0d9e6df39c9b3fc659e40b9
+#+system-config.24fc09264c596421c642e20798afd2a5ec2586e785e1da17408766a29eb21801
+#+system-config-rc.1fb8804599ab108cc7ecf762e80d765535ad5f0ee343cb80f429365e58d757cb
+#+system-config-scripts.ca8e95025be54e23f462aba77f5d1dd979b92012c20ecb78de8d8a94fe5f5657
+#+system-config-init.6966a3369076bcbbbf86d8550f7902747b3b415037cd0a63f3dbc8c87863df75
+#+system-config-zsh.7fa1f06de8e32afded36e7fc49a4d1006b5d131fd59debcf63080cd30da7bbe4
+#+busybox.05bc94e84e573367607cd01b11a4b999de023ec3a47255fea573b878735bfd77+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/diffutils b/variants/ccx-x86_64/diffutils
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+m4.b00a09f5b43913f8946dba11c3723b43861682d7388e2450c29008fd06410a9b
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+m4.fb13925f91290359b578e4c460aa68463e98bf8b7ba9d7544f772411b3560dfa
 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:.
 
 
@@ -62,8 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+ocaml.d39c97f02658dfd3d9b224d715dc0486c2073689e0d2177164d34d6fdbc8e029
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+ocaml.fcb006dc499cdae6f2494f0bcd8ef3da10148180ca7da6d8a3b5987ad55187fb
 #@untar:-z:sha256:579c738f8ca191ba0a9b22dbe78f1377542442c9827cf4939f8964f09f9edb28:.
 
 
@@ -51,7 +51,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/home/ccx/versions/musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/home/ccx/versions/musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c/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,44 +1,44 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+m4.b00a09f5b43913f8946dba11c3723b43861682d7388e2450c29008fd06410a9b
-#+patch.88eb6fdfb3d7c4f06a0b07eeaf01a98d7a76514513d1bf315b15641b13f65d89
-#+flex.62db98abe810d7e7101d2fc7b345620f25ed2b014aa9b3edcfc9cbcd81576cad
-#+bison.7c3b1ba18d3dd2f3165c1ed8ff98b9cfa92e9d3a017d7c330af9774f5b120cab
-#+libseccomp.3651c9e5987a192c9dedd1eccf247bdc23d35a73fd2b0f5d39296fb7922ec77a
-#+error-standalone.63ee9fd104fa6cb4a20503a0a0c2bcb6b8737f58dddc3f11842f6c1a118255aa
-#+argp-standalone.1e0d6324de06843f89f5a4c36fe80ae08983b93e9d8ad7695a50a90cf08e397f
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+m4.fb13925f91290359b578e4c460aa68463e98bf8b7ba9d7544f772411b3560dfa
+#+patch.e9a7ef2dff4418f508b5904ad3d1ca1cfeab715d66e64f90aa92ef611ba9b91d
+#+flex.3d914abbd2a9680ad091088e45500d9be2f4e210f8adb5c1aeda5c8217e254f2
+#+bison.a7e0bdcb32e1cad050a35ac56a54c6329158376eeefeecfaa8cedfc3fc07cb32
+#+libseccomp.1aefcba169226cddd4ae6096c1065222d5480a17e5e5f80717635d11e9fce0ea
+#+error-standalone.94ede972190eb2f19a82f126843056d030d70b110e5995023fca795f12a4d140
+#+argp-standalone.ca3622bbf038afcffdf2ebbf0bcd73ded98537179e37fe6393fb987c138b56b0
 #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp
 #@sha256:eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10:easyseccomp_fix_includes.patch
 #@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
@@ -70,8 +70,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,45 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
 #@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+skalibs.a48948090ab54ec83826836c1ac62c695ce7d0ee5e4796e2d4f5440b09958e36
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+skalibs.d463d1a0670a2e946091d17cd63f183d01e49f1a90ee26bf3668671bbe65f1c3
 #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline
 
 
@@ -48,7 +48,7 @@ cd 'execline'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.a48948090ab54ec83826836c1ac62c695ce7d0ee5e4796e2d4f5440b09958e36/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.d463d1a0670a2e946091d17cd63f183d01e49f1a90ee26bf3668671bbe65f1c3/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.fe5b8fb14a97368eeb9a18695bc5e42b89b89cc1918e73925b341f2d5174badd
-#+gnu-make.32f731a10e47dcd22d87f98a23e1584ec1cd16e42934c425a64a879a721b42c1
-#+busybox.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
-#+skalibs.7d52c5cbdb6b51ede6e5826be45e46ccab89e63c12a9e489d6bfff883b598365
+#+musl-cross-make.4822b5d4510d4789a1d2bbaf35ccec858fceca577a876b12a41f58c9f3564903
+#+gnu-make.83b64092bf223a05632a95eacc87603af46b6fe80e7ea8a421d56971ae58994e
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+nawk.133881466458aeb9ec5ae77ee85d226125bf174c340683c9455d9668d915c65f
+#+skalibs.b4754ce0ab25a530b0f5cbfdd7fb0612be8149a6bd41d0e4d0c27bdffaf02103
 #@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.7d52c5cbdb6b51ede6e5826be45e46ccab89e63c12a9e489d6bfff883b598365/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.b4754ce0ab25a530b0f5cbfdd7fb0612be8149a6bd41d0e4d0c27bdffaf02103/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.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+zsh.ee349aab3a21daf6db99d54262751751665b54037d11b1d899a68ae234bf1dbb
-#+pthbs-banginstall.af55b280ba52f0bc586b9401c4249d98f16181f53075a6164df9bf623fa0b6f6
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+zsh.c18cb977aed1960f5d8dbc037d4a593cd76c6f427dbcac528cfc5396faa22c95
+#+pthbs-banginstall.5e06e2e7e8bbdb1ce1fc8f5bfff237bc4aa4216a693288af5542d309bbc33cfb
 #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset
 
 
diff --git a/variants/ccx-x86_64/findutils b/variants/ccx-x86_64/findutils
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+m4.b00a09f5b43913f8946dba11c3723b43861682d7388e2450c29008fd06410a9b
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+m4.fb13925f91290359b578e4c460aa68463e98bf8b7ba9d7544f772411b3560dfa
 #@untar:-J:sha256:1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5:.
 
 
@@ -62,8 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+m4.b00a09f5b43913f8946dba11c3723b43861682d7388e2450c29008fd06410a9b
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.133881466458aeb9ec5ae77ee85d226125bf174c340683c9455d9668d915c65f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+m4.fb13925f91290359b578e4c460aa68463e98bf8b7ba9d7544f772411b3560dfa
 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
 
 
@@ -62,8 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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.fe5b8fb14a97368eeb9a18695bc5e42b89b89cc1918e73925b341f2d5174badd
-#+gnu-make.32f731a10e47dcd22d87f98a23e1584ec1cd16e42934c425a64a879a721b42c1
-#+busybox.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gmp.04fb4e5ff7cc95f9aab6b9d2266d5afc089bae06115dfeec43bb5a2d3a801316
-#+mpc.054aa8bf1ac6296f942422e7eb0e9726e63180864ea349c4f9816c536226ad90
-#+mpfr.03001935daad2d23ebd12e3bb6a856cbdb1ef112d718351236a28daf61509214
+#+musl-cross-make.4822b5d4510d4789a1d2bbaf35ccec858fceca577a876b12a41f58c9f3564903
+#+gnu-make.83b64092bf223a05632a95eacc87603af46b6fe80e7ea8a421d56971ae58994e
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+nawk.133881466458aeb9ec5ae77ee85d226125bf174c340683c9455d9668d915c65f
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gmp.1333265a6eb24379d57d19c7df7f7eaa270cc5cc5c62c8dd3cb681a4d7ca881f
+#+mpc.e0e13c0ae8b4d2f4dd89615abd02c37c92141665b7e7a7fa8ca25b50cfee4270
+#+mpfr.8c25a57543cb982682b5db05c169e99daef1870730f9542616ab83250aced459
 #@sha256:62eb68290502d54b16457509aa0c3995a84116408e6b593d676b9f4c03b6b160:merged.patch
 #@untar:-J:sha256:e0dc77297625631ac8e50fa92fffefe899a4eb702592da5c32ef04e2293aca3a:.
 
@@ -15,8 +15,8 @@
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
@@ -47,9 +47,9 @@ patch -p1 <../merged.patch
 export TZ=UTC
 export SOURCE_DATE_EPOCH=1748000928
 
-mcm=/home/ccx/versions/musl-cross-make.fe5b8fb14a97368eeb9a18695bc5e42b89b89cc1918e73925b341f2d5174badd
+mcm=/home/ccx/versions/musl-cross-make.4822b5d4510d4789a1d2bbaf35ccec858fceca577a876b12a41f58c9f3564903
 mcm_bin=$mcm/bin/x86_64-linux-musl
-musl=/home/ccx/versions/musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
+musl=/home/ccx/versions/musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
 build_env_static
 
 sysroot="${pthbs_workdir}/sysroot"
diff --git a/variants/ccx-x86_64/getconf b/variants/ccx-x86_64/getconf
@@ -1,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
 #@sha256:d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c:getconf.c
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
 #@sha256:002c1a216f6bed0f816ab1cfebde94a0b127193ef410c36b2190599983e015b8:getent.c
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,40 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+m4.b00a09f5b43913f8946dba11c3723b43861682d7388e2450c29008fd06410a9b
-#+libressl.eb59c31f4d7d554558bbebc0cd49ca5506d1719675d3bfb85f75c58a39209769
-#+curl.520823366cbce0ec43cd9eeccdf583bd7e6968f36135e7730f9e86666b25b77f
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+m4.fb13925f91290359b578e4c460aa68463e98bf8b7ba9d7544f772411b3560dfa
+#+libressl.e7ddd3146693cfd7ded9b86eb6fe85adb21eb314ad6ad5cad17285dbdf2349cb
+#+curl.881c698809162775a5293f2d659d8583be72ff5e8ebf28660a1b608d12b3f5ae
 #@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.fe5b8fb14a97368eeb9a18695bc5e42b89b89cc1918e73925b341f2d5174badd
-#+gnu-make.32f731a10e47dcd22d87f98a23e1584ec1cd16e42934c425a64a879a721b42c1
-#+busybox.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+m4.497542688b61fc8003159e488f389b851343aa4c0b9d1ac56802354f41a51e2a
-#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
+#+musl-cross-make.4822b5d4510d4789a1d2bbaf35ccec858fceca577a876b12a41f58c9f3564903
+#+gnu-make.83b64092bf223a05632a95eacc87603af46b6fe80e7ea8a421d56971ae58994e
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+m4.150cb17ee7a9dc8cc25d1e93e85e9c4386714c0f9074001244a7de2f8fa5778d
+#+nawk.133881466458aeb9ec5ae77ee85d226125bf174c340683c9455d9668d915c65f
 #@untar:-J:sha256:a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898:.
 
 
@@ -33,8 +33,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,10 +1,10 @@
 #!/usr/bin/env pthbs-build
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.32f731a10e47dcd22d87f98a23e1584ec1cd16e42934c425a64a879a721b42c1
-#+busybox.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.83b64092bf223a05632a95eacc87603af46b6fe80e7ea8a421d56971ae58994e
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+nawk.133881466458aeb9ec5ae77ee85d226125bf174c340683c9455d9668d915c65f
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -34,8 +34,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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.fe5b8fb14a97368eeb9a18695bc5e42b89b89cc1918e73925b341f2d5174badd
-#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
+#+musl-cross-make.4822b5d4510d4789a1d2bbaf35ccec858fceca577a876b12a41f58c9f3564903
+#+nawk.133881466458aeb9ec5ae77ee85d226125bf174c340683c9455d9668d915c65f
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -37,7 +37,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'make-4.4.1'
 
 
-mcm=/home/ccx/versions/musl-cross-make.fe5b8fb14a97368eeb9a18695bc5e42b89b89cc1918e73925b341f2d5174badd
+mcm=/home/ccx/versions/musl-cross-make.4822b5d4510d4789a1d2bbaf35ccec858fceca577a876b12a41f58c9f3564903
 
 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.3e9a10d515ab8608f8eda7125d1b223da285a62e85a87a56be316a539821605c
-#+gnu-make.aa211b51bd7f8182794c40f039947bdf19ade8460ebfc071f9f33e6fb91a968e
-#+busybox.5792386228c725ccfeffe301dd3918f307e1f4d1391f7bdef45910089bdea8cc
-#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
+#+musl-cross-make.994dc371f73f122cbdd8222bcaa5686ac53d16fcc70e15ebca11e0182682ea59
+#+gnu-make.f3cf710c2b4871789f1b4d5ee4aea115fc579185d1b9d1a4b64f76f5032f0a12
+#+busybox.4f65f9428816f38411fe246d2b3d20e096986db501a16cdd561b7813bcde1119
+#+nawk.133881466458aeb9ec5ae77ee85d226125bf174c340683c9455d9668d915c65f
 #@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.e4db999a4586836d858df99d45eee1aaa59d4fed1a5fa24f0365db08cddb59de
+#+musl-cross-make.dde976ac2e04234c87656960596a2ae9e59c087f47b0cd218cb40a397225f2fc
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -30,7 +30,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'make-4.4.1'
 
 
-mcm=/home/ccx/versions/musl-cross-make.e4db999a4586836d858df99d45eee1aaa59d4fed1a5fa24f0365db08cddb59de
+mcm=/home/ccx/versions/musl-cross-make.dde976ac2e04234c87656960596a2ae9e59c087f47b0cd218cb40a397225f2fc
 
 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,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+m4.b00a09f5b43913f8946dba11c3723b43861682d7388e2450c29008fd06410a9b
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+m4.fb13925f91290359b578e4c460aa68463e98bf8b7ba9d7544f772411b3560dfa
 #@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:.
 
 
@@ -62,8 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
 #@sha256:f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7:iconv.c
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+m4.b00a09f5b43913f8946dba11c3723b43861682d7388e2450c29008fd06410a9b
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+m4.fb13925f91290359b578e4c460aa68463e98bf8b7ba9d7544f772411b3560dfa
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 
@@ -63,8 +63,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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.515bfeca53caf2766343387ff811a6f287987d7ca360fb59a243a7d551969e52
-#+busybox.c888978fc05492d9ce2330be85e8803a98655195df52293b51930a54539b9c75-
\ No newline at end of file
+#+linux-qemu-guest.4f819c31d741260c030178bedb5ffb1b4af6791891d8acae94ade509e983f204
+#+busybox.05bc94e84e573367607cd01b11a4b999de023ec3a47255fea573b878735bfd77+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/libarchive b/variants/ccx-x86_64/libarchive
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+m4.b00a09f5b43913f8946dba11c3723b43861682d7388e2450c29008fd06410a9b
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+m4.fb13925f91290359b578e4c460aa68463e98bf8b7ba9d7544f772411b3560dfa
 #@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:.
 
 
@@ -62,8 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+m4.b00a09f5b43913f8946dba11c3723b43861682d7388e2450c29008fd06410a9b
-#+libmd.91c92ff8e7675bdcf8b95f5fa65640e6714524787a9f4e603a4db5e85c1d48dc
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+m4.fb13925f91290359b578e4c460aa68463e98bf8b7ba9d7544f772411b3560dfa
+#+libmd.cf4da2fc3a0bc0f3b8f0795eaec39c351e1c8d94f4575046e6943d233a4a33b7
 #@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:.
 
 
@@ -63,8 +63,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,46 +1,46 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+pkgconf-pkg-config.751fa6d0cec8733f5f6f87a764ecb38665e08371b66220bfb8f4337c43467ceb
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+pkgconf-pkg-config.c15392f5ccbe7242db2b1a726068d860e1c7728516554d4e07de10b5ce6f0cce
 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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.fe5b8fb14a97368eeb9a18695bc5e42b89b89cc1918e73925b341f2d5174badd
-#+gnu-make.32f731a10e47dcd22d87f98a23e1584ec1cd16e42934c425a64a879a721b42c1
-#+busybox.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
+#+musl-cross-make.4822b5d4510d4789a1d2bbaf35ccec858fceca577a876b12a41f58c9f3564903
+#+gnu-make.83b64092bf223a05632a95eacc87603af46b6fe80e7ea8a421d56971ae58994e
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+nawk.133881466458aeb9ec5ae77ee85d226125bf174c340683c9455d9668d915c65f
 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:.
 
 
diff --git a/variants/ccx-x86_64/libcgroup b/variants/ccx-x86_64/libcgroup
@@ -1,41 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+m4.b00a09f5b43913f8946dba11c3723b43861682d7388e2450c29008fd06410a9b
-#+flex.62db98abe810d7e7101d2fc7b345620f25ed2b014aa9b3edcfc9cbcd81576cad
-#+bison.7c3b1ba18d3dd2f3165c1ed8ff98b9cfa92e9d3a017d7c330af9774f5b120cab
-#+musl-fts.297bb18d5d524c40fcc705383a32fcc8def22c98e774295bd330539ea2b0e872
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+m4.fb13925f91290359b578e4c460aa68463e98bf8b7ba9d7544f772411b3560dfa
+#+flex.3d914abbd2a9680ad091088e45500d9be2f4e210f8adb5c1aeda5c8217e254f2
+#+bison.a7e0bdcb32e1cad050a35ac56a54c6329158376eeefeecfaa8cedfc3fc07cb32
+#+musl-fts.a9e47e1144c533255870c9551be9bad3ae3b8eb236f6a97b0248087e26d1dc03
 #@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:.
 
 
@@ -65,8 +65,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,46 +1,46 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+zstd.1569f38bd278d090a1b5e64f314bea51347ea0be2036cb7baf1b3d2a47c7b915
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+zstd.9dec917aa5ba4aa34436cb4d6b49b09398784ac819e04fa89bf4449afe7babce
 #@git:288355d104ff9930520c0283fe82556c6cc5c16f:libelf
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+m4.b00a09f5b43913f8946dba11c3723b43861682d7388e2450c29008fd06410a9b
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+m4.fb13925f91290359b578e4c460aa68463e98bf8b7ba9d7544f772411b3560dfa
 #@untar:-J:sha256:1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332:.
 
 
@@ -62,8 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+m4.b00a09f5b43913f8946dba11c3723b43861682d7388e2450c29008fd06410a9b
-#+ca-certificates-wip-donotuse.325383d94ba32a590d94d06c4fbec713b778dc7bd1ef2c8df9e8604ef21f2073
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+m4.fb13925f91290359b578e4c460aa68463e98bf8b7ba9d7544f772411b3560dfa
+#+ca-certificates-wip-donotuse.e0bdfad0d91f08830861c069082831a2c66584fe2247c2f76eddf0a93860ab04
 #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c
 #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:.
 
@@ -64,8 +64,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
@@ -103,7 +103,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.325383d94ba32a590d94d06c4fbec713b778dc7bd1ef2c8df9e8604ef21f2073/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
+cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.e0bdfad0d91f08830861c069082831a2c66584fe2247c2f76eddf0a93860ab04/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
 ./c_rehash  "$pthbs_destdir/$prefix/config/ssl/certs/"
 cd  "$pthbs_destdir/$prefix/config/ssl/"
 mv cert.pem libressl-cert.pem
diff --git a/variants/ccx-x86_64/libseccomp b/variants/ccx-x86_64/libseccomp
@@ -1,40 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+m4.b00a09f5b43913f8946dba11c3723b43861682d7388e2450c29008fd06410a9b
-#+pkgconf-pkg-config.751fa6d0cec8733f5f6f87a764ecb38665e08371b66220bfb8f4337c43467ceb
-#+gperf.bd5dd5a0cb06842392b251b0dba1da4131c7d5014352d21e1b96f3b3243e252a
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+m4.fb13925f91290359b578e4c460aa68463e98bf8b7ba9d7544f772411b3560dfa
+#+pkgconf-pkg-config.c15392f5ccbe7242db2b1a726068d860e1c7728516554d4e07de10b5ce6f0cce
+#+gperf.0b3be455d3bb9b0ef8500ad66245055f457391d7994f6570066c8123bcb111c1
 #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:.
 
 
@@ -64,8 +64,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+m4.b00a09f5b43913f8946dba11c3723b43861682d7388e2450c29008fd06410a9b
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+m4.fb13925f91290359b578e4c460aa68463e98bf8b7ba9d7544f772411b3560dfa
 #@untar:-z:sha256:ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157:.
 
 
@@ -62,8 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,46 +1,46 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nofail_digest
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-modutils.bf1795cd8c7dc5c96de9e1a8bec2d765101f5a34818afcab938839d0e6dade3c
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+findutils.a9da6321db8f1517a1159820763560207a05dbd08c858108a672cb30b3539b4b
-#+diffutils.e402226c91bdbc1d81f520f5774af2a783643de737026e665472fb7605647221
-#+patch.88eb6fdfb3d7c4f06a0b07eeaf01a98d7a76514513d1bf315b15641b13f65d89
-#+flex.62db98abe810d7e7101d2fc7b345620f25ed2b014aa9b3edcfc9cbcd81576cad
-#+bison.7c3b1ba18d3dd2f3165c1ed8ff98b9cfa92e9d3a017d7c330af9774f5b120cab
-#+rsync.4d0fedf27435c67ae74eefc7bc7c3cfc9bb7922b66ab4129796033dc6545c6f7
-#+zstd.1569f38bd278d090a1b5e64f314bea51347ea0be2036cb7baf1b3d2a47c7b915
-#+libelf.94d34bd35d926954ea471c3354df47e72c54a15e3bcb1476f3fd2083a5b2473d
-#+pkgconf-pkg-config.751fa6d0cec8733f5f6f87a764ecb38665e08371b66220bfb8f4337c43467ceb
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-modutils.2050296211461ca79ab4402c77b7dd25a4fc38c1bdbbcee5022f3cadcdf2904a
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+findutils.991b0d6e817288a8caeab25196bcab1b91f074a1bae4b4a38c0e95da345e3b47
+#+diffutils.dc4e82d72a883a620aaf8fd332471005e70ae32b92cc6e8f79885b4eb3e3d497
+#+patch.e9a7ef2dff4418f508b5904ad3d1ca1cfeab715d66e64f90aa92ef611ba9b91d
+#+flex.3d914abbd2a9680ad091088e45500d9be2f4e210f8adb5c1aeda5c8217e254f2
+#+bison.a7e0bdcb32e1cad050a35ac56a54c6329158376eeefeecfaa8cedfc3fc07cb32
+#+rsync.1ea4f55d11562a8a4f1799818b3830fe599b196843ef663068720ce6e26d7ac6
+#+zstd.9dec917aa5ba4aa34436cb4d6b49b09398784ac819e04fa89bf4449afe7babce
+#+libelf.8d8ad253587bdfdf3137f8421904566b72c29c54231a326734eaa6e2aa723cca
+#+pkgconf-pkg-config.c15392f5ccbe7242db2b1a726068d860e1c7728516554d4e07de10b5ce6f0cce
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
 #@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:.
 #@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz
 #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config
diff --git a/variants/ccx-x86_64/linux-qemu-guest b/variants/ccx-x86_64/linux-qemu-guest
@@ -1,46 +1,46 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nofail_digest
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-modutils.bf1795cd8c7dc5c96de9e1a8bec2d765101f5a34818afcab938839d0e6dade3c
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+findutils.a9da6321db8f1517a1159820763560207a05dbd08c858108a672cb30b3539b4b
-#+diffutils.e402226c91bdbc1d81f520f5774af2a783643de737026e665472fb7605647221
-#+patch.88eb6fdfb3d7c4f06a0b07eeaf01a98d7a76514513d1bf315b15641b13f65d89
-#+flex.62db98abe810d7e7101d2fc7b345620f25ed2b014aa9b3edcfc9cbcd81576cad
-#+bison.7c3b1ba18d3dd2f3165c1ed8ff98b9cfa92e9d3a017d7c330af9774f5b120cab
-#+rsync.4d0fedf27435c67ae74eefc7bc7c3cfc9bb7922b66ab4129796033dc6545c6f7
-#+zstd.1569f38bd278d090a1b5e64f314bea51347ea0be2036cb7baf1b3d2a47c7b915
-#+libelf.94d34bd35d926954ea471c3354df47e72c54a15e3bcb1476f3fd2083a5b2473d
-#+pkgconf-pkg-config.751fa6d0cec8733f5f6f87a764ecb38665e08371b66220bfb8f4337c43467ceb
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-modutils.2050296211461ca79ab4402c77b7dd25a4fc38c1bdbbcee5022f3cadcdf2904a
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+findutils.991b0d6e817288a8caeab25196bcab1b91f074a1bae4b4a38c0e95da345e3b47
+#+diffutils.dc4e82d72a883a620aaf8fd332471005e70ae32b92cc6e8f79885b4eb3e3d497
+#+patch.e9a7ef2dff4418f508b5904ad3d1ca1cfeab715d66e64f90aa92ef611ba9b91d
+#+flex.3d914abbd2a9680ad091088e45500d9be2f4e210f8adb5c1aeda5c8217e254f2
+#+bison.a7e0bdcb32e1cad050a35ac56a54c6329158376eeefeecfaa8cedfc3fc07cb32
+#+rsync.1ea4f55d11562a8a4f1799818b3830fe599b196843ef663068720ce6e26d7ac6
+#+zstd.9dec917aa5ba4aa34436cb4d6b49b09398784ac819e04fa89bf4449afe7babce
+#+libelf.8d8ad253587bdfdf3137f8421904566b72c29c54231a326734eaa6e2aa723cca
+#+pkgconf-pkg-config.c15392f5ccbe7242db2b1a726068d860e1c7728516554d4e07de10b5ce6f0cce
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
 #@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.fe5b8fb14a97368eeb9a18695bc5e42b89b89cc1918e73925b341f2d5174badd
-#+gnu-make.32f731a10e47dcd22d87f98a23e1584ec1cd16e42934c425a64a879a721b42c1
-#+busybox.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
-#+skalibs.7d52c5cbdb6b51ede6e5826be45e46ccab89e63c12a9e489d6bfff883b598365
-#+execline.0e0e04876fcbeb1f2792fcf8d19e2d9f0fa63b8e8264315e55c02f22ed5f7c3b
-#+libcap.48e4b41ed0e76b61e7992b564b478a5787917d55e48e00296a68281ecc2660dc
+#+musl-cross-make.4822b5d4510d4789a1d2bbaf35ccec858fceca577a876b12a41f58c9f3564903
+#+gnu-make.83b64092bf223a05632a95eacc87603af46b6fe80e7ea8a421d56971ae58994e
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+nawk.133881466458aeb9ec5ae77ee85d226125bf174c340683c9455d9668d915c65f
+#+skalibs.b4754ce0ab25a530b0f5cbfdd7fb0612be8149a6bd41d0e4d0c27bdffaf02103
+#+execline.7c44a9d76cbe04f2d3d261cfc395be30ea2efd9036b94e5658c91d25e1b6beb7
+#+libcap.21fd1b8cc8af34a098fe4fc79b3de0b185ee2d943083746a8cd3e812266989b6
 #@git:7fbfb934cdaa187a063a4df41498c06c46d4a6a9:lnstools
 
 
diff --git a/variants/ccx-x86_64/logincaps b/variants/ccx-x86_64/logincaps
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+zsh.ee349aab3a21daf6db99d54262751751665b54037d11b1d899a68ae234bf1dbb
-#+pthbs-banginstall.af55b280ba52f0bc586b9401c4249d98f16181f53075a6164df9bf623fa0b6f6
-#+execline.bbec26b2169c46f9f28f532eef839794ce7b806f9d3f0cac9f0366fe75ee44df
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+ccx-utils.f1c96c79afebfd4e56350bac185e0c523abe8cd99f47c712e85edfcb46a447ed
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+zsh.c18cb977aed1960f5d8dbc037d4a593cd76c6f427dbcac528cfc5396faa22c95
+#+pthbs-banginstall.5e06e2e7e8bbdb1ce1fc8f5bfff237bc4aa4216a693288af5542d309bbc33cfb
+#+execline.bb3f0d8c17461fb7d563a548172b7fa44cf34c5c3711a14e1df0a04896607f37
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+ccx-utils.8afebb01beca6e7443278d9c396aaea88a53ee3db084e7b55588e6b023d1a0fb
 #@git:409db79b3e7e5fc6b73305471d9bbb6ac5c14036:logincaps
 
 
diff --git a/variants/ccx-x86_64/m4 b/variants/ccx-x86_64/m4
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+nawk.133881466458aeb9ec5ae77ee85d226125bf174c340683c9455d9668d915c65f
 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
 
 
@@ -61,8 +61,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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.fe5b8fb14a97368eeb9a18695bc5e42b89b89cc1918e73925b341f2d5174badd
-#+gnu-make.32f731a10e47dcd22d87f98a23e1584ec1cd16e42934c425a64a879a721b42c1
-#+busybox.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
+#+musl-cross-make.4822b5d4510d4789a1d2bbaf35ccec858fceca577a876b12a41f58c9f3564903
+#+gnu-make.83b64092bf223a05632a95eacc87603af46b6fe80e7ea8a421d56971ae58994e
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+nawk.133881466458aeb9ec5ae77ee85d226125bf174c340683c9455d9668d915c65f
 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
 
 
@@ -32,8 +32,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
 #@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.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+zsh.ee349aab3a21daf6db99d54262751751665b54037d11b1d899a68ae234bf1dbb
-#+pthbs-banginstall.af55b280ba52f0bc586b9401c4249d98f16181f53075a6164df9bf623fa0b6f6
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+zsh.c18cb977aed1960f5d8dbc037d4a593cd76c6f427dbcac528cfc5396faa22c95
+#+pthbs-banginstall.5e06e2e7e8bbdb1ce1fc8f5bfff237bc4aa4216a693288af5542d309bbc33cfb
 #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts
 
 
diff --git a/variants/ccx-x86_64/mdevd b/variants/ccx-x86_64/mdevd
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+skalibs.a48948090ab54ec83826836c1ac62c695ce7d0ee5e4796e2d4f5440b09958e36
-#+execline.bbec26b2169c46f9f28f532eef839794ce7b806f9d3f0cac9f0366fe75ee44df
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+skalibs.d463d1a0670a2e946091d17cd63f183d01e49f1a90ee26bf3668671bbe65f1c3
+#+execline.bb3f0d8c17461fb7d563a548172b7fa44cf34c5c3711a14e1df0a04896607f37
 #@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd
 
 
@@ -49,7 +49,7 @@ cd 'mdevd'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.a48948090ab54ec83826836c1ac62c695ce7d0ee5e4796e2d4f5440b09958e36/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.d463d1a0670a2e946091d17cd63f183d01e49f1a90ee26bf3668671bbe65f1c3/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.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-dosfstools.16727cc8658113bb122138369782454da365b3b58a836c3d121dc1e33715e959
-#+busybox-e2fsprogs.43d5502e98949ae562201994091cca87fe4d8615fd3fd2117d8516255cb0b7a0
-#+busybox-iproute2.d5c34edb1340261d45f3ac4fda2a8540ad08e332c9add318409bb16297a64a77
-#+busybox-iputils.435e53d6548bb9e0703642319c1d31b8f246352d1547e3bc54dff31e6b717859
-#+busybox-net-misc.a400a88a61fc252c78ae2d47505607aae84055b1ae2dab52e55f74dc1a512073
-#+busybox-net-tools.fab6319189927d49c0d71246013e5202404e491236d85a3840595193413daa7b
-#+busybox-traceroute.cc7d0f8f408c0dd5eab7570633c8641e3ae08a612b03ebb605bce40f5bcc2efa
-#+busybox-wget.96f8f9a1207c82f19600b61ea3270ccf89dcb5692b183b280f7b3a0483fbe0c6
-#+busybox-chpst.0381a6f70ba800567f5c083be6270b8da1c6a878b790012a6d3920ea88ed4d3e
-#+busybox-console.f260f339ee8cbfe2bed840f9e1343045e5ee12ea7b812363c50e6c1c45724a4d
-#+busybox-getty.24925a5face8b6448b0a3c29ee42d85f2ce47b21af4bb3b781656ceb2f45c060
-#+busybox-i2c-tools.ba0a5d246fba4448fa37a815e47f37915ff4e5bbed1ac680bcce7e1d92c5a931
-#+busybox-linux-extra.48c450436c3bd540ebce5857ad85f19f4097aed01b22a4fcc4b9ef246715439c
-#+busybox-mtd-utils.0baa7458d448b7a719f2f883ca916a6781981b74786f0edf14b612e65d11a92a
-#+busybox-shadow.cb4254ceafadee6a474304f2f77dee0b349d2dfff1f1f686e386e87873fcb595
-#+busybox-su.5d1429cfdb62a73fc3f75ee167dd40b9d4a4e29ac7b3b839d0c7b6c123b055a7
-#+busybox-util-linux-priv.24ef8c2b2da97c4a268bfcec6537473d2e2d972d3ebe12d514b5de2f9aadfa2a
-#+busybox-logging.ba514b3e11c5d85bc981300ac4d899f78a94726c06eb4f0e77e98b565e55aaad
-#+busybox-cron.37460c5454992ef69ee8b315bf37867776bbac7f4029bcd2dff830d473ca9196
-#+execline.bbec26b2169c46f9f28f532eef839794ce7b806f9d3f0cac9f0366fe75ee44df
-#+s6.8deb9ec8d0a8ae11e26d257dc2758926f4ba6a06878bf4a41d8d4a6d7f92d8a9
-#+mdev-scripts.52961f29cdd50dd5455f151b7761a0d4b9ab4d2f214517547b5815d50e27b085
-#+mdevd.4804daf1c8138b2481d76938ff2f459a284f29d9784eb89fc70bcd88c8506b90
-#+busybox.c888978fc05492d9ce2330be85e8803a98655195df52293b51930a54539b9c75-
\ No newline at end of file
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-dosfstools.bfcb87c8ab3b53b795be2df7f0b6d9950067202769ed44c140412d077d812cd8
+#+busybox-e2fsprogs.2bb11a8756e0a3269f9b129cfa4cd00b9285383a56c37955d985f85e9104a03c
+#+busybox-iproute2.a8e13c22ef8720f5241193c9f0f149454e133c0ff887eb94fec54a973e3e7127
+#+busybox-iputils.3c4c12e3114797ae9e0004fa17a6ce4681699a8aa63292f0cc52fe712b69406f
+#+busybox-net-misc.f7975ccd34c507613e987ec1287f24e7d2748dbef8e1745b02501cc2b6343a3d
+#+busybox-net-tools.7a5764d707f5ebc74279132e77e643a0df9c0d486424fb1c20995964cf226cd6
+#+busybox-traceroute.d81da318b810cdecf23a0753e101d01cffa47a341c1f18d0440988d777f167e2
+#+busybox-wget.1f84ea03b3321fec5cfc7e12251831a41b661ccfcab9fd5564b76a001d2429b9
+#+busybox-chpst.c56d51c49eab5fa32e222445870737d09488c2b3b1d4c643ef55786a9c2af8c4
+#+busybox-console.1b6927bd4530f5fcab7c8198c2622579fee89b2280272c6a8be7b87fa1ad1fb1
+#+busybox-getty.f5ee09f5db734e123c3f1f2fa6a0a3df963dbf958ad092b4ae4dd355630f9938
+#+busybox-i2c-tools.10ac11fd994a2564466a128d499eab896807ab7e85869685dff9de02a110b387
+#+busybox-linux-extra.ce805f0ba9c349397a33ac4034861b1849e74f9eb2725af66ec0c04607e4cdc5
+#+busybox-mtd-utils.b34b5dd248104986ce12544a1b79a4b497db9ee1b6b037585ac6c06e4c8fb1c3
+#+busybox-shadow.3087c231c23c2c6cde36f741a53b7f2d2b54a65f77c9599e0ae980d6956d30ff
+#+busybox-su.a9cd5844c9b074746553c1941b34b0f1c9245cc5a42eccc6070ad2e1835414de
+#+busybox-util-linux-priv.022f2c9ee0fd5fedb75ff14c65bbd524c822eed4cbebe0b3a35d2c4abd287ab9
+#+busybox-logging.816ba4ebe2403fb1705f96de5d726bbeeb53848721184f1e56f02ca5d81c5ad7
+#+busybox-cron.16641eaed647b48709dd4dfe4fe49154e8edd778972e183be354c9d821301855
+#+execline.bb3f0d8c17461fb7d563a548172b7fa44cf34c5c3711a14e1df0a04896607f37
+#+s6.77d8e9da89a1d70ee688f4c300822b34e58c8a29852a438a94af602c1a6b0a79
+#+mdev-scripts.1e3d180af2b9b9a499007c818cd717b0bce0de864fbb6c56b69600d730632498
+#+mdevd.27dffef49b85bcc5b937547e8fbddaa4bad535ed4e878f1cd26606b5b128d4b0
+#+busybox.05bc94e84e573367607cd01b11a4b999de023ec3a47255fea573b878735bfd77+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/mlog b/variants/ccx-x86_64/mlog
@@ -1,44 +1,44 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
 #@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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.fe5b8fb14a97368eeb9a18695bc5e42b89b89cc1918e73925b341f2d5174badd
-#+gnu-make.32f731a10e47dcd22d87f98a23e1584ec1cd16e42934c425a64a879a721b42c1
-#+busybox.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+m4.497542688b61fc8003159e488f389b851343aa4c0b9d1ac56802354f41a51e2a
-#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
-#+gmp.04fb4e5ff7cc95f9aab6b9d2266d5afc089bae06115dfeec43bb5a2d3a801316
-#+mpfr.03001935daad2d23ebd12e3bb6a856cbdb1ef112d718351236a28daf61509214
+#+musl-cross-make.4822b5d4510d4789a1d2bbaf35ccec858fceca577a876b12a41f58c9f3564903
+#+gnu-make.83b64092bf223a05632a95eacc87603af46b6fe80e7ea8a421d56971ae58994e
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+m4.150cb17ee7a9dc8cc25d1e93e85e9c4386714c0f9074001244a7de2f8fa5778d
+#+nawk.133881466458aeb9ec5ae77ee85d226125bf174c340683c9455d9668d915c65f
+#+gmp.1333265a6eb24379d57d19c7df7f7eaa270cc5cc5c62c8dd3cb681a4d7ca881f
+#+mpfr.8c25a57543cb982682b5db05c169e99daef1870730f9542616ab83250aced459
 #@untar:-z:sha256:ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8:.
 
 
@@ -35,8 +35,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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.fe5b8fb14a97368eeb9a18695bc5e42b89b89cc1918e73925b341f2d5174badd
-#+gnu-make.32f731a10e47dcd22d87f98a23e1584ec1cd16e42934c425a64a879a721b42c1
-#+busybox.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+m4.497542688b61fc8003159e488f389b851343aa4c0b9d1ac56802354f41a51e2a
-#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
-#+gmp.04fb4e5ff7cc95f9aab6b9d2266d5afc089bae06115dfeec43bb5a2d3a801316
+#+musl-cross-make.4822b5d4510d4789a1d2bbaf35ccec858fceca577a876b12a41f58c9f3564903
+#+gnu-make.83b64092bf223a05632a95eacc87603af46b6fe80e7ea8a421d56971ae58994e
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+m4.150cb17ee7a9dc8cc25d1e93e85e9c4386714c0f9074001244a7de2f8fa5778d
+#+nawk.133881466458aeb9ec5ae77ee85d226125bf174c340683c9455d9668d915c65f
+#+gmp.1333265a6eb24379d57d19c7df7f7eaa270cc5cc5c62c8dd3cb681a4d7ca881f
 #@untar:-J:sha256:b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01:.
 
 
@@ -34,8 +34,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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.fe5b8fb14a97368eeb9a18695bc5e42b89b89cc1918e73925b341f2d5174badd
-#+gnu-make.32f731a10e47dcd22d87f98a23e1584ec1cd16e42934c425a64a879a721b42c1
-#+busybox.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
+#+musl-cross-make.4822b5d4510d4789a1d2bbaf35ccec858fceca577a876b12a41f58c9f3564903
+#+gnu-make.83b64092bf223a05632a95eacc87603af46b6fe80e7ea8a421d56971ae58994e
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+nawk.133881466458aeb9ec5ae77ee85d226125bf174c340683c9455d9668d915c65f
 #@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.fe5b8fb14a97368eeb9a18695bc5e42b89b89cc1918e73925b341f2d5174badd
+mcm=/home/ccx/versions/musl-cross-make.4822b5d4510d4789a1d2bbaf35ccec858fceca577a876b12a41f58c9f3564903
 
 ./configure \
 	--prefix="$prefix" \
diff --git a/variants/ccx-x86_64/musl-cross-make b/variants/ccx-x86_64/musl-cross-make
@@ -1,8 +1,8 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nofail_digest
-#+musl-cross-make.fe5b8fb14a97368eeb9a18695bc5e42b89b89cc1918e73925b341f2d5174badd
-#+gnu-make.32f731a10e47dcd22d87f98a23e1584ec1cd16e42934c425a64a879a721b42c1
-#+busybox.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
+#+musl-cross-make.4822b5d4510d4789a1d2bbaf35ccec858fceca577a876b12a41f58c9f3564903
+#+gnu-make.83b64092bf223a05632a95eacc87603af46b6fe80e7ea8a421d56971ae58994e
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
 #@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.f5dbfe92c251f40a388f8ae7d5b9ee9a14f59ff1597a2d591401df8c721b4493
-#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
+#+nawk.133881466458aeb9ec5ae77ee85d226125bf174c340683c9455d9668d915c65f
 #@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.e4db999a4586836d858df99d45eee1aaa59d4fed1a5fa24f0365db08cddb59de
-#+gnu-make.aa211b51bd7f8182794c40f039947bdf19ade8460ebfc071f9f33e6fb91a968e
-#+busybox.5792386228c725ccfeffe301dd3918f307e1f4d1391f7bdef45910089bdea8cc
-#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
+#+musl-cross-make.dde976ac2e04234c87656960596a2ae9e59c087f47b0cd218cb40a397225f2fc
+#+gnu-make.f3cf710c2b4871789f1b4d5ee4aea115fc579185d1b9d1a4b64f76f5032f0a12
+#+busybox.4f65f9428816f38411fe246d2b3d20e096986db501a16cdd561b7813bcde1119
+#+nawk.133881466458aeb9ec5ae77ee85d226125bf174c340683c9455d9668d915c65f
 #@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.f5dbfe92c251f40a388f8ae7d5b9ee9a14f59ff1597a2d591401df8c721b4493
-#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
+#+nawk.133881466458aeb9ec5ae77ee85d226125bf174c340683c9455d9668d915c65f
 #@sha256:0cdd76777a0dfd3dd3a63f215f030208ddb91c2361d2bcc02acec0f1c16b6a2e:musl-cross-make/sources/binutils-2.44.tar.gz
 #@sha256:a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898:musl-cross-make/sources/gmp-6.3.0.tar.xz
 #@sha256:b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01:musl-cross-make/sources/mpfr-4.2.2.tar.xz
diff --git a/variants/ccx-x86_64/musl-fts b/variants/ccx-x86_64/musl-fts
@@ -1,44 +1,44 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
 #@untar:-z:sha256:49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
-#+bison.7c3b1ba18d3dd2f3165c1ed8ff98b9cfa92e9d3a017d7c330af9774f5b120cab
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.133881466458aeb9ec5ae77ee85d226125bf174c340683c9455d9668d915c65f
+#+bison.a7e0bdcb32e1cad050a35ac56a54c6329158376eeefeecfaa8cedfc3fc07cb32
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
 #@untar:-z:sha256:e031b1e1d2b230f276f975bffb923f0ea15f798c839d15a3f26a1a39448e32d7:.
 
 
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=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
 #@git:51d179dad861640caeb76674b5908ccd79f04fae:netbsd-curses
 
 
diff --git a/variants/ccx-x86_64/nvi b/variants/ccx-x86_64/nvi
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+m4.b00a09f5b43913f8946dba11c3723b43861682d7388e2450c29008fd06410a9b
-#+netbsd-curses.b5a8ea43d9c2e0f470221a0bc03ce352cb81809a1a9c921a9cbf519eeb2b9e50
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+m4.fb13925f91290359b578e4c460aa68463e98bf8b7ba9d7544f772411b3560dfa
+#+netbsd-curses.e5464f5589257cd241c15a90d40f0421b3c7b67d978e36904da97e5491d01a2d
 #@untar:-z:sha256:755b87aa1e25c24c4c1668de5573d7d9a327b529423ce3ad9ee753bfb2296e33:.
 
 
@@ -63,8 +63,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,41 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+ocaml.d39c97f02658dfd3d9b224d715dc0486c2073689e0d2177164d34d6fdbc8e029
-#+ocaml-findlib.63bfa757be0d27eea53265290f387b0b85b2029cc7f0a09df5bcfb74b5fc9c8a
-#+ocamlbuild.f61b678c3cd10d6bb0243e41bc2934043506994e30b21fbb783ae993d89d4474
-#+opam.45bdc31ad2f5fb75fa8199821129ff3c48d8161eef95e2f67a2dc22809de7e35
-#+ocaml-topkg.3ac4d3213b45f4754672317dd9f9ed63e7bab14f75a8ef6affac4dee71b1ca3c
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+ocaml.fcb006dc499cdae6f2494f0bcd8ef3da10148180ca7da6d8a3b5987ad55187fb
+#+ocaml-findlib.8426da7065d6cf332f3cb7ac7c57d3e254085291267739078a8b21ae11edebe3
+#+ocamlbuild.b5559a236bdd192e9e40255e97bc8c469872eeba4492030a2e548895d9a3e6da
+#+opam.16618c6e2bc727410100a55c5fa256e55e963a81c2f52f2e8f5d5756e9ba44e5
+#+ocaml-topkg.07ad64d0f7e9cbe887c822dc85f9aa8dd6009683a031d791b127f3d2a2bebc99
 #@untar:-j:sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-base b/variants/ccx-x86_64/ocaml-base
@@ -1,40 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+ocaml.d39c97f02658dfd3d9b224d715dc0486c2073689e0d2177164d34d6fdbc8e029
-#+dune.c367dfdbdcc49f0d34c9b46ded30e57bfd34f7a5584c276c222a3ab071c8efb9
-#+ocaml_intrinsics_kernel.abfe76c89d2d14a035186ad4c4a492db8dc3a6be87fb46753e889bde3add1ee8
-#+ocaml-sexplib0.861485df15e67f566969e24de9a5c651343d6a9a8306dfe08dd52a57a41bfa12
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+ocaml.fcb006dc499cdae6f2494f0bcd8ef3da10148180ca7da6d8a3b5987ad55187fb
+#+dune.a546b7d03a8e644c6624edb62a8fcd36f7281be4ede2bbecad63daf90b6be811
+#+ocaml_intrinsics_kernel.16e2899da5b6758b4ab6eac86b553b066079ae8c9abfa2b6008257c15bfa23b9
+#+ocaml-sexplib0.47dc2e4ca8a7577aecb578fa48eb34c3c4b4408d5f70f7919f8b1e33337b6cd5
 #@untar:-z:sha256:3f3f64789ab25bb5cb7f5f907dd651dec9cc9440981822fe75df6b94344b7208:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-bos b/variants/ccx-x86_64/ocaml-bos
@@ -1,47 +1,47 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+ocaml.d39c97f02658dfd3d9b224d715dc0486c2073689e0d2177164d34d6fdbc8e029
-#+ocaml-findlib.63bfa757be0d27eea53265290f387b0b85b2029cc7f0a09df5bcfb74b5fc9c8a
-#+ocamlbuild.f61b678c3cd10d6bb0243e41bc2934043506994e30b21fbb783ae993d89d4474
-#+opam.45bdc31ad2f5fb75fa8199821129ff3c48d8161eef95e2f67a2dc22809de7e35
-#+ocaml-topkg.3ac4d3213b45f4754672317dd9f9ed63e7bab14f75a8ef6affac4dee71b1ca3c
-#+ocaml-astring.38aae1d099abeec4e6150592dc5d5784c13384324d7dda700819a4250ef13b29
-#+ocaml-fpath.3f3871d43d1b4c05332341763594d291b2a77adbad2173c058489e5fa4b26938
-#+ocaml-rresult.e7de36f81f99d6e17190d202a4546bd66779f3fcb4db610a803e7bd98899b68c
-#+ocaml-fmt.3232ee052dcc8d154a92011d15e3364dbb24eed685cdadd9e662fca2557797b9
-#+ocaml-logs.1689b93f0015e8fc8d7065255fbfb0b203b6d1859683acff15a6e486a14251c2
-#+ocaml-mtime.3b7cb715aaffbc36809eb7efc6a30571830c812f449fc1065d1ca5b9295e52b5
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+ocaml.fcb006dc499cdae6f2494f0bcd8ef3da10148180ca7da6d8a3b5987ad55187fb
+#+ocaml-findlib.8426da7065d6cf332f3cb7ac7c57d3e254085291267739078a8b21ae11edebe3
+#+ocamlbuild.b5559a236bdd192e9e40255e97bc8c469872eeba4492030a2e548895d9a3e6da
+#+opam.16618c6e2bc727410100a55c5fa256e55e963a81c2f52f2e8f5d5756e9ba44e5
+#+ocaml-topkg.07ad64d0f7e9cbe887c822dc85f9aa8dd6009683a031d791b127f3d2a2bebc99
+#+ocaml-astring.0716ad8cab7280d06e671573982a3964107c2f30350553d21bfb88676b67a02a
+#+ocaml-fpath.b18ffb2d52a499191924b606aab43355cb81b44ef50dfe57dd0aac4f4c64c4a7
+#+ocaml-rresult.2ec6c9a0cdc913cf9e93ff1a9638d8fc151b1464adf6c2e85f2c4bea5ab65878
+#+ocaml-fmt.c17403576ef459ce066207f77bdfa57c9dd675f8d8dd310a402f961141ac14a4
+#+ocaml-logs.bd39a202e3ac1066c74116f15312af64cc096079d7d08f8430342885e1893c0d
+#+ocaml-mtime.59a803de59c7995309af5b61db6fe7d5e1908a546313f03b9d3c856709c3b08b
 #@untar:-j:sha256:d8d62e786b10d697e0457205a8eedeaa27ebcc90f1855f18df190cac2e3d8f37:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-cmdliner b/variants/ccx-x86_64/ocaml-cmdliner
@@ -1,41 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+ocaml.d39c97f02658dfd3d9b224d715dc0486c2073689e0d2177164d34d6fdbc8e029
-#+ocaml-findlib.63bfa757be0d27eea53265290f387b0b85b2029cc7f0a09df5bcfb74b5fc9c8a
-#+ocamlbuild.f61b678c3cd10d6bb0243e41bc2934043506994e30b21fbb783ae993d89d4474
-#+opam.45bdc31ad2f5fb75fa8199821129ff3c48d8161eef95e2f67a2dc22809de7e35
-#+ocaml-topkg.3ac4d3213b45f4754672317dd9f9ed63e7bab14f75a8ef6affac4dee71b1ca3c
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+ocaml.fcb006dc499cdae6f2494f0bcd8ef3da10148180ca7da6d8a3b5987ad55187fb
+#+ocaml-findlib.8426da7065d6cf332f3cb7ac7c57d3e254085291267739078a8b21ae11edebe3
+#+ocamlbuild.b5559a236bdd192e9e40255e97bc8c469872eeba4492030a2e548895d9a3e6da
+#+opam.16618c6e2bc727410100a55c5fa256e55e963a81c2f52f2e8f5d5756e9ba44e5
+#+ocaml-topkg.07ad64d0f7e9cbe887c822dc85f9aa8dd6009683a031d791b127f3d2a2bebc99
 #@untar:-j:sha256:4e547a631c36fbaadff60d3bd7724eb3f83ba274e92fb725950bae7868378582:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-compiler-libs b/variants/ccx-x86_64/ocaml-compiler-libs
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+ocaml.d39c97f02658dfd3d9b224d715dc0486c2073689e0d2177164d34d6fdbc8e029
-#+dune.c367dfdbdcc49f0d34c9b46ded30e57bfd34f7a5584c276c222a3ab071c8efb9
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+ocaml.fcb006dc499cdae6f2494f0bcd8ef3da10148180ca7da6d8a3b5987ad55187fb
+#+dune.a546b7d03a8e644c6624edb62a8fcd36f7281be4ede2bbecad63daf90b6be811
 #@untar:-z:sha256:9b9644d7351db699e57ddba7c767bb4153e6e988ccf45ead2fb238a3bd75cdc7:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-cppo b/variants/ccx-x86_64/ocaml-cppo
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+ocaml.d39c97f02658dfd3d9b224d715dc0486c2073689e0d2177164d34d6fdbc8e029
-#+dune.c367dfdbdcc49f0d34c9b46ded30e57bfd34f7a5584c276c222a3ab071c8efb9
-#+ocamlbuild.f61b678c3cd10d6bb0243e41bc2934043506994e30b21fbb783ae993d89d4474
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+ocaml.fcb006dc499cdae6f2494f0bcd8ef3da10148180ca7da6d8a3b5987ad55187fb
+#+dune.a546b7d03a8e644c6624edb62a8fcd36f7281be4ede2bbecad63daf90b6be811
+#+ocamlbuild.b5559a236bdd192e9e40255e97bc8c469872eeba4492030a2e548895d9a3e6da
 #@untar:-z:sha256:6e62a8ee0217c9cc38d5860110eb18eb8d89c05c420353d298e1431fe8bac00f:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-findlib b/variants/ccx-x86_64/ocaml-findlib
@@ -1,41 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+m4.b00a09f5b43913f8946dba11c3723b43861682d7388e2450c29008fd06410a9b
-#+netbsd-curses.b5a8ea43d9c2e0f470221a0bc03ce352cb81809a1a9c921a9cbf519eeb2b9e50
-#+ocaml.d39c97f02658dfd3d9b224d715dc0486c2073689e0d2177164d34d6fdbc8e029
-#+ocamlbuild.f61b678c3cd10d6bb0243e41bc2934043506994e30b21fbb783ae993d89d4474
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+m4.fb13925f91290359b578e4c460aa68463e98bf8b7ba9d7544f772411b3560dfa
+#+netbsd-curses.e5464f5589257cd241c15a90d40f0421b3c7b67d978e36904da97e5491d01a2d
+#+ocaml.fcb006dc499cdae6f2494f0bcd8ef3da10148180ca7da6d8a3b5987ad55187fb
+#+ocamlbuild.b5559a236bdd192e9e40255e97bc8c469872eeba4492030a2e548895d9a3e6da
 #@untar:-z:sha256:662c910f774e9fee3a19c4e057f380581ab2fc4ee52da4761304ac9c31b8869d:.
 
 
@@ -55,7 +55,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/home/ccx/versions/musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/home/ccx/versions/musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
 			return 0
 			;;
 		(*)
@@ -81,7 +81,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.d39c97f02658dfd3d9b224d715dc0486c2073689e0d2177164d34d6fdbc8e029"
+stdlib="$pthbs_destdir/home/ccx/versions/ocaml.fcb006dc499cdae6f2494f0bcd8ef3da10148180ca7da6d8a3b5987ad55187fb"
 mkdir -p "${stdlib%/*}"
 ln -s "$pthbs_package" "$stdlib"
 make install prefix="$pthbs_destdir"
diff --git a/variants/ccx-x86_64/ocaml-fmt b/variants/ccx-x86_64/ocaml-fmt
@@ -1,42 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+ocaml.d39c97f02658dfd3d9b224d715dc0486c2073689e0d2177164d34d6fdbc8e029
-#+ocaml-findlib.63bfa757be0d27eea53265290f387b0b85b2029cc7f0a09df5bcfb74b5fc9c8a
-#+ocamlbuild.f61b678c3cd10d6bb0243e41bc2934043506994e30b21fbb783ae993d89d4474
-#+opam.45bdc31ad2f5fb75fa8199821129ff3c48d8161eef95e2f67a2dc22809de7e35
-#+ocaml-topkg.3ac4d3213b45f4754672317dd9f9ed63e7bab14f75a8ef6affac4dee71b1ca3c
-#+ocaml-cmdliner.a69ac95d9c5ca3a53bbad1629b8ffad5af3a574182f5db266b5d3b2e2a1a0641
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+ocaml.fcb006dc499cdae6f2494f0bcd8ef3da10148180ca7da6d8a3b5987ad55187fb
+#+ocaml-findlib.8426da7065d6cf332f3cb7ac7c57d3e254085291267739078a8b21ae11edebe3
+#+ocamlbuild.b5559a236bdd192e9e40255e97bc8c469872eeba4492030a2e548895d9a3e6da
+#+opam.16618c6e2bc727410100a55c5fa256e55e963a81c2f52f2e8f5d5756e9ba44e5
+#+ocaml-topkg.07ad64d0f7e9cbe887c822dc85f9aa8dd6009683a031d791b127f3d2a2bebc99
+#+ocaml-cmdliner.d53143e51ea9098f3eab6ba1c4498fa510de803dc22e41921b8741d6faebecd9
 #@untar:-j:sha256:857cfd47a54b52429cd9b3e2665e44173cd1bd3b435bece7172f984ad5376a1b:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-fpath b/variants/ccx-x86_64/ocaml-fpath
@@ -1,42 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+ocaml.d39c97f02658dfd3d9b224d715dc0486c2073689e0d2177164d34d6fdbc8e029
-#+ocaml-findlib.63bfa757be0d27eea53265290f387b0b85b2029cc7f0a09df5bcfb74b5fc9c8a
-#+ocamlbuild.f61b678c3cd10d6bb0243e41bc2934043506994e30b21fbb783ae993d89d4474
-#+opam.45bdc31ad2f5fb75fa8199821129ff3c48d8161eef95e2f67a2dc22809de7e35
-#+ocaml-topkg.3ac4d3213b45f4754672317dd9f9ed63e7bab14f75a8ef6affac4dee71b1ca3c
-#+ocaml-astring.38aae1d099abeec4e6150592dc5d5784c13384324d7dda700819a4250ef13b29
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+ocaml.fcb006dc499cdae6f2494f0bcd8ef3da10148180ca7da6d8a3b5987ad55187fb
+#+ocaml-findlib.8426da7065d6cf332f3cb7ac7c57d3e254085291267739078a8b21ae11edebe3
+#+ocamlbuild.b5559a236bdd192e9e40255e97bc8c469872eeba4492030a2e548895d9a3e6da
+#+opam.16618c6e2bc727410100a55c5fa256e55e963a81c2f52f2e8f5d5756e9ba44e5
+#+ocaml-topkg.07ad64d0f7e9cbe887c822dc85f9aa8dd6009683a031d791b127f3d2a2bebc99
+#+ocaml-astring.0716ad8cab7280d06e671573982a3964107c2f30350553d21bfb88676b67a02a
 #@untar:-j:sha256:12b08ff192d037d9b6d69e9ca19d1d385184f20b3237c27231e437ac81ace70f:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-logs b/variants/ccx-x86_64/ocaml-logs
@@ -1,44 +1,44 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+ocaml.d39c97f02658dfd3d9b224d715dc0486c2073689e0d2177164d34d6fdbc8e029
-#+ocaml-findlib.63bfa757be0d27eea53265290f387b0b85b2029cc7f0a09df5bcfb74b5fc9c8a
-#+ocamlbuild.f61b678c3cd10d6bb0243e41bc2934043506994e30b21fbb783ae993d89d4474
-#+opam.45bdc31ad2f5fb75fa8199821129ff3c48d8161eef95e2f67a2dc22809de7e35
-#+ocaml-topkg.3ac4d3213b45f4754672317dd9f9ed63e7bab14f75a8ef6affac4dee71b1ca3c
-#+ocaml-mtime.3b7cb715aaffbc36809eb7efc6a30571830c812f449fc1065d1ca5b9295e52b5
-#+ocaml-cmdliner.a69ac95d9c5ca3a53bbad1629b8ffad5af3a574182f5db266b5d3b2e2a1a0641
-#+ocaml-fmt.3232ee052dcc8d154a92011d15e3364dbb24eed685cdadd9e662fca2557797b9
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+ocaml.fcb006dc499cdae6f2494f0bcd8ef3da10148180ca7da6d8a3b5987ad55187fb
+#+ocaml-findlib.8426da7065d6cf332f3cb7ac7c57d3e254085291267739078a8b21ae11edebe3
+#+ocamlbuild.b5559a236bdd192e9e40255e97bc8c469872eeba4492030a2e548895d9a3e6da
+#+opam.16618c6e2bc727410100a55c5fa256e55e963a81c2f52f2e8f5d5756e9ba44e5
+#+ocaml-topkg.07ad64d0f7e9cbe887c822dc85f9aa8dd6009683a031d791b127f3d2a2bebc99
+#+ocaml-mtime.59a803de59c7995309af5b61db6fe7d5e1908a546313f03b9d3c856709c3b08b
+#+ocaml-cmdliner.d53143e51ea9098f3eab6ba1c4498fa510de803dc22e41921b8741d6faebecd9
+#+ocaml-fmt.c17403576ef459ce066207f77bdfa57c9dd675f8d8dd310a402f961141ac14a4
 #@untar:-j:sha256:ee97065ba41ce28f19dea9453c6bec4e0ef26165ad7394c4131ea0c65c0f06d5:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-lun b/variants/ccx-x86_64/ocaml-lun
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+ocaml.d39c97f02658dfd3d9b224d715dc0486c2073689e0d2177164d34d6fdbc8e029
-#+dune.c367dfdbdcc49f0d34c9b46ded30e57bfd34f7a5584c276c222a3ab071c8efb9
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+ocaml.fcb006dc499cdae6f2494f0bcd8ef3da10148180ca7da6d8a3b5987ad55187fb
+#+dune.a546b7d03a8e644c6624edb62a8fcd36f7281be4ede2bbecad63daf90b6be811
 #@untar:-j:sha256:cca8badff83b470fdcfb1840116f8e8a6f2cb86cde2f44ed28cf26cbf692a793:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-mtime b/variants/ccx-x86_64/ocaml-mtime
@@ -1,41 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+ocaml.d39c97f02658dfd3d9b224d715dc0486c2073689e0d2177164d34d6fdbc8e029
-#+ocaml-findlib.63bfa757be0d27eea53265290f387b0b85b2029cc7f0a09df5bcfb74b5fc9c8a
-#+ocamlbuild.f61b678c3cd10d6bb0243e41bc2934043506994e30b21fbb783ae993d89d4474
-#+opam.45bdc31ad2f5fb75fa8199821129ff3c48d8161eef95e2f67a2dc22809de7e35
-#+ocaml-topkg.3ac4d3213b45f4754672317dd9f9ed63e7bab14f75a8ef6affac4dee71b1ca3c
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+ocaml.fcb006dc499cdae6f2494f0bcd8ef3da10148180ca7da6d8a3b5987ad55187fb
+#+ocaml-findlib.8426da7065d6cf332f3cb7ac7c57d3e254085291267739078a8b21ae11edebe3
+#+ocamlbuild.b5559a236bdd192e9e40255e97bc8c469872eeba4492030a2e548895d9a3e6da
+#+opam.16618c6e2bc727410100a55c5fa256e55e963a81c2f52f2e8f5d5756e9ba44e5
+#+ocaml-topkg.07ad64d0f7e9cbe887c822dc85f9aa8dd6009683a031d791b127f3d2a2bebc99
 #@untar:-j:sha256:097cb2802e3701ead9572e1b483d5a28c6e2f0a39449faaf9b44ad8a89834d88:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-ppx_derivers b/variants/ccx-x86_64/ocaml-ppx_derivers
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+ocaml.d39c97f02658dfd3d9b224d715dc0486c2073689e0d2177164d34d6fdbc8e029
-#+dune.c367dfdbdcc49f0d34c9b46ded30e57bfd34f7a5584c276c222a3ab071c8efb9
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+ocaml.fcb006dc499cdae6f2494f0bcd8ef3da10148180ca7da6d8a3b5987ad55187fb
+#+dune.a546b7d03a8e644c6624edb62a8fcd36f7281be4ede2bbecad63daf90b6be811
 #@untar:-z:sha256:b6595ee187dea792b31fc54a0e1524ab1e48bc6068d3066c45215a138cc73b95:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-ppx_deriving b/variants/ccx-x86_64/ocaml-ppx_deriving
@@ -1,45 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+ocaml.d39c97f02658dfd3d9b224d715dc0486c2073689e0d2177164d34d6fdbc8e029
-#+dune.c367dfdbdcc49f0d34c9b46ded30e57bfd34f7a5584c276c222a3ab071c8efb9
-#+ocaml-compiler-libs.cfb7ff4d60de17ae01e7ce3b5c9f699ae4a1825327a36a87a71d65b35a766063
-#+ocaml-cppo.bcad6999eade4fcaf9bf711b074c9d4b35a999557e8ca14a1e21bfe1641bb28e
-#+ocaml-findlib.63bfa757be0d27eea53265290f387b0b85b2029cc7f0a09df5bcfb74b5fc9c8a
-#+ocaml-ppx_derivers.825038bc09501e5cac51e219127fecbbbea1d1cea057546a340d467ef025868a
-#+ocaml-ppxlib.3cee7b1df2e395af44729e51ff024ce17b87798f86d3db26fb73ec052b65092e
-#+ocaml-sexplib0.861485df15e67f566969e24de9a5c651343d6a9a8306dfe08dd52a57a41bfa12
-#+ocaml-stdlib-shims.808d18d87153c9dc85890dcf7677a7c3087e1ea3da6fd894f10f0a90289dfb73
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+ocaml.fcb006dc499cdae6f2494f0bcd8ef3da10148180ca7da6d8a3b5987ad55187fb
+#+dune.a546b7d03a8e644c6624edb62a8fcd36f7281be4ede2bbecad63daf90b6be811
+#+ocaml-compiler-libs.a37b12b0ce4a07977271e5f1a03097f8adf6f83e69694dd4814fd09db65627b5
+#+ocaml-cppo.8f93037e402b3875a3155b69ef0aad09831b6f5f4127b6a69a897d1375676c6c
+#+ocaml-findlib.8426da7065d6cf332f3cb7ac7c57d3e254085291267739078a8b21ae11edebe3
+#+ocaml-ppx_derivers.73ef312069eb44aafb60bdb8f15bfb06edd4a59d8f919a54e6fa2258992c7a5e
+#+ocaml-ppxlib.ac64516729e68d5c8efae1c73f133187bd03cf825ce01246eaeac2654c1ed09e
+#+ocaml-sexplib0.47dc2e4ca8a7577aecb578fa48eb34c3c4b4408d5f70f7919f8b1e33337b6cd5
+#+ocaml-stdlib-shims.0a4cdbd62d96685c15aff90f291c5aade65911d8ba7ff56b1f472bbc505b227c
 #@untar:-z:sha256:c91d1ea5e15e6928a2f8947dbd135b9f765cc0e2d72be271427981afcd350c24:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-ppxlib b/variants/ccx-x86_64/ocaml-ppxlib
@@ -1,42 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+ocaml.d39c97f02658dfd3d9b224d715dc0486c2073689e0d2177164d34d6fdbc8e029
-#+dune.c367dfdbdcc49f0d34c9b46ded30e57bfd34f7a5584c276c222a3ab071c8efb9
-#+ocaml-compiler-libs.cfb7ff4d60de17ae01e7ce3b5c9f699ae4a1825327a36a87a71d65b35a766063
-#+ocaml-ppx_derivers.825038bc09501e5cac51e219127fecbbbea1d1cea057546a340d467ef025868a
-#+ocaml-sexplib0.861485df15e67f566969e24de9a5c651343d6a9a8306dfe08dd52a57a41bfa12
-#+ocaml-stdlib-shims.808d18d87153c9dc85890dcf7677a7c3087e1ea3da6fd894f10f0a90289dfb73
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+ocaml.fcb006dc499cdae6f2494f0bcd8ef3da10148180ca7da6d8a3b5987ad55187fb
+#+dune.a546b7d03a8e644c6624edb62a8fcd36f7281be4ede2bbecad63daf90b6be811
+#+ocaml-compiler-libs.a37b12b0ce4a07977271e5f1a03097f8adf6f83e69694dd4814fd09db65627b5
+#+ocaml-ppx_derivers.73ef312069eb44aafb60bdb8f15bfb06edd4a59d8f919a54e6fa2258992c7a5e
+#+ocaml-sexplib0.47dc2e4ca8a7577aecb578fa48eb34c3c4b4408d5f70f7919f8b1e33337b6cd5
+#+ocaml-stdlib-shims.0a4cdbd62d96685c15aff90f291c5aade65911d8ba7ff56b1f472bbc505b227c
 #@untar:-j:sha256:2e223837e7cecc3bc84a432432c0a72f4e1d5be9165c9c33772f156db85db0b3:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-rresult b/variants/ccx-x86_64/ocaml-rresult
@@ -1,41 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+ocaml.d39c97f02658dfd3d9b224d715dc0486c2073689e0d2177164d34d6fdbc8e029
-#+ocaml-findlib.63bfa757be0d27eea53265290f387b0b85b2029cc7f0a09df5bcfb74b5fc9c8a
-#+ocamlbuild.f61b678c3cd10d6bb0243e41bc2934043506994e30b21fbb783ae993d89d4474
-#+opam.45bdc31ad2f5fb75fa8199821129ff3c48d8161eef95e2f67a2dc22809de7e35
-#+ocaml-topkg.3ac4d3213b45f4754672317dd9f9ed63e7bab14f75a8ef6affac4dee71b1ca3c
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+ocaml.fcb006dc499cdae6f2494f0bcd8ef3da10148180ca7da6d8a3b5987ad55187fb
+#+ocaml-findlib.8426da7065d6cf332f3cb7ac7c57d3e254085291267739078a8b21ae11edebe3
+#+ocamlbuild.b5559a236bdd192e9e40255e97bc8c469872eeba4492030a2e548895d9a3e6da
+#+opam.16618c6e2bc727410100a55c5fa256e55e963a81c2f52f2e8f5d5756e9ba44e5
+#+ocaml-topkg.07ad64d0f7e9cbe887c822dc85f9aa8dd6009683a031d791b127f3d2a2bebc99
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-sexplib0 b/variants/ccx-x86_64/ocaml-sexplib0
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+ocaml.d39c97f02658dfd3d9b224d715dc0486c2073689e0d2177164d34d6fdbc8e029
-#+dune.c367dfdbdcc49f0d34c9b46ded30e57bfd34f7a5584c276c222a3ab071c8efb9
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+ocaml.fcb006dc499cdae6f2494f0bcd8ef3da10148180ca7da6d8a3b5987ad55187fb
+#+dune.a546b7d03a8e644c6624edb62a8fcd36f7281be4ede2bbecad63daf90b6be811
 #@untar:-z:sha256:86dba26468194512f789f2fb709063515a9cb4e5c4461c021c239a369590701d:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-stdlib-shims b/variants/ccx-x86_64/ocaml-stdlib-shims
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+ocaml.d39c97f02658dfd3d9b224d715dc0486c2073689e0d2177164d34d6fdbc8e029
-#+dune.c367dfdbdcc49f0d34c9b46ded30e57bfd34f7a5584c276c222a3ab071c8efb9
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+ocaml.fcb006dc499cdae6f2494f0bcd8ef3da10148180ca7da6d8a3b5987ad55187fb
+#+dune.a546b7d03a8e644c6624edb62a8fcd36f7281be4ede2bbecad63daf90b6be811
 #@untar:-j:sha256:babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a:.
 
 
diff --git a/variants/ccx-x86_64/ocaml-topkg b/variants/ccx-x86_64/ocaml-topkg
@@ -1,40 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+ocaml.d39c97f02658dfd3d9b224d715dc0486c2073689e0d2177164d34d6fdbc8e029
-#+ocaml-findlib.63bfa757be0d27eea53265290f387b0b85b2029cc7f0a09df5bcfb74b5fc9c8a
-#+ocamlbuild.f61b678c3cd10d6bb0243e41bc2934043506994e30b21fbb783ae993d89d4474
-#+opam.45bdc31ad2f5fb75fa8199821129ff3c48d8161eef95e2f67a2dc22809de7e35
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+ocaml.fcb006dc499cdae6f2494f0bcd8ef3da10148180ca7da6d8a3b5987ad55187fb
+#+ocaml-findlib.8426da7065d6cf332f3cb7ac7c57d3e254085291267739078a8b21ae11edebe3
+#+ocamlbuild.b5559a236bdd192e9e40255e97bc8c469872eeba4492030a2e548895d9a3e6da
+#+opam.16618c6e2bc727410100a55c5fa256e55e963a81c2f52f2e8f5d5756e9ba44e5
 #@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.d39c97f02658dfd3d9b224d715dc0486c2073689e0d2177164d34d6fdbc8e029
-#+dune.c367dfdbdcc49f0d34c9b46ded30e57bfd34f7a5584c276c222a3ab071c8efb9
-#+ocamlbuild.f61b678c3cd10d6bb0243e41bc2934043506994e30b21fbb783ae993d89d4474
-#+ocaml-base.67fabd1eb4d6f7860cfae159db354e80c3210ddb9c940fbac89d0ea2beaddc2f
-#+opam.45bdc31ad2f5fb75fa8199821129ff3c48d8161eef95e2f67a2dc22809de7e35
-#+ocaml-bos.0daab7247e418cad2dc559aa1e5551402c9f5249fe4b95de06c04228892b3a1b
-#+ocaml-lun.1fb120b5c5155fd95b2762f4829898e859b3e549c308dccbea380f12efa4a706
-#+ocaml-ppx_deriving.c951f7d69d34c7983c1c3a282acb58c5678d063a9a639b4d647be938863cc748-
\ No newline at end of file
+#+ocaml.fcb006dc499cdae6f2494f0bcd8ef3da10148180ca7da6d8a3b5987ad55187fb
+#+dune.a546b7d03a8e644c6624edb62a8fcd36f7281be4ede2bbecad63daf90b6be811
+#+ocamlbuild.b5559a236bdd192e9e40255e97bc8c469872eeba4492030a2e548895d9a3e6da
+#+ocaml-base.c9411ea6bb6783283b96d99e6cf8c5fa6dc10088bfe3339a7f06b6eefe6e2dd4
+#+opam.16618c6e2bc727410100a55c5fa256e55e963a81c2f52f2e8f5d5756e9ba44e5
+#+ocaml-bos.3385351942d8127774af7ac2106603134fdf293d935817961aa472f848e3bac1
+#+ocaml-lun.c91e6898c7b8580b7265c1719b0223ecbcaec047cd38c9cddfd656e2b1fbbbec
+#+ocaml-ppx_deriving.8948592bf403c4584e2ea860d382827b84b9712f656c6fc05e4a4c87ccba574b+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/ocaml:dynlink b/variants/ccx-x86_64/ocaml:dynlink
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+m4.b00a09f5b43913f8946dba11c3723b43861682d7388e2450c29008fd06410a9b
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+m4.fb13925f91290359b578e4c460aa68463e98bf8b7ba9d7544f772411b3560dfa
 #@untar:-J:sha256:dfaa8a2e11c799bc1765d8bef44911406ee5f4803027190382a939f88c912266:.
 
 
diff --git a/variants/ccx-x86_64/ocaml_intrinsics_kernel b/variants/ccx-x86_64/ocaml_intrinsics_kernel
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+ocaml.d39c97f02658dfd3d9b224d715dc0486c2073689e0d2177164d34d6fdbc8e029
-#+dune.c367dfdbdcc49f0d34c9b46ded30e57bfd34f7a5584c276c222a3ab071c8efb9
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+ocaml.fcb006dc499cdae6f2494f0bcd8ef3da10148180ca7da6d8a3b5987ad55187fb
+#+dune.a546b7d03a8e644c6624edb62a8fcd36f7281be4ede2bbecad63daf90b6be811
 #@untar:-z:sha256:c988b7769a59749631c3c98ba5edd1d2fe91f5dc380b5e0593c073c92f4bee01:.
 
 
diff --git a/variants/ccx-x86_64/ocamlbuild b/variants/ccx-x86_64/ocamlbuild
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+m4.b00a09f5b43913f8946dba11c3723b43861682d7388e2450c29008fd06410a9b
-#+ocaml.d39c97f02658dfd3d9b224d715dc0486c2073689e0d2177164d34d6fdbc8e029
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+m4.fb13925f91290359b578e4c460aa68463e98bf8b7ba9d7544f772411b3560dfa
+#+ocaml.fcb006dc499cdae6f2494f0bcd8ef3da10148180ca7da6d8a3b5987ad55187fb
 #@untar:-z:sha256:2ba6857f2991b7f69368e8db818b163d31cf5a367f15f5953bf8f01a77b3d4fc:.
 
 
@@ -53,7 +53,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/home/ccx/versions/musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/home/ccx/versions/musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
 			return 0
 			;;
 		(*)
@@ -77,7 +77,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.d39c97f02658dfd3d9b224d715dc0486c2073689e0d2177164d34d6fdbc8e029"
+stdlib="$pthbs_destdir/home/ccx/versions/ocaml.fcb006dc499cdae6f2494f0bcd8ef3da10148180ca7da6d8a3b5987ad55187fb"
 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.5792386228c725ccfeffe301dd3918f307e1f4d1391f7bdef45910089bdea8cc
-#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
-#+gnu-make.aa211b51bd7f8182794c40f039947bdf19ade8460ebfc071f9f33e6fb91a968e
-#+musl-cross-make.e4db999a4586836d858df99d45eee1aaa59d4fed1a5fa24f0365db08cddb59de-
\ No newline at end of file
+#+busybox.4f65f9428816f38411fe246d2b3d20e096986db501a16cdd561b7813bcde1119
+#+nawk.133881466458aeb9ec5ae77ee85d226125bf174c340683c9455d9668d915c65f
+#+gnu-make.f3cf710c2b4871789f1b4d5ee4aea115fc579185d1b9d1a4b64f76f5032f0a12
+#+musl-cross-make.dde976ac2e04234c87656960596a2ae9e59c087f47b0cd218cb40a397225f2fc+
\ 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.3e9a10d515ab8608f8eda7125d1b223da285a62e85a87a56be316a539821605c
-#+busybox.aa9767ee3b751bbe864b5e7561e05d696c689c67851f439d0594c5a84a3fa04d
-#+gnu-make.17a9ee4284ea9561b349a5033e0c41ca0ef75338bc6ba876e521916ba2bf9ab0-
\ No newline at end of file
+#+musl-cross-make.994dc371f73f122cbdd8222bcaa5686ac53d16fcc70e15ebca11e0182682ea59
+#+busybox.2a07495a2d53244890fdfac884ff6b00af456322d29580f93b6838154aa8ae89
+#+gnu-make.52117e3adb2904a58a08a9bbe0ff7f55abf492efd20b20f401e8e4d00583a063+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/opam b/variants/ccx-x86_64/opam
@@ -1,41 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+diffutils.e402226c91bdbc1d81f520f5774af2a783643de737026e665472fb7605647221
-#+patch.88eb6fdfb3d7c4f06a0b07eeaf01a98d7a76514513d1bf315b15641b13f65d89
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+getconf.1162e2dd7dfcb9ab1837a558881667f4849f0cc45271b57c99716442098570f1
-#+ocaml.d39c97f02658dfd3d9b224d715dc0486c2073689e0d2177164d34d6fdbc8e029
-#+dune.c367dfdbdcc49f0d34c9b46ded30e57bfd34f7a5584c276c222a3ab071c8efb9
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+diffutils.dc4e82d72a883a620aaf8fd332471005e70ae32b92cc6e8f79885b4eb3e3d497
+#+patch.e9a7ef2dff4418f508b5904ad3d1ca1cfeab715d66e64f90aa92ef611ba9b91d
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+getconf.3e6016c0a6b397f7d15d4495e50b0599cb60d95fcb362b372ae1e3eba25b375d
+#+ocaml.fcb006dc499cdae6f2494f0bcd8ef3da10148180ca7da6d8a3b5987ad55187fb
+#+dune.a546b7d03a8e644c6624edb62a8fcd36f7281be4ede2bbecad63daf90b6be811
 #@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:.
 
 
@@ -74,7 +74,7 @@ export DUNE_CACHE=disabled
 	--infodir="$prefix/info" \
 	--localedir="$prefix/locale" \
 	--localstatedir='/var/pthbs' \
-	--with-dune='/home/ccx/versions/dune.c367dfdbdcc49f0d34c9b46ded30e57bfd34f7a5584c276c222a3ab071c8efb9/command/dune' \
+	--with-dune='/home/ccx/versions/dune.a546b7d03a8e644c6624edb62a8fcd36f7281be4ede2bbecad63daf90b6be811/command/dune' \
 	--with-mccs \
 	--with-vendored-deps \
 	--enable-static
diff --git a/variants/ccx-x86_64/patch b/variants/ccx-x86_64/patch
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+m4.b00a09f5b43913f8946dba11c3723b43861682d7388e2450c29008fd06410a9b
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+m4.fb13925f91290359b578e4c460aa68463e98bf8b7ba9d7544f772411b3560dfa
 #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:.
 
 
@@ -62,8 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+m4.b00a09f5b43913f8946dba11c3723b43861682d7388e2450c29008fd06410a9b
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+m4.fb13925f91290359b578e4c460aa68463e98bf8b7ba9d7544f772411b3560dfa
 #@untar:-J:sha256:3a224f2accf091b77a5781316e27b9ee3ba82c083cc2e539e08940b68a44fec5:.
 
 
@@ -62,8 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+pkgconf.d8ca6cccfc4f7c7cee40b3b744f8fc2333704d1dc0fd590bc871de0842a7cb51
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+pkgconf.dca62f93f86824aa1f39ceff89feea55464c7d18a8664fe5a8f4224553054c58
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/popt b/variants/ccx-x86_64/popt
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+m4.b00a09f5b43913f8946dba11c3723b43861682d7388e2450c29008fd06410a9b
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+m4.fb13925f91290359b578e4c460aa68463e98bf8b7ba9d7544f772411b3560dfa
 #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:.
 
 
@@ -62,8 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+zsh.ee349aab3a21daf6db99d54262751751665b54037d11b1d899a68ae234bf1dbb
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+zsh.c18cb977aed1960f5d8dbc037d4a593cd76c6f427dbcac528cfc5396faa22c95
 #@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.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
-#+execline.0e0e04876fcbeb1f2792fcf8d19e2d9f0fa63b8e8264315e55c02f22ed5f7c3b
-#+lnstools.bc55a1aca064c7aaeaf7dc68a13dc3b625486d6fe5622c8ed953feda75e100e5
-#+sandbox_rootfs.8a6e2a1eb0c92c87a3084c2ec43fa272033de8cdee0013dba2cda91478142308
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+nawk.133881466458aeb9ec5ae77ee85d226125bf174c340683c9455d9668d915c65f
+#+execline.7c44a9d76cbe04f2d3d261cfc395be30ea2efd9036b94e5658c91d25e1b6beb7
+#+lnstools.101a792f15f9b78bc10a87541f66ba320732c5cbae5edd87cd7da72da5ca21ed
+#+sandbox_rootfs.8fcac88dfb7131c9f40f4e4e08a7e6e982f8a43f521d4ae83a16a9a12224c1d5
 #@sha256:b85634a91129f85a5aad5cae51d4084dd7ce62544b5585f0899058576c16451f:abspaths.awk
 #@sha256:df0c24312e4941b1035a6292504fbf569f0f8b81b083835d7df84586decef25c:sandbox-rootns.in
 
diff --git a/variants/ccx-x86_64/rsync b/variants/ccx-x86_64/rsync
@@ -1,41 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+m4.b00a09f5b43913f8946dba11c3723b43861682d7388e2450c29008fd06410a9b
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+popt.43af1482864d9155ae2a5c7b0f6bfc3f316220ab07a160d434e90ca273c77d1c
-#+libressl.eb59c31f4d7d554558bbebc0cd49ca5506d1719675d3bfb85f75c58a39209769
-#+zstd.1569f38bd278d090a1b5e64f314bea51347ea0be2036cb7baf1b3d2a47c7b915
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+m4.fb13925f91290359b578e4c460aa68463e98bf8b7ba9d7544f772411b3560dfa
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+popt.a7cd7cd4031e0158f0c650df00fe859629b675e413841305ab0ebdf8f0fa9833
+#+libressl.e7ddd3146693cfd7ded9b86eb6fe85adb21eb314ad6ad5cad17285dbdf2349cb
+#+zstd.9dec917aa5ba4aa34436cb4d6b49b09398784ac819e04fa89bf4449afe7babce
 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:.
 
 
@@ -65,8 +65,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+skalibs.a48948090ab54ec83826836c1ac62c695ce7d0ee5e4796e2d4f5440b09958e36
-#+execline.bbec26b2169c46f9f28f532eef839794ce7b806f9d3f0cac9f0366fe75ee44df
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+skalibs.d463d1a0670a2e946091d17cd63f183d01e49f1a90ee26bf3668671bbe65f1c3
+#+execline.bb3f0d8c17461fb7d563a548172b7fa44cf34c5c3711a14e1df0a04896607f37
 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6
 
 
@@ -49,7 +49,7 @@ cd 's6'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.a48948090ab54ec83826836c1ac62c695ce7d0ee5e4796e2d4f5440b09958e36/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.d463d1a0670a2e946091d17cd63f183d01e49f1a90ee26bf3668671bbe65f1c3/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/ccx-x86_64/s6-dns b/variants/ccx-x86_64/s6-dns
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+skalibs.a48948090ab54ec83826836c1ac62c695ce7d0ee5e4796e2d4f5440b09958e36
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+skalibs.d463d1a0670a2e946091d17cd63f183d01e49f1a90ee26bf3668671bbe65f1c3
 #@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns
 
 
@@ -48,7 +48,7 @@ cd 's6-dns'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.a48948090ab54ec83826836c1ac62c695ce7d0ee5e4796e2d4f5440b09958e36/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.d463d1a0670a2e946091d17cd63f183d01e49f1a90ee26bf3668671bbe65f1c3/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/ccx-x86_64/s6-linux-init b/variants/ccx-x86_64/s6-linux-init
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+skalibs.a48948090ab54ec83826836c1ac62c695ce7d0ee5e4796e2d4f5440b09958e36
-#+execline.bbec26b2169c46f9f28f532eef839794ce7b806f9d3f0cac9f0366fe75ee44df
-#+s6.8deb9ec8d0a8ae11e26d257dc2758926f4ba6a06878bf4a41d8d4a6d7f92d8a9
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+skalibs.d463d1a0670a2e946091d17cd63f183d01e49f1a90ee26bf3668671bbe65f1c3
+#+execline.bb3f0d8c17461fb7d563a548172b7fa44cf34c5c3711a14e1df0a04896607f37
+#+s6.77d8e9da89a1d70ee688f4c300822b34e58c8a29852a438a94af602c1a6b0a79
 #@git:b298e515efe16210048e504e3aec89ea1e627b73:s6-linux-init
 
 
@@ -50,7 +50,7 @@ cd 's6-linux-init'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.a48948090ab54ec83826836c1ac62c695ce7d0ee5e4796e2d4f5440b09958e36/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.d463d1a0670a2e946091d17cd63f183d01e49f1a90ee26bf3668671bbe65f1c3/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/ccx-x86_64/s6-linux-utils b/variants/ccx-x86_64/s6-linux-utils
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+skalibs.a48948090ab54ec83826836c1ac62c695ce7d0ee5e4796e2d4f5440b09958e36
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+skalibs.d463d1a0670a2e946091d17cd63f183d01e49f1a90ee26bf3668671bbe65f1c3
 #@git:a9e7acac41a8854546246dd39cb4daee54ead2cb:s6-linux-utils
 
 
@@ -48,7 +48,7 @@ cd 's6-linux-utils'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.a48948090ab54ec83826836c1ac62c695ce7d0ee5e4796e2d4f5440b09958e36/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.d463d1a0670a2e946091d17cd63f183d01e49f1a90ee26bf3668671bbe65f1c3/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/ccx-x86_64/s6-networking b/variants/ccx-x86_64/s6-networking
@@ -1,41 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+skalibs.a48948090ab54ec83826836c1ac62c695ce7d0ee5e4796e2d4f5440b09958e36
-#+execline.bbec26b2169c46f9f28f532eef839794ce7b806f9d3f0cac9f0366fe75ee44df
-#+s6.8deb9ec8d0a8ae11e26d257dc2758926f4ba6a06878bf4a41d8d4a6d7f92d8a9
-#+s6-dns.5c2c0f0b5155c9fef8b5bb4e13851018b289f69dc382c94a8f1f84454b007e88
-#+libressl.eb59c31f4d7d554558bbebc0cd49ca5506d1719675d3bfb85f75c58a39209769
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+skalibs.d463d1a0670a2e946091d17cd63f183d01e49f1a90ee26bf3668671bbe65f1c3
+#+execline.bb3f0d8c17461fb7d563a548172b7fa44cf34c5c3711a14e1df0a04896607f37
+#+s6.77d8e9da89a1d70ee688f4c300822b34e58c8a29852a438a94af602c1a6b0a79
+#+s6-dns.b299ee05cb09ad716fe21c6859cc538619bb45a7152aabf04cb2978aa9f2f1f6
+#+libressl.e7ddd3146693cfd7ded9b86eb6fe85adb21eb314ad6ad5cad17285dbdf2349cb
 #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking
 
 
@@ -52,7 +52,7 @@ cd 's6-networking'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.a48948090ab54ec83826836c1ac62c695ce7d0ee5e4796e2d4f5440b09958e36/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.d463d1a0670a2e946091d17cd63f183d01e49f1a90ee26bf3668671bbe65f1c3/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/ccx-x86_64/s6-portable-utils b/variants/ccx-x86_64/s6-portable-utils
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+skalibs.a48948090ab54ec83826836c1ac62c695ce7d0ee5e4796e2d4f5440b09958e36
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+skalibs.d463d1a0670a2e946091d17cd63f183d01e49f1a90ee26bf3668671bbe65f1c3
 #@git:dc96d8a020e83b16dd7a8bd093bdb00ab2b944c0:s6-portable-utils
 
 
@@ -48,7 +48,7 @@ cd 's6-portable-utils'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.a48948090ab54ec83826836c1ac62c695ce7d0ee5e4796e2d4f5440b09958e36/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.d463d1a0670a2e946091d17cd63f183d01e49f1a90ee26bf3668671bbe65f1c3/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/ccx-x86_64/s6-rc b/variants/ccx-x86_64/s6-rc
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+skalibs.a48948090ab54ec83826836c1ac62c695ce7d0ee5e4796e2d4f5440b09958e36
-#+execline.bbec26b2169c46f9f28f532eef839794ce7b806f9d3f0cac9f0366fe75ee44df
-#+s6.8deb9ec8d0a8ae11e26d257dc2758926f4ba6a06878bf4a41d8d4a6d7f92d8a9
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+skalibs.d463d1a0670a2e946091d17cd63f183d01e49f1a90ee26bf3668671bbe65f1c3
+#+execline.bb3f0d8c17461fb7d563a548172b7fa44cf34c5c3711a14e1df0a04896607f37
+#+s6.77d8e9da89a1d70ee688f4c300822b34e58c8a29852a438a94af602c1a6b0a79
 #@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc
 
 
@@ -50,7 +50,7 @@ cd 's6-rc'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.a48948090ab54ec83826836c1ac62c695ce7d0ee5e4796e2d4f5440b09958e36/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.d463d1a0670a2e946091d17cd63f183d01e49f1a90ee26bf3668671bbe65f1c3/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.fe5b8fb14a97368eeb9a18695bc5e42b89b89cc1918e73925b341f2d5174badd
-#+gnu-make.32f731a10e47dcd22d87f98a23e1584ec1cd16e42934c425a64a879a721b42c1
-#+busybox.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
-#+skalibs.7d52c5cbdb6b51ede6e5826be45e46ccab89e63c12a9e489d6bfff883b598365
+#+musl-cross-make.4822b5d4510d4789a1d2bbaf35ccec858fceca577a876b12a41f58c9f3564903
+#+gnu-make.83b64092bf223a05632a95eacc87603af46b6fe80e7ea8a421d56971ae58994e
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+nawk.133881466458aeb9ec5ae77ee85d226125bf174c340683c9455d9668d915c65f
+#+skalibs.b4754ce0ab25a530b0f5cbfdd7fb0612be8149a6bd41d0e4d0c27bdffaf02103
 #@sha256:8d716caa5ea940bbbb8f68ac0907cea36773c183bd4c1eebad030f6cc7deaec9:argv0exec.c
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,4 +1,4 @@
 #!/usr/bin/env pthbs-build
-#+lnstools.bc55a1aca064c7aaeaf7dc68a13dc3b625486d6fe5622c8ed953feda75e100e5
-#+sandbox_rootfs.8a6e2a1eb0c92c87a3084c2ec43fa272033de8cdee0013dba2cda91478142308
-#+pthbs-sandbox-rootns.d3ac6f4bb8a0ba9698e304fc437f4afe9889555f974ec0498fde253440177e19-
\ No newline at end of file
+#+lnstools.101a792f15f9b78bc10a87541f66ba320732c5cbae5edd87cd7da72da5ca21ed
+#+sandbox_rootfs.8fcac88dfb7131c9f40f4e4e08a7e6e982f8a43f521d4ae83a16a9a12224c1d5
+#+pthbs-sandbox-rootns.0127ee0c36de3a9853da248302f039d521bbb7e4461eb1d18883f74366b311ca+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/skalibs b/variants/ccx-x86_64/skalibs
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
 #@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.fe5b8fb14a97368eeb9a18695bc5e42b89b89cc1918e73925b341f2d5174badd
-#+gnu-make.32f731a10e47dcd22d87f98a23e1584ec1cd16e42934c425a64a879a721b42c1
-#+busybox.340c358c4960450b3623dab7b9d29c0164fb92b53a4dd907a5fbd3b5b4695b49
-#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
+#+musl-cross-make.4822b5d4510d4789a1d2bbaf35ccec858fceca577a876b12a41f58c9f3564903
+#+gnu-make.83b64092bf223a05632a95eacc87603af46b6fe80e7ea8a421d56971ae58994e
+#+busybox.66c1eb5f67bf5024c53c26803f140802fe1666667ffd220f24177597a1482d1a
+#+nawk.133881466458aeb9ec5ae77ee85d226125bf174c340683c9455d9668d915c65f
 #@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.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+zsh.ee349aab3a21daf6db99d54262751751665b54037d11b1d899a68ae234bf1dbb
-#+pthbs-banginstall.af55b280ba52f0bc586b9401c4249d98f16181f53075a6164df9bf623fa0b6f6
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+zsh.c18cb977aed1960f5d8dbc037d4a593cd76c6f427dbcac528cfc5396faa22c95
+#+pthbs-banginstall.5e06e2e7e8bbdb1ce1fc8f5bfff237bc4aa4216a693288af5542d309bbc33cfb
 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep
 
 
diff --git a/variants/ccx-x86_64/squashfs-tools b/variants/ccx-x86_64/squashfs-tools
@@ -1,47 +1,47 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+attr.ba3e9238639fddabc02635bf94a9e8033a1046c2b5bb5c2d7461578e374ae3c6
-#+zstd.1569f38bd278d090a1b5e64f314bea51347ea0be2036cb7baf1b3d2a47c7b915
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+attr.c2ff57a1bed67302fbcdf0ff999f17d4e70b1b27271b0c35ededba7ee1e6f9fa
+#+zstd.9dec917aa5ba4aa34436cb4d6b49b09398784ac819e04fa89bf4449afe7babce
 #@untar:-z:sha256:4672b5c47d9418d3a5ae5b243defc6d9eae8275b9771022247c6a6082c815914:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,40 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+m4.b00a09f5b43913f8946dba11c3723b43861682d7388e2450c29008fd06410a9b
-#+patch.88eb6fdfb3d7c4f06a0b07eeaf01a98d7a76514513d1bf315b15641b13f65d89
-#+libunwind.a5bf94a39b80cb4acca25ad1d57863d15e97c7f0c50dcd433c503e77b7bf1590
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+m4.fb13925f91290359b578e4c460aa68463e98bf8b7ba9d7544f772411b3560dfa
+#+patch.e9a7ef2dff4418f508b5904ad3d1ca1cfeab715d66e64f90aa92ef611ba9b91d
+#+libunwind.8be150a8f961d4653eb788ea6b2852d65634627a99a2adf7507d1b6166eb76b5
 #@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch
 #@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:.
 
@@ -65,8 +65,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-dosfstools.16727cc8658113bb122138369782454da365b3b58a836c3d121dc1e33715e959
-#+busybox-e2fsprogs.43d5502e98949ae562201994091cca87fe4d8615fd3fd2117d8516255cb0b7a0
-#+busybox-iproute2.d5c34edb1340261d45f3ac4fda2a8540ad08e332c9add318409bb16297a64a77
-#+busybox-iputils.435e53d6548bb9e0703642319c1d31b8f246352d1547e3bc54dff31e6b717859
-#+busybox-net-misc.a400a88a61fc252c78ae2d47505607aae84055b1ae2dab52e55f74dc1a512073
-#+busybox-net-tools.fab6319189927d49c0d71246013e5202404e491236d85a3840595193413daa7b
-#+busybox-traceroute.cc7d0f8f408c0dd5eab7570633c8641e3ae08a612b03ebb605bce40f5bcc2efa
-#+busybox-wget.96f8f9a1207c82f19600b61ea3270ccf89dcb5692b183b280f7b3a0483fbe0c6
-#+busybox-chpst.0381a6f70ba800567f5c083be6270b8da1c6a878b790012a6d3920ea88ed4d3e
-#+busybox-console.f260f339ee8cbfe2bed840f9e1343045e5ee12ea7b812363c50e6c1c45724a4d
-#+busybox-getty.24925a5face8b6448b0a3c29ee42d85f2ce47b21af4bb3b781656ceb2f45c060
-#+busybox-i2c-tools.ba0a5d246fba4448fa37a815e47f37915ff4e5bbed1ac680bcce7e1d92c5a931
-#+busybox-linux-extra.48c450436c3bd540ebce5857ad85f19f4097aed01b22a4fcc4b9ef246715439c
-#+busybox-mtd-utils.0baa7458d448b7a719f2f883ca916a6781981b74786f0edf14b612e65d11a92a
-#+busybox-shadow.cb4254ceafadee6a474304f2f77dee0b349d2dfff1f1f686e386e87873fcb595
-#+busybox-su.5d1429cfdb62a73fc3f75ee167dd40b9d4a4e29ac7b3b839d0c7b6c123b055a7
-#+busybox-util-linux-priv.24ef8c2b2da97c4a268bfcec6537473d2e2d972d3ebe12d514b5de2f9aadfa2a
-#+busybox-logging.ba514b3e11c5d85bc981300ac4d899f78a94726c06eb4f0e77e98b565e55aaad
-#+busybox-cron.37460c5454992ef69ee8b315bf37867776bbac7f4029bcd2dff830d473ca9196
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+diffutils.e402226c91bdbc1d81f520f5774af2a783643de737026e665472fb7605647221
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+aat.486c3e1ae82fb8c6dd2e9b89a0c4cc526c0ce7c10ec2340ef312b96e99fbf4c1
-#+fileset.417d2b56b0d3a38d58781241f29708973f234c77fd39e9005894235980039c0d
-#+rsync.4d0fedf27435c67ae74eefc7bc7c3cfc9bb7922b66ab4129796033dc6545c6f7
-#+execline.bbec26b2169c46f9f28f532eef839794ce7b806f9d3f0cac9f0366fe75ee44df
-#+kbd.c75f06f66d7f15f2af32a2cbc26bd23cbac61109cdf5dfe0cb3e936f4d853c0d
-#+mdevd.4804daf1c8138b2481d76938ff2f459a284f29d9784eb89fc70bcd88c8506b90
-#+s6-linux-utils.84e7cfd1e09970df46c2091218ec1965078c1569f39969dd70e4e662fb084f5a
-#+s6-rc.70351deb924e8350349829fd2c97bbc2a492739908f9085288582ca6c871d587
-#+s6.8deb9ec8d0a8ae11e26d257dc2758926f4ba6a06878bf4a41d8d4a6d7f92d8a9
-#+zsh.ee349aab3a21daf6db99d54262751751665b54037d11b1d899a68ae234bf1dbb
-#+libcgroup.53dc5016c1033ca89c9e845a6fa87d13989480e730ed0c0d35f30807ab837f44
-#+system-config-scripts.d465574a923b465a1404c841703ab1c5300e648c087dcf7f9ddda9facf187b6d
-#+logincaps.b3368a28ddd78ad99995bb54d619d01f03d2912be7e1d1023a51ab98d7a9fac9
-#+busybox.c888978fc05492d9ce2330be85e8803a98655195df52293b51930a54539b9c75
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-dosfstools.bfcb87c8ab3b53b795be2df7f0b6d9950067202769ed44c140412d077d812cd8
+#+busybox-e2fsprogs.2bb11a8756e0a3269f9b129cfa4cd00b9285383a56c37955d985f85e9104a03c
+#+busybox-iproute2.a8e13c22ef8720f5241193c9f0f149454e133c0ff887eb94fec54a973e3e7127
+#+busybox-iputils.3c4c12e3114797ae9e0004fa17a6ce4681699a8aa63292f0cc52fe712b69406f
+#+busybox-net-misc.f7975ccd34c507613e987ec1287f24e7d2748dbef8e1745b02501cc2b6343a3d
+#+busybox-net-tools.7a5764d707f5ebc74279132e77e643a0df9c0d486424fb1c20995964cf226cd6
+#+busybox-traceroute.d81da318b810cdecf23a0753e101d01cffa47a341c1f18d0440988d777f167e2
+#+busybox-wget.1f84ea03b3321fec5cfc7e12251831a41b661ccfcab9fd5564b76a001d2429b9
+#+busybox-chpst.c56d51c49eab5fa32e222445870737d09488c2b3b1d4c643ef55786a9c2af8c4
+#+busybox-console.1b6927bd4530f5fcab7c8198c2622579fee89b2280272c6a8be7b87fa1ad1fb1
+#+busybox-getty.f5ee09f5db734e123c3f1f2fa6a0a3df963dbf958ad092b4ae4dd355630f9938
+#+busybox-i2c-tools.10ac11fd994a2564466a128d499eab896807ab7e85869685dff9de02a110b387
+#+busybox-linux-extra.ce805f0ba9c349397a33ac4034861b1849e74f9eb2725af66ec0c04607e4cdc5
+#+busybox-mtd-utils.b34b5dd248104986ce12544a1b79a4b497db9ee1b6b037585ac6c06e4c8fb1c3
+#+busybox-shadow.3087c231c23c2c6cde36f741a53b7f2d2b54a65f77c9599e0ae980d6956d30ff
+#+busybox-su.a9cd5844c9b074746553c1941b34b0f1c9245cc5a42eccc6070ad2e1835414de
+#+busybox-util-linux-priv.022f2c9ee0fd5fedb75ff14c65bbd524c822eed4cbebe0b3a35d2c4abd287ab9
+#+busybox-logging.816ba4ebe2403fb1705f96de5d726bbeeb53848721184f1e56f02ca5d81c5ad7
+#+busybox-cron.16641eaed647b48709dd4dfe4fe49154e8edd778972e183be354c9d821301855
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+diffutils.dc4e82d72a883a620aaf8fd332471005e70ae32b92cc6e8f79885b4eb3e3d497
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+aat.687fd1cce9cb3845bfb59ea364b40389f634d049fa124317506bb7210bab1108
+#+fileset.1e59bf6aef0778d1c5bcd1acce4d003771181416712dabf2c5694ddd4641e3fe
+#+rsync.1ea4f55d11562a8a4f1799818b3830fe599b196843ef663068720ce6e26d7ac6
+#+execline.bb3f0d8c17461fb7d563a548172b7fa44cf34c5c3711a14e1df0a04896607f37
+#+kbd.3c5a0cadf2cf3842334973d3e8adceee817c57433757c12dea53e05b5b03a133
+#+mdevd.27dffef49b85bcc5b937547e8fbddaa4bad535ed4e878f1cd26606b5b128d4b0
+#+s6-linux-utils.e85ed1d9acd43e42cac119f421bf5650512de815b267760772362941831640f3
+#+s6-rc.94e274e07193b64198fb057f6af98fe848c3b1b210bfcb1b575ffd1d0e0470ab
+#+s6.77d8e9da89a1d70ee688f4c300822b34e58c8a29852a438a94af602c1a6b0a79
+#+zsh.c18cb977aed1960f5d8dbc037d4a593cd76c6f427dbcac528cfc5396faa22c95
+#+libcgroup.1b19541bbb8ad80deae3cf2a24a6ae874b5c73cd1b438024110818b3de58146e
+#+system-config-scripts.ca8e95025be54e23f462aba77f5d1dd979b92012c20ecb78de8d8a94fe5f5657
+#+logincaps.46afd25221c71ce18c4fe3b5436b122344206503c6eec9f67e0393517bf006b3
+#+busybox.05bc94e84e573367607cd01b11a4b999de023ec3a47255fea573b878735bfd77
 #@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.ac03d3f571c90813f3188cfaf7706f8377e9467914a9dc46d52b7b5a0cc657c5' \
-	'pthbs_path_mdevd=/home/ccx/versions/env.ddb7c5c5aa15415134b22c95010d82baa423d4daf3c6563f765651075415828a' \
+	'pthbs_path_containers=/home/ccx/versions/env.cff2569b19d68d022e763397fbe3d7b6a8fe3ee07c68460294a97a6d10a158a2' \
+	'pthbs_path_mdevd=/home/ccx/versions/env.bf2ea677907f3046e1626adeb3b2e1e8f2a966fa48ce65950e1a6617c5f71662' \
 	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.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-dosfstools.16727cc8658113bb122138369782454da365b3b58a836c3d121dc1e33715e959
-#+busybox-e2fsprogs.43d5502e98949ae562201994091cca87fe4d8615fd3fd2117d8516255cb0b7a0
-#+busybox-iproute2.d5c34edb1340261d45f3ac4fda2a8540ad08e332c9add318409bb16297a64a77
-#+busybox-iputils.435e53d6548bb9e0703642319c1d31b8f246352d1547e3bc54dff31e6b717859
-#+busybox-net-misc.a400a88a61fc252c78ae2d47505607aae84055b1ae2dab52e55f74dc1a512073
-#+busybox-net-tools.fab6319189927d49c0d71246013e5202404e491236d85a3840595193413daa7b
-#+busybox-traceroute.cc7d0f8f408c0dd5eab7570633c8641e3ae08a612b03ebb605bce40f5bcc2efa
-#+busybox-wget.96f8f9a1207c82f19600b61ea3270ccf89dcb5692b183b280f7b3a0483fbe0c6
-#+busybox-chpst.0381a6f70ba800567f5c083be6270b8da1c6a878b790012a6d3920ea88ed4d3e
-#+busybox-console.f260f339ee8cbfe2bed840f9e1343045e5ee12ea7b812363c50e6c1c45724a4d
-#+busybox-getty.24925a5face8b6448b0a3c29ee42d85f2ce47b21af4bb3b781656ceb2f45c060
-#+busybox-i2c-tools.ba0a5d246fba4448fa37a815e47f37915ff4e5bbed1ac680bcce7e1d92c5a931
-#+busybox-linux-extra.48c450436c3bd540ebce5857ad85f19f4097aed01b22a4fcc4b9ef246715439c
-#+busybox-mtd-utils.0baa7458d448b7a719f2f883ca916a6781981b74786f0edf14b612e65d11a92a
-#+busybox-shadow.cb4254ceafadee6a474304f2f77dee0b349d2dfff1f1f686e386e87873fcb595
-#+busybox-su.5d1429cfdb62a73fc3f75ee167dd40b9d4a4e29ac7b3b839d0c7b6c123b055a7
-#+busybox-util-linux-priv.24ef8c2b2da97c4a268bfcec6537473d2e2d972d3ebe12d514b5de2f9aadfa2a
-#+busybox-logging.ba514b3e11c5d85bc981300ac4d899f78a94726c06eb4f0e77e98b565e55aaad
-#+busybox-cron.37460c5454992ef69ee8b315bf37867776bbac7f4029bcd2dff830d473ca9196
-#+s6.8deb9ec8d0a8ae11e26d257dc2758926f4ba6a06878bf4a41d8d4a6d7f92d8a9
-#+s6-rc.70351deb924e8350349829fd2c97bbc2a492739908f9085288582ca6c871d587
-#+s6-portable-utils.846c9d44606aa4655e4a0e77671a9ec280fe4978c7e8b91db3b64dc8908ff87f
-#+s6-linux-init.c8c62d9eea3b970579a4566bfb387e26fc4c414d9838f5bb03c6e7db2e26305c
-#+execline.bbec26b2169c46f9f28f532eef839794ce7b806f9d3f0cac9f0366fe75ee44df
-#+system-config-rc.57e30cd2eb5570a9f3020f5ad8bd4cf60b4e22284a46111963dfdc50c1e2c82e
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-dosfstools.bfcb87c8ab3b53b795be2df7f0b6d9950067202769ed44c140412d077d812cd8
+#+busybox-e2fsprogs.2bb11a8756e0a3269f9b129cfa4cd00b9285383a56c37955d985f85e9104a03c
+#+busybox-iproute2.a8e13c22ef8720f5241193c9f0f149454e133c0ff887eb94fec54a973e3e7127
+#+busybox-iputils.3c4c12e3114797ae9e0004fa17a6ce4681699a8aa63292f0cc52fe712b69406f
+#+busybox-net-misc.f7975ccd34c507613e987ec1287f24e7d2748dbef8e1745b02501cc2b6343a3d
+#+busybox-net-tools.7a5764d707f5ebc74279132e77e643a0df9c0d486424fb1c20995964cf226cd6
+#+busybox-traceroute.d81da318b810cdecf23a0753e101d01cffa47a341c1f18d0440988d777f167e2
+#+busybox-wget.1f84ea03b3321fec5cfc7e12251831a41b661ccfcab9fd5564b76a001d2429b9
+#+busybox-chpst.c56d51c49eab5fa32e222445870737d09488c2b3b1d4c643ef55786a9c2af8c4
+#+busybox-console.1b6927bd4530f5fcab7c8198c2622579fee89b2280272c6a8be7b87fa1ad1fb1
+#+busybox-getty.f5ee09f5db734e123c3f1f2fa6a0a3df963dbf958ad092b4ae4dd355630f9938
+#+busybox-i2c-tools.10ac11fd994a2564466a128d499eab896807ab7e85869685dff9de02a110b387
+#+busybox-linux-extra.ce805f0ba9c349397a33ac4034861b1849e74f9eb2725af66ec0c04607e4cdc5
+#+busybox-mtd-utils.b34b5dd248104986ce12544a1b79a4b497db9ee1b6b037585ac6c06e4c8fb1c3
+#+busybox-shadow.3087c231c23c2c6cde36f741a53b7f2d2b54a65f77c9599e0ae980d6956d30ff
+#+busybox-su.a9cd5844c9b074746553c1941b34b0f1c9245cc5a42eccc6070ad2e1835414de
+#+busybox-util-linux-priv.022f2c9ee0fd5fedb75ff14c65bbd524c822eed4cbebe0b3a35d2c4abd287ab9
+#+busybox-logging.816ba4ebe2403fb1705f96de5d726bbeeb53848721184f1e56f02ca5d81c5ad7
+#+busybox-cron.16641eaed647b48709dd4dfe4fe49154e8edd778972e183be354c9d821301855
+#+s6.77d8e9da89a1d70ee688f4c300822b34e58c8a29852a438a94af602c1a6b0a79
+#+s6-rc.94e274e07193b64198fb057f6af98fe848c3b1b210bfcb1b575ffd1d0e0470ab
+#+s6-portable-utils.85d0328cb6f9453341a044137e06ef8da10a42b1b54038d475ef152b52094b65
+#+s6-linux-init.08085df3052dafb659dd1766a4b913a2f2d9fee3089e7ffbf1167ddde1ca4ea2
+#+execline.bb3f0d8c17461fb7d563a548172b7fa44cf34c5c3711a14e1df0a04896607f37
+#+system-config-rc.1fb8804599ab108cc7ecf762e80d765535ad5f0ee343cb80f429365e58d757cb
 
 
 # - build script start -
@@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-s6rcdb=/home/ccx/versions/system-config-rc.57e30cd2eb5570a9f3020f5ad8bd4cf60b4e22284a46111963dfdc50c1e2c82e/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.1fb8804599ab108cc7ecf762e80d765535ad5f0ee343cb80f429365e58d757cb/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.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+s6-rc.70351deb924e8350349829fd2c97bbc2a492739908f9085288582ca6c871d587
-#+fileset.417d2b56b0d3a38d58781241f29708973f234c77fd39e9005894235980039c0d
-#+system-config.9664205a35a30f34435c0baddc898fde673078c9a2fe332188e037551ab4f46b
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+s6-rc.94e274e07193b64198fb057f6af98fe848c3b1b210bfcb1b575ffd1d0e0470ab
+#+fileset.1e59bf6aef0778d1c5bcd1acce4d003771181416712dabf2c5694ddd4641e3fe
+#+system-config.24fc09264c596421c642e20798afd2a5ec2586e785e1da17408766a29eb21801
 
 
 # - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-src=/home/ccx/versions/system-config.9664205a35a30f34435c0baddc898fde673078c9a2fe332188e037551ab4f46b/config/s6-rc-source
+src=/home/ccx/versions/system-config.24fc09264c596421c642e20798afd2a5ec2586e785e1da17408766a29eb21801/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.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+zsh.ee349aab3a21daf6db99d54262751751665b54037d11b1d899a68ae234bf1dbb
-#+pthbs-banginstall.af55b280ba52f0bc586b9401c4249d98f16181f53075a6164df9bf623fa0b6f6
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+zsh.c18cb977aed1960f5d8dbc037d4a593cd76c6f427dbcac528cfc5396faa22c95
+#+pthbs-banginstall.5e06e2e7e8bbdb1ce1fc8f5bfff237bc4aa4216a693288af5542d309bbc33cfb
 #@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.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+zsh.ee349aab3a21daf6db99d54262751751665b54037d11b1d899a68ae234bf1dbb
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+zsh.c18cb977aed1960f5d8dbc037d4a593cd76c6f427dbcac528cfc5396faa22c95
 #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh
 
 
diff --git a/variants/ccx-x86_64/tinyssh b/variants/ccx-x86_64/tinyssh
@@ -1,45 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
 #@untar:-z:sha256:f3ae622c765db4e0d791ea90a9feba39d7f693ef9cb949a797f7ad6b404a2d61:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b-
\ No newline at end of file
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620+
\ 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.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+execline.bbec26b2169c46f9f28f532eef839794ce7b806f9d3f0cac9f0366fe75ee44df
-#+pthbs-banginstall.af55b280ba52f0bc586b9401c4249d98f16181f53075a6164df9bf623fa0b6f6
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+execline.bb3f0d8c17461fb7d563a548172b7fa44cf34c5c3711a14e1df0a04896607f37
+#+pthbs-banginstall.5e06e2e7e8bbdb1ce1fc8f5bfff237bc4aa4216a693288af5542d309bbc33cfb
 #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env
 
 
diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment
@@ -1,93 +1,93 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-dosfstools.16727cc8658113bb122138369782454da365b3b58a836c3d121dc1e33715e959
-#+busybox-e2fsprogs.43d5502e98949ae562201994091cca87fe4d8615fd3fd2117d8516255cb0b7a0
-#+busybox-iproute2.d5c34edb1340261d45f3ac4fda2a8540ad08e332c9add318409bb16297a64a77
-#+busybox-iputils.435e53d6548bb9e0703642319c1d31b8f246352d1547e3bc54dff31e6b717859
-#+busybox-net-misc.a400a88a61fc252c78ae2d47505607aae84055b1ae2dab52e55f74dc1a512073
-#+busybox-net-tools.fab6319189927d49c0d71246013e5202404e491236d85a3840595193413daa7b
-#+busybox-traceroute.cc7d0f8f408c0dd5eab7570633c8641e3ae08a612b03ebb605bce40f5bcc2efa
-#+busybox-wget.96f8f9a1207c82f19600b61ea3270ccf89dcb5692b183b280f7b3a0483fbe0c6
-#+busybox-chpst.0381a6f70ba800567f5c083be6270b8da1c6a878b790012a6d3920ea88ed4d3e
-#+busybox-console.f260f339ee8cbfe2bed840f9e1343045e5ee12ea7b812363c50e6c1c45724a4d
-#+busybox-getty.24925a5face8b6448b0a3c29ee42d85f2ce47b21af4bb3b781656ceb2f45c060
-#+busybox-i2c-tools.ba0a5d246fba4448fa37a815e47f37915ff4e5bbed1ac680bcce7e1d92c5a931
-#+busybox-linux-extra.48c450436c3bd540ebce5857ad85f19f4097aed01b22a4fcc4b9ef246715439c
-#+busybox-mtd-utils.0baa7458d448b7a719f2f883ca916a6781981b74786f0edf14b612e65d11a92a
-#+busybox-shadow.cb4254ceafadee6a474304f2f77dee0b349d2dfff1f1f686e386e87873fcb595
-#+busybox-su.5d1429cfdb62a73fc3f75ee167dd40b9d4a4e29ac7b3b839d0c7b6c123b055a7
-#+busybox-util-linux-priv.24ef8c2b2da97c4a268bfcec6537473d2e2d972d3ebe12d514b5de2f9aadfa2a
-#+busybox-logging.ba514b3e11c5d85bc981300ac4d899f78a94726c06eb4f0e77e98b565e55aaad
-#+busybox-cron.37460c5454992ef69ee8b315bf37867776bbac7f4029bcd2dff830d473ca9196
-#+attr.ba3e9238639fddabc02635bf94a9e8033a1046c2b5bb5c2d7461578e374ae3c6
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+diffutils.e402226c91bdbc1d81f520f5774af2a783643de737026e665472fb7605647221
-#+patch.88eb6fdfb3d7c4f06a0b07eeaf01a98d7a76514513d1bf315b15641b13f65d89
-#+flex.62db98abe810d7e7101d2fc7b345620f25ed2b014aa9b3edcfc9cbcd81576cad
-#+bison.7c3b1ba18d3dd2f3165c1ed8ff98b9cfa92e9d3a017d7c330af9774f5b120cab
-#+rsync.4d0fedf27435c67ae74eefc7bc7c3cfc9bb7922b66ab4129796033dc6545c6f7
-#+execline.bbec26b2169c46f9f28f532eef839794ce7b806f9d3f0cac9f0366fe75ee44df
-#+s6.8deb9ec8d0a8ae11e26d257dc2758926f4ba6a06878bf4a41d8d4a6d7f92d8a9
-#+s6-rc.70351deb924e8350349829fd2c97bbc2a492739908f9085288582ca6c871d587
-#+s6-portable-utils.846c9d44606aa4655e4a0e77671a9ec280fe4978c7e8b91db3b64dc8908ff87f
-#+s6-linux-utils.84e7cfd1e09970df46c2091218ec1965078c1569f39969dd70e4e662fb084f5a
-#+s6-linux-init.c8c62d9eea3b970579a4566bfb387e26fc4c414d9838f5bb03c6e7db2e26305c
-#+mdevd.4804daf1c8138b2481d76938ff2f459a284f29d9784eb89fc70bcd88c8506b90
-#+s6-dns.5c2c0f0b5155c9fef8b5bb4e13851018b289f69dc382c94a8f1f84454b007e88
-#+libressl.eb59c31f4d7d554558bbebc0cd49ca5506d1719675d3bfb85f75c58a39209769
-#+s6-networking.e25fab5f4357767f1f56a09a6e9be63c7c1b7ab4b61cf4d062c5948b1ba283a4
-#+zsh.ee349aab3a21daf6db99d54262751751665b54037d11b1d899a68ae234bf1dbb
-#+pthbs-banginstall.af55b280ba52f0bc586b9401c4249d98f16181f53075a6164df9bf623fa0b6f6
-#+aat.486c3e1ae82fb8c6dd2e9b89a0c4cc526c0ce7c10ec2340ef312b96e99fbf4c1
-#+confz.b582f0f505a780333b257d71c354be12df3ba1c31f72ce01c0dc0661dc914a77
-#+containers.c95b5dcd3aded60d6e33cbda6db287b4a7ba6f873cfc2515c8285be41ebb5f29
-#+fileset.417d2b56b0d3a38d58781241f29708973f234c77fd39e9005894235980039c0d
-#+logincaps.b3368a28ddd78ad99995bb54d619d01f03d2912be7e1d1023a51ab98d7a9fac9
-#+snaprep.d10a48feeebcca16d82f294bfb3803b84e766f399c632757712811828f178910
-#+curl.520823366cbce0ec43cd9eeccdf583bd7e6968f36135e7730f9e86666b25b77f
-#+git.574f723681aabb8518d6987e828facfbd00673f9817c7f654b219db6fe6a499b
-#+xbps.3e3fa4a7a4f178e9a655193ad3cd3d1f823bc4f67c9e66852ff744378f7ec415
-#+apk-tools.61de386d7b47af77e6d8914eb27aabc03b781985009359bbe9a6261ba19727f2
-#+getent.850d6b44669f809b469d01e98b827de01e59a220c4139f78dd3a42a8ff760e3d
-#+getconf.1162e2dd7dfcb9ab1837a558881667f4849f0cc45271b57c99716442098570f1
-#+iconv.34dd6a21dad12226eb7466c248f8febb24da4b1e59dad7fdb1d8a1f674d51d2b
-#+libcap.750cbbdb22c88c8210b5a729f4103d9966edec5300f54836cb1e7b8b5dabb3c7
-#+applyuidgid-caps.68601a6edc0e5c1c2fa48b5426eb5e48d84f9ace08e929a4a2acbeb58912c65d
-#+ccx-utils.f1c96c79afebfd4e56350bac185e0c523abe8cd99f47c712e85edfcb46a447ed
-#+user-env.c7a2162bcfd02c49d2431afc1f488aefafff6fe243f12539c29ece7318761a09
-#+strace.48e789c2103ae4d7fe5cd67d6cb3adaabd3a268990d4e2d90810c4fde40d8bda
-#+mlog.a9e77a44eb9c981900a45b452e8e3e8fed94deb71f596166eae43eb5c3dd7c44
-#+findutils.a9da6321db8f1517a1159820763560207a05dbd08c858108a672cb30b3539b4b
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+nvi.8f1d361f56eadbeb1e33cf0d42688d2116645fc9c9c458457e7e4006f38b7a2e
-#+squashfs-tools.70dee5bcbe3c750a8459f2903a34652eb5ba2c0779b3376965418fb7fdf61b0f
-#+mandoc.905ce3656a3c2080f056a156db5052686ce0150e9784ed9b835b5a703b2a9a60
-#+tinyssh.37696e9ad0ec68ba78807e30f7fd2ad7e6f1867ee24708b0ab707fc8914e88f2-
\ No newline at end of file
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-dosfstools.bfcb87c8ab3b53b795be2df7f0b6d9950067202769ed44c140412d077d812cd8
+#+busybox-e2fsprogs.2bb11a8756e0a3269f9b129cfa4cd00b9285383a56c37955d985f85e9104a03c
+#+busybox-iproute2.a8e13c22ef8720f5241193c9f0f149454e133c0ff887eb94fec54a973e3e7127
+#+busybox-iputils.3c4c12e3114797ae9e0004fa17a6ce4681699a8aa63292f0cc52fe712b69406f
+#+busybox-net-misc.f7975ccd34c507613e987ec1287f24e7d2748dbef8e1745b02501cc2b6343a3d
+#+busybox-net-tools.7a5764d707f5ebc74279132e77e643a0df9c0d486424fb1c20995964cf226cd6
+#+busybox-traceroute.d81da318b810cdecf23a0753e101d01cffa47a341c1f18d0440988d777f167e2
+#+busybox-wget.1f84ea03b3321fec5cfc7e12251831a41b661ccfcab9fd5564b76a001d2429b9
+#+busybox-chpst.c56d51c49eab5fa32e222445870737d09488c2b3b1d4c643ef55786a9c2af8c4
+#+busybox-console.1b6927bd4530f5fcab7c8198c2622579fee89b2280272c6a8be7b87fa1ad1fb1
+#+busybox-getty.f5ee09f5db734e123c3f1f2fa6a0a3df963dbf958ad092b4ae4dd355630f9938
+#+busybox-i2c-tools.10ac11fd994a2564466a128d499eab896807ab7e85869685dff9de02a110b387
+#+busybox-linux-extra.ce805f0ba9c349397a33ac4034861b1849e74f9eb2725af66ec0c04607e4cdc5
+#+busybox-mtd-utils.b34b5dd248104986ce12544a1b79a4b497db9ee1b6b037585ac6c06e4c8fb1c3
+#+busybox-shadow.3087c231c23c2c6cde36f741a53b7f2d2b54a65f77c9599e0ae980d6956d30ff
+#+busybox-su.a9cd5844c9b074746553c1941b34b0f1c9245cc5a42eccc6070ad2e1835414de
+#+busybox-util-linux-priv.022f2c9ee0fd5fedb75ff14c65bbd524c822eed4cbebe0b3a35d2c4abd287ab9
+#+busybox-logging.816ba4ebe2403fb1705f96de5d726bbeeb53848721184f1e56f02ca5d81c5ad7
+#+busybox-cron.16641eaed647b48709dd4dfe4fe49154e8edd778972e183be354c9d821301855
+#+attr.c2ff57a1bed67302fbcdf0ff999f17d4e70b1b27271b0c35ededba7ee1e6f9fa
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+diffutils.dc4e82d72a883a620aaf8fd332471005e70ae32b92cc6e8f79885b4eb3e3d497
+#+patch.e9a7ef2dff4418f508b5904ad3d1ca1cfeab715d66e64f90aa92ef611ba9b91d
+#+flex.3d914abbd2a9680ad091088e45500d9be2f4e210f8adb5c1aeda5c8217e254f2
+#+bison.a7e0bdcb32e1cad050a35ac56a54c6329158376eeefeecfaa8cedfc3fc07cb32
+#+rsync.1ea4f55d11562a8a4f1799818b3830fe599b196843ef663068720ce6e26d7ac6
+#+execline.bb3f0d8c17461fb7d563a548172b7fa44cf34c5c3711a14e1df0a04896607f37
+#+s6.77d8e9da89a1d70ee688f4c300822b34e58c8a29852a438a94af602c1a6b0a79
+#+s6-rc.94e274e07193b64198fb057f6af98fe848c3b1b210bfcb1b575ffd1d0e0470ab
+#+s6-portable-utils.85d0328cb6f9453341a044137e06ef8da10a42b1b54038d475ef152b52094b65
+#+s6-linux-utils.e85ed1d9acd43e42cac119f421bf5650512de815b267760772362941831640f3
+#+s6-linux-init.08085df3052dafb659dd1766a4b913a2f2d9fee3089e7ffbf1167ddde1ca4ea2
+#+mdevd.27dffef49b85bcc5b937547e8fbddaa4bad535ed4e878f1cd26606b5b128d4b0
+#+s6-dns.b299ee05cb09ad716fe21c6859cc538619bb45a7152aabf04cb2978aa9f2f1f6
+#+libressl.e7ddd3146693cfd7ded9b86eb6fe85adb21eb314ad6ad5cad17285dbdf2349cb
+#+s6-networking.19a67c271d68387e41586723131ca7970c1c20bc83c7860f7e68c91c5dbc714c
+#+zsh.c18cb977aed1960f5d8dbc037d4a593cd76c6f427dbcac528cfc5396faa22c95
+#+pthbs-banginstall.5e06e2e7e8bbdb1ce1fc8f5bfff237bc4aa4216a693288af5542d309bbc33cfb
+#+aat.687fd1cce9cb3845bfb59ea364b40389f634d049fa124317506bb7210bab1108
+#+confz.70b430521bea44b587292b84b9b41f78e73ed2cb84b403b20c02568943ed3a6d
+#+containers.43e524d809d99038b4d2c4b3738abe8e6a5ef513991e3aa5ad622046668522ec
+#+fileset.1e59bf6aef0778d1c5bcd1acce4d003771181416712dabf2c5694ddd4641e3fe
+#+logincaps.46afd25221c71ce18c4fe3b5436b122344206503c6eec9f67e0393517bf006b3
+#+snaprep.45d19ec25ba284913896d5712cdf3bd2836b6d19c46c0852810ea08e4b040f2c
+#+curl.881c698809162775a5293f2d659d8583be72ff5e8ebf28660a1b608d12b3f5ae
+#+git.28e713481bec04b7af60b1d932525c9395cf17316a7c6e7c30f365965a308ef1
+#+xbps.8ea9e86704452913183ebcc34da0fedc6654fb47d9c29adf3facb3c4f7f8afd7
+#+apk-tools.c31f5449416052e2ca44cdfe4be7a45c959845e2adec492221e45e7b9a5623a5
+#+getent.dfac6fb0d000996471c2420701c57b7d9a2fa92353ea3c25a8a023a4cbe8fd5b
+#+getconf.3e6016c0a6b397f7d15d4495e50b0599cb60d95fcb362b372ae1e3eba25b375d
+#+iconv.f650bafd90aa37f35e48088ee0686bdf28b9b86061f90693abae6bf6ecd5b295
+#+libcap.854415ab12199c235370336a17e3fa5444433054117bdbc78c7b5f11ec33dc1a
+#+applyuidgid-caps.bd3dcdf6d522ca614bad74338dd94e02d8d8ca757db36b713942cac83882b720
+#+ccx-utils.8afebb01beca6e7443278d9c396aaea88a53ee3db084e7b55588e6b023d1a0fb
+#+user-env.7adbd04fa68290438f07feafc535e3e6ee82db634dad36a490afeead72ed6e0a
+#+strace.efcac4444729854963313bd6a3a7cc42e27c30f175b6d911cc174808e10f5367
+#+mlog.0e53fde1c5b8847990b1394f34948bf8b3d4e0e47a73c0ee868d8f034c7a3e60
+#+findutils.991b0d6e817288a8caeab25196bcab1b91f074a1bae4b4a38c0e95da345e3b47
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+nvi.2366d92cfbabeba61dd7171cb067a5a419f019784f1c16e6a5cdd63071cae53a
+#+squashfs-tools.59c20c0cd69c767d7e59ee21073749fd652b19ce3389eb5d3e641126ad20b250
+#+mandoc.d44bf79bcf948842272d7069548cd64582b60b9ef4ce5dc42fab26ae1d50931d
+#+tinyssh.d141b77f1451840da4dd57080d4dacc5afd505c0a0d9e6df39c9b3fc659e40b9+
\ 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.515bfeca53caf2766343387ff811a6f287987d7ca360fb59a243a7d551969e52-
\ No newline at end of file
+#+linux-qemu-guest.4f819c31d741260c030178bedb5ffb1b4af6791891d8acae94ade509e983f204+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/xbps b/variants/ccx-x86_64/xbps
@@ -1,47 +1,47 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+libarchive.5cc1a445d3478617fe4633d9c8513e3365b595d9e689aaef7913b2d2727b02fe
-#+libressl.eb59c31f4d7d554558bbebc0cd49ca5506d1719675d3bfb85f75c58a39209769
-#+pkgconf-pkg-config.751fa6d0cec8733f5f6f87a764ecb38665e08371b66220bfb8f4337c43467ceb
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+libarchive.02225a41543ee548a62bfb983991e825361ca6a7e7ce17d35233ed145ce5a5cd
+#+libressl.e7ddd3146693cfd7ded9b86eb6fe85adb21eb314ad6ad5cad17285dbdf2349cb
+#+pkgconf-pkg-config.c15392f5ccbe7242db2b1a726068d860e1c7728516554d4e07de10b5ce6f0cce
 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,40 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+m4.b00a09f5b43913f8946dba11c3723b43861682d7388e2450c29008fd06410a9b
-#+netbsd-curses.b5a8ea43d9c2e0f470221a0bc03ce352cb81809a1a9c921a9cbf519eeb2b9e50
-#+libbsd.d3453a41ecf6654db68dcb471c0764b247f7202cc3cf90df766ebd94aec7e254
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+m4.fb13925f91290359b578e4c460aa68463e98bf8b7ba9d7544f772411b3560dfa
+#+netbsd-curses.e5464f5589257cd241c15a90d40f0421b3c7b67d978e36904da97e5491d01a2d
+#+libbsd.3c06d6c4c154f30e533d63b1bda13b34531c5ff2f8d9afd9844e9af424df1572
 #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config
 #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:.
 
@@ -65,8 +65,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,45 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.2afc3e93fdae83f83144443eb69443f0f3f0ebe61a4843052df5e6f64f6d2ec0
-#+busybox-bzip2.75142f13a4c9f185c0da6ea5b80121311f6db4be0a9d80efe8b870f4c2df0393
-#+busybox-gzip.0909cf581dabedde4eec2b6f6be7d5d265249a5f9d724b713d0efa5bf86df8af
-#+busybox-lzop.453b5c2c86d8c71f42207ec4af15cfef791e0ca263f2f7c430ced5b4b2e23d1b
-#+busybox-unzip.22040475d5985baccf503debad42a4c8707d536d0d72af81d3b7863b92cd66f1
-#+busybox-xz.df27ac0e96405f7ee3460a0e15e5e2e469704e2de287dd892a911897e42cb1d6
-#+busybox-cpio.78a402edaa6242d8a8eb17e75fe5b44318d977b8d67e2ddc79c779816dd9eb9e
-#+busybox-dpkg.d8f6c883016471031c32e32c2050785a8c8d9b6a0ddae255e136c95c66ed17d7
-#+busybox-rpm.664f01b4f920203dde9bdc42c58443423d9692e2ac7c3ce0b90159d91988e52f
-#+busybox-tar.5322d6c7ad0fbf28cc44f6bc8c044217ac3ab3b965bd981a5b5de400b58b0336
-#+busybox-ed.1210de2d59feefe95643bee4cf6fefb6236384940b56c46211397694d156bf6c
-#+busybox-sed.c86d6c595010427bc3679bf2b6a8266fb3b17b908b09957fcb29fcb480709dc6
-#+busybox-vi.928a1c92d06dc8123db0b6baf5c1e4f6201893c50e81daf01ead939c82b6dcc8
-#+busybox-xxd.ccf544dcc6783c3c79a4897217425914cd3353e0d5d4b45f7e18b17c01bcca38
-#+busybox-process-extra.f885f15f90382d85de3751fe5d5160f1d28e28d2384ee65721b880ecc6d174cf
-#+busybox-procps.5b843fe7357aec3ae9931f38b4ab0f24aee477bdf5dcb90ef999356c4c8e2585
-#+busybox-psmisc.c9581a5a7aaa7e0bcb8eed3d26fcebd9ff354ad0e1ea4a4f5d52df56045c99dc
-#+busybox-ash.eb73de983e23287cc4b7a0350d960f584bdffc25b6645a710de83a02e75c5be8
-#+busybox-bc.8ab2db2a27d1f9399c540c7cbbc85c05e0836bea931a05d5dd7ab3a35bcf6333
-#+busybox-coreutils.f6b63f68341e92623d182409bce738d81cbe6ccb8d1e986d1f77ba8c9a19bd65
-#+busybox-coreutils-extra.3f1edda21b60b206f2015096eb36c4aad50410f1db1376e852bafb8913d7a354
-#+busybox-daemontools.33a8c1ba24093f0caf6784f1b8a31c985e35bdaabdca1a62d098e2458f73b11b
-#+busybox-grep.d0407ff4db7443a417cb8fd3065a776312520a7b7a9edf275491cb10c9a620b6
-#+busybox-misc.50d0c3617ea455b2bf6b627bc8cb465ef6d02ab27895eaeae89f124472840c87
-#+busybox-sh.8fe315002f05904abadb977eab3ad56dd659cdd1640269ba2b13aacb841e52db
-#+busybox-util-linux-unpriv.96cfc0d913b5f258788945e867dd7b487a4654d42fce9ae0eab9adc9d8a7fa8b
-#+busybox-findutils.530114054b1a24d9002ec053a9ffaf93491e8c8f7317adb7480cfc9d04081544
-#+nawk.1cf2be7a836702ee7fc36234866236ff8092ba5f93cb2bbffcc69fd1539464cd
-#+musl.ce7728f936f480e8c12a93f983331dd219ae00d8ffe71fd2533d7896d68a1fe7
-#+gcc.76383d9d555e795d9e24fbca9db4b62ca394d6d4ddceff66d7aee5860817f7a1
-#+binutils.a230c6ee108ac9037f82c535bc552c36d22e92345d8ec15e621f7bb8dce21b1b
-#+gnu-make.a9d598a723c6315636692901d71f4c5f22c5a4adc782cf1ffa7d16cf0804ceb1
-#+busybox-diffutils.10ff103de025bd37a7bb7e3c234da9e7ddf61260c065fe64e6790f6b68f37c7c
+#+busybox.bfc7f616de65cd5860a529149d9b98c30a3485db04c0dc277b7796e580aeb2cf
+#+busybox-bzip2.bcbb26e79adf6508fe425a3ccb3b9a5338901999abdfccb3908085a3c0760d99
+#+busybox-gzip.7f1fac5fe09b6b662d79151dc7abc9b3dfd81388e317c33408e72c00873c26a8
+#+busybox-lzop.a4cc2a33e1b2cd4527bfa56580fac6ffda65334d0d01241d2a540daa6e81c2da
+#+busybox-unzip.41d7e2453af5f54c7f5d2a0ea6dcf8e7caaa997c8cffea6e342e9e0db1e25091
+#+busybox-xz.dc1cdc8512a3b4d8283f622efa9e7ac87b2a0d0cd58b92af21dfda4e56ef8d3a
+#+busybox-cpio.295ac48e4b585532ea0b4f06401628123da388018516608075906fa1b5e1c262
+#+busybox-dpkg.afbe4edacfa489e24ec8f3abe51b5b018f7e61949a3d8b9e6a0b8266f09ec43e
+#+busybox-rpm.ee88c2092ce5a54b6fae9765b3490cdc993b5133b4182f29c35ae612b3cf9537
+#+busybox-tar.6390e18bbceb22d40d8b57e164120c3a523d140679f400734f0868f46eaf0e6e
+#+busybox-ed.d2cc594b0567ffb1c2af3a4ad2ee1251bd324ca39df5ae40d191e428c4b7af81
+#+busybox-sed.9f82d397324848fab019e5ab63f63a2cfc2b11828454c19c2351fe3d11ac234a
+#+busybox-vi.526c897ff4f3ee7df95003fa82afeef45a5a2a7e357f9954d8672ba719520070
+#+busybox-xxd.f5d756beb2881d787999ae3549f8f7718c9262566c7d37aafb52f0f79bc6eba2
+#+busybox-process-extra.2af9718cc1b1501f5836ab1c5be32cf882ce46b58e99f3f4f7aeecbc15dbb380
+#+busybox-procps.aba794b6d2df0a52f72be7a1422ca200acf09ff515a5a9a37ad53e0abc366bf0
+#+busybox-psmisc.7ff84981bed1f5b45eccae6b832347cd84e4d7cddf90ca7f5df22e2238c98100
+#+busybox-ash.3b81afaa224d28f9ea7733a39689a2c288c9b925a85c231ce5c738fbdd9767e0
+#+busybox-bc.32f8464f2d4a0a01827a50d36cf5fbf281e7ad3a951ae927a7ef01f96f1c79fa
+#+busybox-coreutils.5030b92a037b1e79aba2595689866ca21624560a6e1614305c2a970b7a6a467f
+#+busybox-coreutils-extra.3cd71fb291a2e0caea71c5d971337e6e79d47e214ae11326d20e0020e184a19b
+#+busybox-daemontools.31696b0a23e005b5752f0971626fa7dfc304b45ebc3c52554d33a1ab876d6b44
+#+busybox-grep.8b5f2384df11e79dbb5fdab45ba49f1f99106f3f2251945a3250ac5407c671db
+#+busybox-misc.b7aaa0fb3ace572f841c7c833c1d5d7f53580c2645311ed23768181414b779ae
+#+busybox-sh.7942d6d97429ee3b1e950ecc769012ef2f3d939fac83570b3cd4b2c098e29a5b
+#+busybox-util-linux-unpriv.74244b8cfe4648fef8553181dc1f0c47060f305bdc0c7c6eaca198bea06ff566
+#+busybox-findutils.0c3d2c06a5d90f9223ba985c4d16d5cc7baec7d624ddc9fc9a0cec739b8d6ede
+#+nawk.1dad9c02a25a7b2a1e527c766f40b80c7fdd30690648082a26afdb452116365f
+#+musl.c28eb7a28cdadcdaa25398a68a4148541c79084d7caee50c17f1f56ef81d4f6c
+#+gcc.f37774289e978231ccd0f9691ca93e0e06036291c52d01cf5e17cc55840b0131
+#+binutils.665dbe2c5720986849179326c50f5a4fbb806667fc21a43e590b168cff648620
+#+gnu-make.69bc3b9980c2f548e2b9da4fb6bc06df35ce23cea1bfbd94da41674159dbb4e6
+#+busybox-diffutils.e195baa911283b7384ca630f9b327d6f32f7fa3cd3a357f0889526eeb83c1ed7
 #@untar:-z:sha256:98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+zsh.940fb164d1b08494f9050c2d0a703ca17b52aef114c5b743188afa6e0cc2535a
-#+pthbs-banginstall.385ee92921055459329c5747e278d9afcde737a2739d6b049c75d8c8e52dfe05
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+zsh.ee33e58971ec7f0fcbef113a52c386426b21d53d9fd11b3364fc3c01c3d23150
+#+pthbs-banginstall.36288015cc9c716da55767223cc33a3f8f31c46c14dbc223cf37ea59d25263d3
 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat
 
 
diff --git a/variants/root-x86_64/abduco b/variants/root-x86_64/abduco
@@ -1,45 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
 #@git:8c32909a159aaa9484c82b71f05b7a73321eb491:abduco
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
 #@git:c7b36ed27103ee3f9aa01905ba1fac2d606079cf:alpine-keys
 
 
diff --git a/variants/root-x86_64/apk-tools b/variants/root-x86_64/apk-tools
@@ -1,41 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+patch.7b9c4e1c303eebd9d10cdd03a98031cdaeb7c2dd6284993cce893a198370fc98
-#+libressl.bb138b71407428bdbaa535460d64b56c272b073487744b79a189033121a2fa5f
-#+zstd.b32e156387e297d76a06a61df269492fc0e0428d431c464b2c822cda41c68f66
-#+pkgconf-pkg-config.bad1bdc30add7fe2e1a5558c68fb5fc463836feb1e941a11314b7d2f598fdbb1
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+patch.938ec0e5bec811c233bf8169955722f2d649291cfcd4bbd51505d5a8a01a02c3
+#+libressl.1de2bbcf63a2e25dfc53f2ec10bce4b4c76305694cde2848c482a06f9cae58db
+#+zstd.ba62fc1046eab5dd0a0a55729857788ad51d84bf380d5c7e6d1241403e6ab2f2
+#+pkgconf-pkg-config.f61cd4ef48da754d83ca0eb39c26316cd0e9f8e0f59ba8f33fd02d77239b592b
 #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch
 #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools
 
@@ -43,8 +43,8 @@
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,45 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+skalibs.996c296dc6913eafb73cae5d800ec88eb7910bd5f769c7bd76801b0862bf8798
-#+libcap.f0a236db04827d73d84ee29f216723ee0aaddd6540b0f5f31864fdc5b890a177
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+skalibs.3c52744da310a82cb7bea2ab5407487c409a3d7b88b4267afab55694cade488c
+#+libcap.0b7bf4a1ceae78011eebade98d279b5740ea41d7b3bfb4487c57299ea173d6ac
 #@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+m4.a61864a21512ed75ea7bcd752e8600e5392ae095487060f27ffeda895bf1330c
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+m4.915d4de6f7fcffd54583accd119a9e43494fecba0d87d1c52763cb8f91c08544
 #@untar:-z:sha256:c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6:.
 #@untar::sha256:a4facc0856b512ad8ab5aed7b07e14a9629aaf042b1e92377ba22fcfc4c4205b:argp-standalone-1.5.0
 
diff --git a/variants/root-x86_64/attr b/variants/root-x86_64/attr
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+m4.a61864a21512ed75ea7bcd752e8600e5392ae095487060f27ffeda895bf1330c
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+m4.915d4de6f7fcffd54583accd119a9e43494fecba0d87d1c52763cb8f91c08544
 #@untar:-z:sha256:39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87:.
 
 
@@ -62,8 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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.22dc62e0fb617806f87b8c176baf8a254b6e3f4000c4922a5bbd25c711a753ee
-#+gnu-make.eade157dc9f705700afa644952c4a4b2c9d4b4dc359009904bb383e72ee66c5e
-#+busybox.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+m4.8f840f8239439a7d886fabf117d4e4a7df929209049e7af829fa88d5a6d3bcc9
-#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
+#+musl-cross-make.54dd6edc9bf08879bd3befb4053c5b17fc817f12c2a133e69d0136b697ddf55e
+#+gnu-make.c437f52cec5900e752ee976cde1c70c02af126c44a60a80cf9e96d997b07383e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+m4.503d428659d089b1c68a5490d21a386642f57f1b792029fb6f5260ffd8d8643a
+#+nawk.c00d6bfea54d17362a10f318ccbfdb556d7ac63d364bdfb3aefef5681d3189ff
 #@sha256:a119e7e50cae23feaad160a533d69a90073a519521924da56abc74724cec65c6:merged.patch
 #@untar:-z:sha256:0cdd76777a0dfd3dd3a63f215f030208ddb91c2361d2bcc02acec0f1c16b6a2e:.
 
@@ -34,8 +34,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+m4.a61864a21512ed75ea7bcd752e8600e5392ae095487060f27ffeda895bf1330c
-#+flex.5713d65d97748b6cfc910831781c963c9e1218b05f57540206dba32dcd1d7f84
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.c00d6bfea54d17362a10f318ccbfdb556d7ac63d364bdfb3aefef5681d3189ff
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+m4.915d4de6f7fcffd54583accd119a9e43494fecba0d87d1c52763cb8f91c08544
+#+flex.5380b424ecae363df5aad941b61d38d9dc5b9c6edc32611bbd1da8830203a220
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 
@@ -64,8 +64,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+gnu-make.eade157dc9f705700afa644952c4a4b2c9d4b4dc359009904bb383e72ee66c5e
-#+musl-cross-make.22dc62e0fb617806f87b8c176baf8a254b6e3f4000c4922a5bbd25c711a753ee-
\ No newline at end of file
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+gnu-make.c437f52cec5900e752ee976cde1c70c02af126c44a60a80cf9e96d997b07383e
+#+musl-cross-make.54dd6edc9bf08879bd3befb4053c5b17fc817f12c2a133e69d0136b697ddf55e+
\ No newline at end of file
diff --git a/variants/root-x86_64/busybox b/variants/root-x86_64/busybox
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.eade157dc9f705700afa644952c4a4b2c9d4b4dc359009904bb383e72ee66c5e
-#+busybox.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.c437f52cec5900e752ee976cde1c70c02af126c44a60a80cf9e96d997b07383e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
 #@sha256:31b8f61d2173fa36d4409e8e91f52088691d6ba4db13efe19ea7ae7512e64275: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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/busybox-i2c-tools b/variants/root-x86_64/busybox-i2c-tools
@@ -1,6 +1,6 @@
 #!/usr/bin/env pthbs-build
-#+busybox.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
 
 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.22dc62e0fb617806f87b8c176baf8a254b6e3f4000c4922a5bbd25c711a753ee
-#+gnu-make.eade157dc9f705700afa644952c4a4b2c9d4b4dc359009904bb383e72ee66c5e
-#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
+#+musl-cross-make.54dd6edc9bf08879bd3befb4053c5b17fc817f12c2a133e69d0136b697ddf55e
+#+gnu-make.c437f52cec5900e752ee976cde1c70c02af126c44a60a80cf9e96d997b07383e
+#+nawk.c00d6bfea54d17362a10f318ccbfdb556d7ac63d364bdfb3aefef5681d3189ff
 #@git:8d7ae80eda7e08ee361f8793683ae58216caf720:busybox
 #@sha256:13ed92216aef70e6fc431b2e66a9b20a71b5f4b69a3d7a84acbc4d1210d6ea6a:busybox/.config
 
 PATH="$pthbs_build_environment/command:$PATH"
-mcm=/versions/musl-cross-make.22dc62e0fb617806f87b8c176baf8a254b6e3f4000c4922a5bbd25c711a753ee
-make=/versions/gnu-make.eade157dc9f705700afa644952c4a4b2c9d4b4dc359009904bb383e72ee66c5e
+mcm=/versions/musl-cross-make.54dd6edc9bf08879bd3befb4053c5b17fc817f12c2a133e69d0136b697ddf55e
+make=/versions/gnu-make.c437f52cec5900e752ee976cde1c70c02af126c44a60a80cf9e96d997b07383e
 
 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.c2fb2e2455bfe14d4a02160674f83b5bb7b7a7b45aa37fb736efc2335ef029ae
-#+gnu-make.aefac1011f80fc35ae17a394eab3fddadeda6b788a6a49889efbe78d7365eb91
-#+busybox.bb6f1d57e91d00ac686a3dc3897152433b98f066ee9e6ae95d7d35863496ffac
-#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
+#+musl-cross-make.e9946dfdf62ed06dc86a580d49ab0125cb534acbc0d2623f6c2d0f6960857960
+#+gnu-make.367f296c3c6c53a03ebd428e60b59f50b1c0a8a4fcf767fcda70fce8740773d9
+#+busybox.eae69ad708db8919d4776903fdb6d7b383802d9c837c31cc25779477429e49fb
+#+nawk.c00d6bfea54d17362a10f318ccbfdb556d7ac63d364bdfb3aefef5681d3189ff
 #@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.0db83a03695adab20fbf668e85604a1b9d6ffbcff71618bafc909c053f801192
-#+gnu-make.aefac1011f80fc35ae17a394eab3fddadeda6b788a6a49889efbe78d7365eb91
+#+musl-cross-make.6d127b68c31bc67a13293f51dc2c6104c6919f18893bcd4e18a19dee6278c4e0
+#+gnu-make.367f296c3c6c53a03ebd428e60b59f50b1c0a8a4fcf767fcda70fce8740773d9
 #@git:8d7ae80eda7e08ee361f8793683ae58216caf720:busybox
 #@sha256:13ed92216aef70e6fc431b2e66a9b20a71b5f4b69a3d7a84acbc4d1210d6ea6a:busybox/.config
 
-mcm=/versions/musl-cross-make.0db83a03695adab20fbf668e85604a1b9d6ffbcff71618bafc909c053f801192
-make=/versions/gnu-make.aefac1011f80fc35ae17a394eab3fddadeda6b788a6a49889efbe78d7365eb91
+mcm=/versions/musl-cross-make.6d127b68c31bc67a13293f51dc2c6104c6919f18893bcd4e18a19dee6278c4e0
+make=/versions/gnu-make.367f296c3c6c53a03ebd428e60b59f50b1c0a8a4fcf767fcda70fce8740773d9
 
 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.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+certdata2pem.d3442af886f1fa81648cd88c84842f335ec7cd1d2f6b0473807a26c0b52f9d02
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+certdata2pem.fb71eaf75867a884f8cc58589949404ee9a35203d367e29d0106bae07f5ad4ca
 #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:.
 
 
diff --git a/variants/root-x86_64/ccx-utils b/variants/root-x86_64/ccx-utils
@@ -1,46 +1,46 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+skalibs.996c296dc6913eafb73cae5d800ec88eb7910bd5f769c7bd76801b0862bf8798
-#+s6.aa379bb33c5efeb8d7b4773f1a01131c91e8868516914c6b5f7eca15dcdca9b5
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+skalibs.3c52744da310a82cb7bea2ab5407487c409a3d7b88b4267afab55694cade488c
+#+s6.b8ee6272cc50fbd1f413b539cb0a149258a5b8fdd90c3136f55356334d79ffa5
 #@git:461a9ec198c1e2b9c39a34e21786747dbb8671b4:ccx-utils
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
 #@sha256:064f7d41106cd9efa08b9e68cf049f44e3be55666bd2ab96d02c508293b8dce7:certdata2pem.c
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+zsh.940fb164d1b08494f9050c2d0a703ca17b52aef114c5b743188afa6e0cc2535a
-#+pthbs-banginstall.385ee92921055459329c5747e278d9afcde737a2739d6b049c75d8c8e52dfe05
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+zsh.ee33e58971ec7f0fcbef113a52c386426b21d53d9fd11b3364fc3c01c3d23150
+#+pthbs-banginstall.36288015cc9c716da55767223cc33a3f8f31c46c14dbc223cf37ea59d25263d3
 #@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.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-dosfstools.71bc76a0ed81f75f627cdad20afad3c043a742ac5b596f9fea7d346c70a121bb
-#+busybox-e2fsprogs.b0bdc0e6ab9e92ea85207b4725ed273f32ef9800890eb9c0aa966ebb1d6741fc
-#+busybox-iproute2.6ff8eea2f6058b3e00c3209144bb6a80c3b4914e446115b7014cf987f4d3ddc1
-#+busybox-iputils.78685d282f393c31b9fbcb7d7723543b2b9892f609411c646bec3c0f8d64c982
-#+busybox-net-misc.2aae98f296fd0d15269f1b6a72932dd0a0905b62dbd28be67f8cbb16ec798a16
-#+busybox-net-tools.d50ec3c3d82a9084545fcb1525947814f703fb7622882484b28e6e2c75cdaabb
-#+busybox-traceroute.8a295cff05cf57f9c4c32116fb9f216b50cd352a5d6d2ece31af95aacd9c01bc
-#+busybox-wget.941d8e621ef79b83cf954caacd4d36a558d0f89a1f7f5842db3c49ca66f2d401
-#+busybox-chpst.2e94bfa7a9d9469bb306f2e14172c3cbd7e3952058836bd771c2c96d01959555
-#+busybox-console.b358f2f28ef1fe7801a45bb277f49dad3b51a077619525cd6c2814d27d5d4135
-#+busybox-getty.53ec1d2582847d9e416abf924ef3d7d6000529a12d6a55a38dbd3b96e1cd0c20
-#+busybox-i2c-tools.75c0164ed1ef37ca9dce1fb2a43a43889e498a9dce07d823718f088056fc4617
-#+busybox-linux-extra.9c7d95eeaee4233fcdec59eeb11c8008a7b471c5d47bc476fc5341baef97e056
-#+busybox-mtd-utils.a81de2fc6ea4bd9be64976f3b363e5051bfac161e86ee34757d320e1eba64fb9
-#+busybox-shadow.48db62ed1844e2e2023d2d1701d26f3093c5950f630dda0cd9e3fead0ec62433
-#+busybox-su.c611b757a09501f3accbad8cfe5bb5e5d21a7f237ca06ab40f077f754914b082
-#+busybox-util-linux-priv.979ec553d01dbffd268ef6c5b3e32476d49f48047cb0946226ced57bf94268ba
-#+busybox-logging.8fc0e29eb774d0a0005f020849e6af96ff8607f1785cac4cc019c1e3c2368e7d
-#+busybox-cron.f1d58c9ff941fb7a40717c1b17b7accaca47a3e94eb95bbe26a75b48b9c2d007
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+busybox-login.6c3dcd574da530086dd783542207d5e519c01565dc6eebe49f93d3bc796aaa5b
-#+execline.02acbe14d5e97b9ae7bae85f02af414eecafa660af770c137bd2db3c1e9e55f8
-#+s6.aa379bb33c5efeb8d7b4773f1a01131c91e8868516914c6b5f7eca15dcdca9b5
-#+ccx-utils.00b6ee06b6f1a1104ca3e26bbf5a436efabc4ec3fd007e2e9650a07087e56e54
-#+applyuidgid-caps.03ca171fe909745ae01f59b5148232e288cffea517d8fca3a285f98ed79e9ec0
-#+easyseccomp.7f3e04f90f713174631a7ba8ce114f634eac5c1ce1f44120cc95b319a8ffcbf0
-#+mlog.32695f0cd20543c4643622e8694125c4be21209905b76db9e392832d8e896efb
-#+abduco.da53d3657f91af7d89394270427ea2fe6c3d1d65fb954d45bcbcd949ff0dc23f
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-dosfstools.bb76e2e4e59c77e74d9e2c266b754d13ac39eae7fd5253624c2bf36a00fc5b4b
+#+busybox-e2fsprogs.0c93cbcbc3b30cd119deb01ebc66000f5ea76f0e5389e1cedb4f09cd610a5f9f
+#+busybox-iproute2.32cd371493752a8781d107b84ec658e6513081e741b7b4d875cb36cc4ee41626
+#+busybox-iputils.ca5d7f38855fc2c30e38418c1fcea44fdd303830303964f9081616d1f89a4c1e
+#+busybox-net-misc.ba3e6053fdc4d949bd7ca03ff5c6881340516c9ab7430ec8064f284abe1b438b
+#+busybox-net-tools.89228f43d3a2db82a50dbf7a4794ec3845a50aedc560508dbc688c5428c90f75
+#+busybox-traceroute.65281d2051f2772efd303373f6df2580248163c9581850064284967b936c848f
+#+busybox-wget.94600d8031914b48747bbe47215b3502ce5b96b6a630ca687d99d9d3855ae514
+#+busybox-chpst.2166432deeba221223fe77449cfd006be27cd8c843b065408ee45622ee1836f8
+#+busybox-console.f81511b1c1fe8b84224b37d96f17bfa287d5ceaeb0a3774a6dcde0964f7fbe86
+#+busybox-getty.3b92b6dcf1f2ef9e42eedda2f4ba4d37822b79663f27dd34a89c7db50815b576
+#+busybox-i2c-tools.9c37efd9b5dbfb343fff869989d253783d6f6760d0c42b365fe07c0ecf9eb8f0
+#+busybox-linux-extra.4824b1a20af565f0330a77eea497984e1bc116f25f3dd2c04624c3264f65c8e8
+#+busybox-mtd-utils.3e612b2a5696c569d6ff5e5177a1493e9505c89bbc9e5f5f4f477ddaf69d869a
+#+busybox-shadow.5ffff209d39d2c486ececfcd19781d643048eaecdda9ef0825d05dd7ff8b230e
+#+busybox-su.efc07bf5aaeabd2813b7d81dc9d26177d95577fdd22f539ed410124b46ac33c7
+#+busybox-util-linux-priv.f91c6722d0cea27dd003e9e6f7a9fbd70a035bf56da58bf908fbafbb0b0abe98
+#+busybox-logging.577bdef100ed53f33650e97b77a281a33742d7aedbc01a90d1705378e89ce27e
+#+busybox-cron.550fb7656af835f36463a67046f264b6cb225d34e17196108ae38991db81be3f
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+busybox-login.52e887bd3a0b044475da613a61359732559566717323e624a96e3a1d4d00c2f6
+#+execline.931baf79ba1e4d471d96c87209f1d6dd12e06b907a86677ed7c646407fc44f91
+#+s6.b8ee6272cc50fbd1f413b539cb0a149258a5b8fdd90c3136f55356334d79ffa5
+#+ccx-utils.0295a796ae6b996801942e410346743efa0420cffa1c802b36146b6f3e64afca
+#+applyuidgid-caps.4a02e3df334cde9fbc0a08224c60c1f1cea899574eeddedc372a14c31681d3d7
+#+easyseccomp.9e23e508b946291c66bdcb6437dd6a4871154956ce40ab3f677b9575ae7472f6
+#+mlog.1eefecd0fbafb09725b30b5c8d762c6e9e337037a015bd52f9bf7f68cb539ed5
+#+abduco.5e57fbed49ae06907aa5f35c2cd79cd84b096de2ddac196ecb4332f43d13ad49
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
 #@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.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+zsh.940fb164d1b08494f9050c2d0a703ca17b52aef114c5b743188afa6e0cc2535a
-#+pthbs-banginstall.385ee92921055459329c5747e278d9afcde737a2739d6b049c75d8c8e52dfe05
-#+execline.02acbe14d5e97b9ae7bae85f02af414eecafa660af770c137bd2db3c1e9e55f8
-#+alpine-keys.03dedbbfe2f13aafb1ce10768e538cae6e73bdd11d8f0f956f63c2cbcdaf94a4
-#+apk-tools.cfef771674dd1221a4b4d7636dde002724db65c0598fc6a91498e0b5e2f71370
-#+xbps.7c7e27304546bb8230b23c962e0cf4c9fe28859aee1f386104828f41b3d6d7f1
-#+container-bin-image.1fb134b1085c8a3e94535743855b8839d6ec710c28783f907abaee5e9aa98316
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+zsh.ee33e58971ec7f0fcbef113a52c386426b21d53d9fd11b3364fc3c01c3d23150
+#+pthbs-banginstall.36288015cc9c716da55767223cc33a3f8f31c46c14dbc223cf37ea59d25263d3
+#+execline.931baf79ba1e4d471d96c87209f1d6dd12e06b907a86677ed7c646407fc44f91
+#+alpine-keys.354e6786d0c1f5f1b3dea310cc874a3f08766e1629366d0d98656c1e05eeaa33
+#+apk-tools.309e64608d42767229d26caa8e7f9b4e6d07edf9911ba7eb657f045d4d9733f8
+#+xbps.c296c18b8d65685acd77b3a55e5087148cddf11ccc82b4c2a292adcb36bc58da
+#+container-bin-image.7e41fc8cca33ad10605dc3f347f564bf8aede1d313a3f9b1967deb1a6a14e88d
 #@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.cfef771674dd1221a4b4d7636dde002724db65c0598fc6a91498e0b5e2f71370/command/apk.static' "${dest}/deps/command/"
-ln -sf '/versions/xbps.7c7e27304546bb8230b23c962e0cf4c9fe28859aee1f386104828f41b3d6d7f1/command/xbps-install.static' "${dest}/deps/command/"
+ln -sf '/versions/apk-tools.309e64608d42767229d26caa8e7f9b4e6d07edf9911ba7eb657f045d4d9733f8/command/apk.static' "${dest}/deps/command/"
+ln -sf '/versions/xbps.c296c18b8d65685acd77b3a55e5087148cddf11ccc82b4c2a292adcb36bc58da/command/xbps-install.static' "${dest}/deps/command/"
 
-for f in '/versions/alpine-keys.03dedbbfe2f13aafb1ce10768e538cae6e73bdd11d8f0f956f63c2cbcdaf94a4'/keys/alpine/*/*; do
+for f in '/versions/alpine-keys.354e6786d0c1f5f1b3dea310cc874a3f08766e1629366d0d98656c1e05eeaa33'/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.03dedbbfe2f13aafb1ce10768e538cae6e73bdd11d8f0f95
 done
  
 mkdir -p "${dest}/deps/keys/void"
-for f in '/versions/xbps.7c7e27304546bb8230b23c962e0cf4c9fe28859aee1f386104828f41b3d6d7f1'/keys/void/*; do
+for f in '/versions/xbps.c296c18b8d65685acd77b3a55e5087148cddf11ccc82b4c2a292adcb36bc58da'/keys/void/*; do
 	ln -sf "$f" "${dest}/deps/keys/void/"
 done
 
-test -d '/versions/container-bin-image.1fb134b1085c8a3e94535743855b8839d6ec710c28783f907abaee5e9aa98316/container-bin-image'
-test -f '/versions/container-bin-image.1fb134b1085c8a3e94535743855b8839d6ec710c28783f907abaee5e9aa98316/container-bin-image/if'
-ln -sf '/versions/container-bin-image.1fb134b1085c8a3e94535743855b8839d6ec710c28783f907abaee5e9aa98316/container-bin-image' "${dest}/deps/"
+test -d '/versions/container-bin-image.7e41fc8cca33ad10605dc3f347f564bf8aede1d313a3f9b1967deb1a6a14e88d/container-bin-image'
+test -f '/versions/container-bin-image.7e41fc8cca33ad10605dc3f347f564bf8aede1d313a3f9b1967deb1a6a14e88d/container-bin-image/if'
+ln -sf '/versions/container-bin-image.7e41fc8cca33ad10605dc3f347f564bf8aede1d313a3f9b1967deb1a6a14e88d/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.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-dosfstools.71bc76a0ed81f75f627cdad20afad3c043a742ac5b596f9fea7d346c70a121bb
-#+busybox-e2fsprogs.b0bdc0e6ab9e92ea85207b4725ed273f32ef9800890eb9c0aa966ebb1d6741fc
-#+busybox-iproute2.6ff8eea2f6058b3e00c3209144bb6a80c3b4914e446115b7014cf987f4d3ddc1
-#+busybox-iputils.78685d282f393c31b9fbcb7d7723543b2b9892f609411c646bec3c0f8d64c982
-#+busybox-net-misc.2aae98f296fd0d15269f1b6a72932dd0a0905b62dbd28be67f8cbb16ec798a16
-#+busybox-net-tools.d50ec3c3d82a9084545fcb1525947814f703fb7622882484b28e6e2c75cdaabb
-#+busybox-traceroute.8a295cff05cf57f9c4c32116fb9f216b50cd352a5d6d2ece31af95aacd9c01bc
-#+busybox-wget.941d8e621ef79b83cf954caacd4d36a558d0f89a1f7f5842db3c49ca66f2d401
-#+busybox-chpst.2e94bfa7a9d9469bb306f2e14172c3cbd7e3952058836bd771c2c96d01959555
-#+busybox-console.b358f2f28ef1fe7801a45bb277f49dad3b51a077619525cd6c2814d27d5d4135
-#+busybox-getty.53ec1d2582847d9e416abf924ef3d7d6000529a12d6a55a38dbd3b96e1cd0c20
-#+busybox-i2c-tools.75c0164ed1ef37ca9dce1fb2a43a43889e498a9dce07d823718f088056fc4617
-#+busybox-linux-extra.9c7d95eeaee4233fcdec59eeb11c8008a7b471c5d47bc476fc5341baef97e056
-#+busybox-mtd-utils.a81de2fc6ea4bd9be64976f3b363e5051bfac161e86ee34757d320e1eba64fb9
-#+busybox-shadow.48db62ed1844e2e2023d2d1701d26f3093c5950f630dda0cd9e3fead0ec62433
-#+busybox-su.c611b757a09501f3accbad8cfe5bb5e5d21a7f237ca06ab40f077f754914b082
-#+busybox-util-linux-priv.979ec553d01dbffd268ef6c5b3e32476d49f48047cb0946226ced57bf94268ba
-#+busybox-logging.8fc0e29eb774d0a0005f020849e6af96ff8607f1785cac4cc019c1e3c2368e7d
-#+busybox-cron.f1d58c9ff941fb7a40717c1b17b7accaca47a3e94eb95bbe26a75b48b9c2d007
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+execline.02acbe14d5e97b9ae7bae85f02af414eecafa660af770c137bd2db3c1e9e55f8
-#+s6.aa379bb33c5efeb8d7b4773f1a01131c91e8868516914c6b5f7eca15dcdca9b5
-#+s6-portable-utils.dc6132005629eaa08b67af34b8adba42a193ad3e056cab40470a1d33de5f4c64
-#+s6-linux-utils.e2c953bf26b378cf5633f192de4f011964af9fc7d287f8882e2ff897549a6c78
-#+zsh.940fb164d1b08494f9050c2d0a703ca17b52aef114c5b743188afa6e0cc2535a
-#+confz.6b8f67da9ef12cf858b8e3537c50d94576c88d8f9d3f4a976cfb8b2fa1b30fb9
-#+containers.335b3b7f78a24d768f414bbd6a4719a4ae326c998fb51dac251ee49cb5526b91
-#+xbps.7c7e27304546bb8230b23c962e0cf4c9fe28859aee1f386104828f41b3d6d7f1
-#+zstd.b32e156387e297d76a06a61df269492fc0e0428d431c464b2c822cda41c68f66
-#+apk-tools.cfef771674dd1221a4b4d7636dde002724db65c0598fc6a91498e0b5e2f71370
-#+alpine-keys.03dedbbfe2f13aafb1ce10768e538cae6e73bdd11d8f0f956f63c2cbcdaf94a4
-#+getent.750f459c53befd09df4c0d2961873f124bcf5d6a0125b22a1ee6d45408db1a21
-#+fileset.d4fd5c0a028109c7f91690724f766dd42405f6d2abf4814a9526f5c116aca3e6
-#+ccx-utils.00b6ee06b6f1a1104ca3e26bbf5a436efabc4ec3fd007e2e9650a07087e56e54
-#+easyseccomp.7f3e04f90f713174631a7ba8ce114f634eac5c1ce1f44120cc95b319a8ffcbf0
-#+findutils.2142059583b53f519cfb29a1f0213ebeb886831e1a52294c5b89b9268f3a2d7c
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a-
\ No newline at end of file
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-dosfstools.bb76e2e4e59c77e74d9e2c266b754d13ac39eae7fd5253624c2bf36a00fc5b4b
+#+busybox-e2fsprogs.0c93cbcbc3b30cd119deb01ebc66000f5ea76f0e5389e1cedb4f09cd610a5f9f
+#+busybox-iproute2.32cd371493752a8781d107b84ec658e6513081e741b7b4d875cb36cc4ee41626
+#+busybox-iputils.ca5d7f38855fc2c30e38418c1fcea44fdd303830303964f9081616d1f89a4c1e
+#+busybox-net-misc.ba3e6053fdc4d949bd7ca03ff5c6881340516c9ab7430ec8064f284abe1b438b
+#+busybox-net-tools.89228f43d3a2db82a50dbf7a4794ec3845a50aedc560508dbc688c5428c90f75
+#+busybox-traceroute.65281d2051f2772efd303373f6df2580248163c9581850064284967b936c848f
+#+busybox-wget.94600d8031914b48747bbe47215b3502ce5b96b6a630ca687d99d9d3855ae514
+#+busybox-chpst.2166432deeba221223fe77449cfd006be27cd8c843b065408ee45622ee1836f8
+#+busybox-console.f81511b1c1fe8b84224b37d96f17bfa287d5ceaeb0a3774a6dcde0964f7fbe86
+#+busybox-getty.3b92b6dcf1f2ef9e42eedda2f4ba4d37822b79663f27dd34a89c7db50815b576
+#+busybox-i2c-tools.9c37efd9b5dbfb343fff869989d253783d6f6760d0c42b365fe07c0ecf9eb8f0
+#+busybox-linux-extra.4824b1a20af565f0330a77eea497984e1bc116f25f3dd2c04624c3264f65c8e8
+#+busybox-mtd-utils.3e612b2a5696c569d6ff5e5177a1493e9505c89bbc9e5f5f4f477ddaf69d869a
+#+busybox-shadow.5ffff209d39d2c486ececfcd19781d643048eaecdda9ef0825d05dd7ff8b230e
+#+busybox-su.efc07bf5aaeabd2813b7d81dc9d26177d95577fdd22f539ed410124b46ac33c7
+#+busybox-util-linux-priv.f91c6722d0cea27dd003e9e6f7a9fbd70a035bf56da58bf908fbafbb0b0abe98
+#+busybox-logging.577bdef100ed53f33650e97b77a281a33742d7aedbc01a90d1705378e89ce27e
+#+busybox-cron.550fb7656af835f36463a67046f264b6cb225d34e17196108ae38991db81be3f
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+execline.931baf79ba1e4d471d96c87209f1d6dd12e06b907a86677ed7c646407fc44f91
+#+s6.b8ee6272cc50fbd1f413b539cb0a149258a5b8fdd90c3136f55356334d79ffa5
+#+s6-portable-utils.36126ef3d67a3d1fef864c401d15c1c9e7d5bee1fe25118991f836233eacc2c0
+#+s6-linux-utils.9111f50b5749c31ff8576b664e3c2182f50c5a282ac65def5c1172516f793468
+#+zsh.ee33e58971ec7f0fcbef113a52c386426b21d53d9fd11b3364fc3c01c3d23150
+#+confz.07ac34dd17f105ef70f14fdeab05d6d9e5e90e22739090762556044e2a320235
+#+containers.e67fc04cd44f693494bdb72cb7e9d4ec195f0b09f1c8ef16fea64db296da085f
+#+xbps.c296c18b8d65685acd77b3a55e5087148cddf11ccc82b4c2a292adcb36bc58da
+#+zstd.ba62fc1046eab5dd0a0a55729857788ad51d84bf380d5c7e6d1241403e6ab2f2
+#+apk-tools.309e64608d42767229d26caa8e7f9b4e6d07edf9911ba7eb657f045d4d9733f8
+#+alpine-keys.354e6786d0c1f5f1b3dea310cc874a3f08766e1629366d0d98656c1e05eeaa33
+#+getent.43690362bd3e2e2db8ddf93a4b86432e487e6e427bca4fecd6cb283a54cf0890
+#+fileset.824e16ae67c4278108fc62431e7e3eeeecde9a78e211dbb1510993f2a53be77c
+#+ccx-utils.0295a796ae6b996801942e410346743efa0420cffa1c802b36146b6f3e64afca
+#+easyseccomp.9e23e508b946291c66bdcb6437dd6a4871154956ce40ab3f677b9575ae7472f6
+#+findutils.148657b9e3199a5e7edf2742184f8bdb96f8eaee4b8d857f23d0dcb74882a929
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0+
\ No newline at end of file
diff --git a/variants/root-x86_64/curl b/variants/root-x86_64/curl
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+m4.a61864a21512ed75ea7bcd752e8600e5392ae095487060f27ffeda895bf1330c
-#+libressl.bb138b71407428bdbaa535460d64b56c272b073487744b79a189033121a2fa5f
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+m4.915d4de6f7fcffd54583accd119a9e43494fecba0d87d1c52763cb8f91c08544
+#+libressl.1de2bbcf63a2e25dfc53f2ec10bce4b4c76305694cde2848c482a06f9cae58db
 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:.
 
 
@@ -63,8 +63,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,99 +1,99 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-dosfstools.71bc76a0ed81f75f627cdad20afad3c043a742ac5b596f9fea7d346c70a121bb
-#+busybox-e2fsprogs.b0bdc0e6ab9e92ea85207b4725ed273f32ef9800890eb9c0aa966ebb1d6741fc
-#+busybox-iproute2.6ff8eea2f6058b3e00c3209144bb6a80c3b4914e446115b7014cf987f4d3ddc1
-#+busybox-iputils.78685d282f393c31b9fbcb7d7723543b2b9892f609411c646bec3c0f8d64c982
-#+busybox-net-misc.2aae98f296fd0d15269f1b6a72932dd0a0905b62dbd28be67f8cbb16ec798a16
-#+busybox-net-tools.d50ec3c3d82a9084545fcb1525947814f703fb7622882484b28e6e2c75cdaabb
-#+busybox-traceroute.8a295cff05cf57f9c4c32116fb9f216b50cd352a5d6d2ece31af95aacd9c01bc
-#+busybox-wget.941d8e621ef79b83cf954caacd4d36a558d0f89a1f7f5842db3c49ca66f2d401
-#+busybox-chpst.2e94bfa7a9d9469bb306f2e14172c3cbd7e3952058836bd771c2c96d01959555
-#+busybox-console.b358f2f28ef1fe7801a45bb277f49dad3b51a077619525cd6c2814d27d5d4135
-#+busybox-getty.53ec1d2582847d9e416abf924ef3d7d6000529a12d6a55a38dbd3b96e1cd0c20
-#+busybox-i2c-tools.75c0164ed1ef37ca9dce1fb2a43a43889e498a9dce07d823718f088056fc4617
-#+busybox-linux-extra.9c7d95eeaee4233fcdec59eeb11c8008a7b471c5d47bc476fc5341baef97e056
-#+busybox-mtd-utils.a81de2fc6ea4bd9be64976f3b363e5051bfac161e86ee34757d320e1eba64fb9
-#+busybox-shadow.48db62ed1844e2e2023d2d1701d26f3093c5950f630dda0cd9e3fead0ec62433
-#+busybox-su.c611b757a09501f3accbad8cfe5bb5e5d21a7f237ca06ab40f077f754914b082
-#+busybox-util-linux-priv.979ec553d01dbffd268ef6c5b3e32476d49f48047cb0946226ced57bf94268ba
-#+busybox-logging.8fc0e29eb774d0a0005f020849e6af96ff8607f1785cac4cc019c1e3c2368e7d
-#+busybox-cron.f1d58c9ff941fb7a40717c1b17b7accaca47a3e94eb95bbe26a75b48b9c2d007
-#+attr.ed3e525ee851c376301f5f83452406ff9d6541f5e13c1822fcc21c11e17ca4b0
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+diffutils.ac0e612291c45111f16c52fd2e291104c1a1ac367b666ed9061214162e301b84
-#+patch.7b9c4e1c303eebd9d10cdd03a98031cdaeb7c2dd6284993cce893a198370fc98
-#+flex.5713d65d97748b6cfc910831781c963c9e1218b05f57540206dba32dcd1d7f84
-#+bison.e31219f23ec5823e903483a03ccdc94e423e2fb48a67af9dd3dee74abccce1fe
-#+rsync.e306e1d227381c0191f961f8d427a6ee3bb03ff1651397894cc665955c747842
-#+execline.02acbe14d5e97b9ae7bae85f02af414eecafa660af770c137bd2db3c1e9e55f8
-#+s6.aa379bb33c5efeb8d7b4773f1a01131c91e8868516914c6b5f7eca15dcdca9b5
-#+s6-rc.696330547add10bffce9574b1d40d31d6322a7353b3cec21fc379b4793eaf02c
-#+s6-portable-utils.dc6132005629eaa08b67af34b8adba42a193ad3e056cab40470a1d33de5f4c64
-#+s6-linux-utils.e2c953bf26b378cf5633f192de4f011964af9fc7d287f8882e2ff897549a6c78
-#+s6-linux-init.8dc3f42e55efb671af3a6f8ecac3b7e2092c62b68648f900291d0bdf1d8e8205
-#+mdevd.6994a3bb1f8d77dc9beeedc060621e709c6383dea3d3b27772a45ba6a8376a54
-#+s6-dns.ac084844e2b646fec44ee51274e21dbddfadd46672f09084807b3a73f4ea2d2a
-#+libressl.bb138b71407428bdbaa535460d64b56c272b073487744b79a189033121a2fa5f
-#+s6-networking.dfc967b9b92873fc0028bf9dbafaa4d2d2af9fd7a7c226cacb936f87deacdca0
-#+zsh.940fb164d1b08494f9050c2d0a703ca17b52aef114c5b743188afa6e0cc2535a
-#+pthbs-banginstall.385ee92921055459329c5747e278d9afcde737a2739d6b049c75d8c8e52dfe05
-#+aat.3f965ca95e2659c4f819fc3aef112366e6fc7e0d3baf84cbfa6969c380cae808
-#+confz.6b8f67da9ef12cf858b8e3537c50d94576c88d8f9d3f4a976cfb8b2fa1b30fb9
-#+containers.335b3b7f78a24d768f414bbd6a4719a4ae326c998fb51dac251ee49cb5526b91
-#+fileset.d4fd5c0a028109c7f91690724f766dd42405f6d2abf4814a9526f5c116aca3e6
-#+logincaps.7c9f1a355b1e85c36fe8fde2cd2144c262e8f6ad7eb5ef104191609398665bcd
-#+snaprep.6c6b8428400f14dfff47f6784c01d85e15fc931ac0b88be538cd55186ede6149
-#+curl.0af20f1a4685bb3f765331dd9ad8bbec4e5dc700086b5efb7a242cb6a7b600ac
-#+git.688ee0647723b9aa256b609feb5158a2fba925adb88677e849b1390510fda6b6
-#+xbps.7c7e27304546bb8230b23c962e0cf4c9fe28859aee1f386104828f41b3d6d7f1
-#+apk-tools.cfef771674dd1221a4b4d7636dde002724db65c0598fc6a91498e0b5e2f71370
-#+getent.750f459c53befd09df4c0d2961873f124bcf5d6a0125b22a1ee6d45408db1a21
-#+getconf.cdf702f3ccd85f4383d235055f3e582f8a82dcd913ac99922c2997b962b0a578
-#+iconv.1aca6e4748b9ccf0880bb70f12d14834905146db12333d0974b46808e1d52adb
-#+libcap.f0a236db04827d73d84ee29f216723ee0aaddd6540b0f5f31864fdc5b890a177
-#+applyuidgid-caps.03ca171fe909745ae01f59b5148232e288cffea517d8fca3a285f98ed79e9ec0
-#+ccx-utils.00b6ee06b6f1a1104ca3e26bbf5a436efabc4ec3fd007e2e9650a07087e56e54
-#+user-env.37a0437e90ca2d43e3db54aa51e9b4588782fe9eeb9679779e94e7464f55baa6
-#+strace.f9187de5f494b54eb75c5ae50737236de09bc561b5ee950fe4ca29538ad724ae
-#+mlog.32695f0cd20543c4643622e8694125c4be21209905b76db9e392832d8e896efb
-#+findutils.2142059583b53f519cfb29a1f0213ebeb886831e1a52294c5b89b9268f3a2d7c
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+nvi.fa5e5fbb8fbfd2fd6605ab81a7cd8c4da2ff08443e34bd1d20c4b62955814a45
-#+squashfs-tools.98d86a4a71f2d9b7116962cf18343351bc071fec8dd27dae2657dccf8388e74b
-#+mandoc.48e8dacdc321aff1d4d7ed88617d41a73e4d1300b156af8383d71fbc112725e9
-#+tinyssh.fc1e24c89c55e30ab6318d1b9ed9bd8e73d4da9f6583c636c86b62f221108541
-#+system-config.59b75bbd1bda06730f96ed601c94b0db3ff3dd29da14a05101f1dfe3af1fccfd
-#+system-config-rc.e346d7f437bdbb50a19f06f213bd85b2c59fbec69305ef82bd737a691a002aba
-#+system-config-scripts.dafcf3279f4057e0dcb07c6ec9cdf23086708f1dd4f1540929f4e6584bc27031
-#+system-config-init.1f2ac27ccfcc6640f4723177eb4374a6874d0923aea37b8b11dc0289c3d026a3
-#+system-config-zsh.37528c59fcff2e84f18f21c8c2b69edd276051d8c1c14b4013bd164c64110326
-#+busybox-modutils.8c23fe774b013e036b71f8481ab87185ba3de4d4d7cc79088f92ce8994ab1ed9-
\ No newline at end of file
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-dosfstools.bb76e2e4e59c77e74d9e2c266b754d13ac39eae7fd5253624c2bf36a00fc5b4b
+#+busybox-e2fsprogs.0c93cbcbc3b30cd119deb01ebc66000f5ea76f0e5389e1cedb4f09cd610a5f9f
+#+busybox-iproute2.32cd371493752a8781d107b84ec658e6513081e741b7b4d875cb36cc4ee41626
+#+busybox-iputils.ca5d7f38855fc2c30e38418c1fcea44fdd303830303964f9081616d1f89a4c1e
+#+busybox-net-misc.ba3e6053fdc4d949bd7ca03ff5c6881340516c9ab7430ec8064f284abe1b438b
+#+busybox-net-tools.89228f43d3a2db82a50dbf7a4794ec3845a50aedc560508dbc688c5428c90f75
+#+busybox-traceroute.65281d2051f2772efd303373f6df2580248163c9581850064284967b936c848f
+#+busybox-wget.94600d8031914b48747bbe47215b3502ce5b96b6a630ca687d99d9d3855ae514
+#+busybox-chpst.2166432deeba221223fe77449cfd006be27cd8c843b065408ee45622ee1836f8
+#+busybox-console.f81511b1c1fe8b84224b37d96f17bfa287d5ceaeb0a3774a6dcde0964f7fbe86
+#+busybox-getty.3b92b6dcf1f2ef9e42eedda2f4ba4d37822b79663f27dd34a89c7db50815b576
+#+busybox-i2c-tools.9c37efd9b5dbfb343fff869989d253783d6f6760d0c42b365fe07c0ecf9eb8f0
+#+busybox-linux-extra.4824b1a20af565f0330a77eea497984e1bc116f25f3dd2c04624c3264f65c8e8
+#+busybox-mtd-utils.3e612b2a5696c569d6ff5e5177a1493e9505c89bbc9e5f5f4f477ddaf69d869a
+#+busybox-shadow.5ffff209d39d2c486ececfcd19781d643048eaecdda9ef0825d05dd7ff8b230e
+#+busybox-su.efc07bf5aaeabd2813b7d81dc9d26177d95577fdd22f539ed410124b46ac33c7
+#+busybox-util-linux-priv.f91c6722d0cea27dd003e9e6f7a9fbd70a035bf56da58bf908fbafbb0b0abe98
+#+busybox-logging.577bdef100ed53f33650e97b77a281a33742d7aedbc01a90d1705378e89ce27e
+#+busybox-cron.550fb7656af835f36463a67046f264b6cb225d34e17196108ae38991db81be3f
+#+attr.bb15046e2552e647ee6a77fe4430a663cab6a31d06afe5a01c1235cd8b90cde8
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+diffutils.61a843cd41f96387bfab2cd85021b04474dc079cfa4913ed4f0c4e22e2423c78
+#+patch.938ec0e5bec811c233bf8169955722f2d649291cfcd4bbd51505d5a8a01a02c3
+#+flex.5380b424ecae363df5aad941b61d38d9dc5b9c6edc32611bbd1da8830203a220
+#+bison.4a49fc6e493a36712e2f4a890e584fe7b1df4b9c7224ac5346b46dd4c2ea0d93
+#+rsync.b3ef71cec80999c1bf120b20fc539e965c65a39d5cb2e483f344e7a8de974e2d
+#+execline.931baf79ba1e4d471d96c87209f1d6dd12e06b907a86677ed7c646407fc44f91
+#+s6.b8ee6272cc50fbd1f413b539cb0a149258a5b8fdd90c3136f55356334d79ffa5
+#+s6-rc.be85015b4bf42b82451e6c451999682e347534153aeefb68438d46b8102f5da3
+#+s6-portable-utils.36126ef3d67a3d1fef864c401d15c1c9e7d5bee1fe25118991f836233eacc2c0
+#+s6-linux-utils.9111f50b5749c31ff8576b664e3c2182f50c5a282ac65def5c1172516f793468
+#+s6-linux-init.6b33c37028163a0e514c1cda61acf127102e184efa23465765b0f3233031c689
+#+mdevd.ead9a47ae83c2cff99002456d454c8623deedd43084266ace85360f1e35d4223
+#+s6-dns.2249a941b110f6a3d691cead4787ba251f2c08df5316ea202ecbd30adeb58837
+#+libressl.1de2bbcf63a2e25dfc53f2ec10bce4b4c76305694cde2848c482a06f9cae58db
+#+s6-networking.a0feb271d8691df131aa6c112209abd9bfcc9537eb27f4da38ed41a6af28b9af
+#+zsh.ee33e58971ec7f0fcbef113a52c386426b21d53d9fd11b3364fc3c01c3d23150
+#+pthbs-banginstall.36288015cc9c716da55767223cc33a3f8f31c46c14dbc223cf37ea59d25263d3
+#+aat.60749f0c5fd088ecc667b0db36cfba83130c4546e4ab8c6bf010d8ee7d772f9e
+#+confz.07ac34dd17f105ef70f14fdeab05d6d9e5e90e22739090762556044e2a320235
+#+containers.e67fc04cd44f693494bdb72cb7e9d4ec195f0b09f1c8ef16fea64db296da085f
+#+fileset.824e16ae67c4278108fc62431e7e3eeeecde9a78e211dbb1510993f2a53be77c
+#+logincaps.fba94255e77cb3dd50a7f390c8abe999bec75baa75646df64a29218709bc5382
+#+snaprep.b898d4a8409635992d45c91efbb2d441e63677636f99c437ccddf31db5c06fe9
+#+curl.b450477c75a16d6ce85090270fe5b788fa2abacc85a18c5c23918ab33f0f8acb
+#+git.2cc2435ad58455dc617c8f4dd75ef36bd99a7e0314da7f4d4b4aa59036ac513a
+#+xbps.c296c18b8d65685acd77b3a55e5087148cddf11ccc82b4c2a292adcb36bc58da
+#+apk-tools.309e64608d42767229d26caa8e7f9b4e6d07edf9911ba7eb657f045d4d9733f8
+#+getent.43690362bd3e2e2db8ddf93a4b86432e487e6e427bca4fecd6cb283a54cf0890
+#+getconf.454343aa919ab414e6686dc0a264b529d00efe88fc72b7146d4c7902758d6012
+#+iconv.45e1c108910e13f87263b680ca477fe50e5cc34969eefa5457fb3173fa197820
+#+libcap.0b7bf4a1ceae78011eebade98d279b5740ea41d7b3bfb4487c57299ea173d6ac
+#+applyuidgid-caps.4a02e3df334cde9fbc0a08224c60c1f1cea899574eeddedc372a14c31681d3d7
+#+ccx-utils.0295a796ae6b996801942e410346743efa0420cffa1c802b36146b6f3e64afca
+#+user-env.1212e5c2630ac92d48507fffa3908a820522c0473d0f865b62e36ac823bf4efe
+#+strace.4a4a7b04820ac5645bc20d52e8ea2ab654a920205701c969739192631ac38dbf
+#+mlog.1eefecd0fbafb09725b30b5c8d762c6e9e337037a015bd52f9bf7f68cb539ed5
+#+findutils.148657b9e3199a5e7edf2742184f8bdb96f8eaee4b8d857f23d0dcb74882a929
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+nvi.986e12ea2acbff99baa7b2aa76ce90e7c6e0a5833f6a327b522c97ab29d0a4ed
+#+squashfs-tools.d49e72ac14c495446f5d3bc94d1d5efa973e7029ad4db324b9ae79626e5f8e4c
+#+mandoc.a6e8294a3316c241e413f429586909ae2b32ea195c6ded7179841cde982a00d3
+#+tinyssh.a90d8635256bbca902bf668cd25ca0ff0d87852146d2996b68de0d95c9309e61
+#+system-config.4f7ee13d9d8f89e946b1da865cc2faebd35a38ea86fc43ed3ec4eed95497751e
+#+system-config-rc.7de1066077668b413bd47d05d26b04797125b29732a911b7d8555b3075960f6e
+#+system-config-scripts.d4c3bc9b8d7fde3aeea29263e54103c235e6757fd49f0ceb069cf4408cdcb2a8
+#+system-config-init.11d1a2dd565e90269ff1f19bce4c3016c74b7506cc415d45335fbf646850237d
+#+system-config-zsh.dc42edad46bfa85dadc923981c6c99fea6e86ac5943fa7861864b482780e861d
+#+busybox-modutils.73bb6354fd27e775627ba098b52a6168b57724c8296964f92daade6317ca0bd3+
\ No newline at end of file
diff --git a/variants/root-x86_64/diffutils b/variants/root-x86_64/diffutils
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+m4.a61864a21512ed75ea7bcd752e8600e5392ae095487060f27ffeda895bf1330c
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+m4.915d4de6f7fcffd54583accd119a9e43494fecba0d87d1c52763cb8f91c08544
 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:.
 
 
@@ -62,8 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+ocaml.45a3eb9a38ae8573eec2fbaca3c426f67cbe00fe550e09935e83a4b9f42af58f
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+ocaml.a2b6ef1873dfa7b8cc45e5ea1afe09e3f8488c929baed82ba792e58618ccfdd0
 #@untar:-z:sha256:579c738f8ca191ba0a9b22dbe78f1377542442c9827cf4939f8964f09f9edb28:.
 
 
@@ -51,7 +51,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/versions/musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/versions/musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0/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,44 +1,44 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+m4.a61864a21512ed75ea7bcd752e8600e5392ae095487060f27ffeda895bf1330c
-#+patch.7b9c4e1c303eebd9d10cdd03a98031cdaeb7c2dd6284993cce893a198370fc98
-#+flex.5713d65d97748b6cfc910831781c963c9e1218b05f57540206dba32dcd1d7f84
-#+bison.e31219f23ec5823e903483a03ccdc94e423e2fb48a67af9dd3dee74abccce1fe
-#+libseccomp.c02a1702214d84b34f40a67b297d2ba6f7f2b626008c1592d7ae4de627e0059a
-#+error-standalone.923623faff1fa63514fcbaee132b3e87946507c4a7d0f387247caa9b468d7976
-#+argp-standalone.6efc2ae2464a4a6c04cd8377f42b99c376cf1a9ec3a7eecb6c97f9d84fdfd395
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+m4.915d4de6f7fcffd54583accd119a9e43494fecba0d87d1c52763cb8f91c08544
+#+patch.938ec0e5bec811c233bf8169955722f2d649291cfcd4bbd51505d5a8a01a02c3
+#+flex.5380b424ecae363df5aad941b61d38d9dc5b9c6edc32611bbd1da8830203a220
+#+bison.4a49fc6e493a36712e2f4a890e584fe7b1df4b9c7224ac5346b46dd4c2ea0d93
+#+libseccomp.3eab5015ca14f59a97795d9e9f29015bccaef89f752c87e9ad37f0ba72d43378
+#+error-standalone.820dc3aa4372ae9bd5d1682467ecc8b9338fdfdf8dd090d94ca82ee863c8e26b
+#+argp-standalone.b9fec9f1aadbe781ec7d4c3afc16e66df42ab41653b837f04b808268037c58a2
 #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp
 #@sha256:eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10:easyseccomp_fix_includes.patch
 #@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
@@ -70,8 +70,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,45 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
 #@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+skalibs.996c296dc6913eafb73cae5d800ec88eb7910bd5f769c7bd76801b0862bf8798
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+skalibs.3c52744da310a82cb7bea2ab5407487c409a3d7b88b4267afab55694cade488c
 #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline
 
 
@@ -48,7 +48,7 @@ cd 'execline'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.996c296dc6913eafb73cae5d800ec88eb7910bd5f769c7bd76801b0862bf8798/sysdeps' \
+	--with-sysdeps='/versions/skalibs.3c52744da310a82cb7bea2ab5407487c409a3d7b88b4267afab55694cade488c/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.22dc62e0fb617806f87b8c176baf8a254b6e3f4000c4922a5bbd25c711a753ee
-#+gnu-make.eade157dc9f705700afa644952c4a4b2c9d4b4dc359009904bb383e72ee66c5e
-#+busybox.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
-#+skalibs.2464832f18423982fed29e9fcbbe9ccb56808bf06c995b035cd6733c089f607b
+#+musl-cross-make.54dd6edc9bf08879bd3befb4053c5b17fc817f12c2a133e69d0136b697ddf55e
+#+gnu-make.c437f52cec5900e752ee976cde1c70c02af126c44a60a80cf9e96d997b07383e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+nawk.c00d6bfea54d17362a10f318ccbfdb556d7ac63d364bdfb3aefef5681d3189ff
+#+skalibs.6fc2bb9d53d8c9bd20da6a8b34282899af37e219092ee9ccc6ec32e01313e506
 #@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.2464832f18423982fed29e9fcbbe9ccb56808bf06c995b035cd6733c089f607b/sysdeps' \
+	--with-sysdeps='/versions/skalibs.6fc2bb9d53d8c9bd20da6a8b34282899af37e219092ee9ccc6ec32e01313e506/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.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+zsh.940fb164d1b08494f9050c2d0a703ca17b52aef114c5b743188afa6e0cc2535a
-#+pthbs-banginstall.385ee92921055459329c5747e278d9afcde737a2739d6b049c75d8c8e52dfe05
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+zsh.ee33e58971ec7f0fcbef113a52c386426b21d53d9fd11b3364fc3c01c3d23150
+#+pthbs-banginstall.36288015cc9c716da55767223cc33a3f8f31c46c14dbc223cf37ea59d25263d3
 #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset
 
 
diff --git a/variants/root-x86_64/findutils b/variants/root-x86_64/findutils
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+m4.a61864a21512ed75ea7bcd752e8600e5392ae095487060f27ffeda895bf1330c
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+m4.915d4de6f7fcffd54583accd119a9e43494fecba0d87d1c52763cb8f91c08544
 #@untar:-J:sha256:1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5:.
 
 
@@ -62,8 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+m4.a61864a21512ed75ea7bcd752e8600e5392ae095487060f27ffeda895bf1330c
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.c00d6bfea54d17362a10f318ccbfdb556d7ac63d364bdfb3aefef5681d3189ff
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+m4.915d4de6f7fcffd54583accd119a9e43494fecba0d87d1c52763cb8f91c08544
 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
 
 
@@ -62,8 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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.22dc62e0fb617806f87b8c176baf8a254b6e3f4000c4922a5bbd25c711a753ee
-#+gnu-make.eade157dc9f705700afa644952c4a4b2c9d4b4dc359009904bb383e72ee66c5e
-#+busybox.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gmp.99096972087ca365742966aea595c9189c36a1ef401cb9d5db17bee73535c618
-#+mpc.1ccbe8b36c6a473ffa55a129908ab0328f963a46fdcb51b45e90400c96967575
-#+mpfr.080366b19250c8b393ee06172de67ded2513b31c105a0ae4021c45441742e5b8
+#+musl-cross-make.54dd6edc9bf08879bd3befb4053c5b17fc817f12c2a133e69d0136b697ddf55e
+#+gnu-make.c437f52cec5900e752ee976cde1c70c02af126c44a60a80cf9e96d997b07383e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+nawk.c00d6bfea54d17362a10f318ccbfdb556d7ac63d364bdfb3aefef5681d3189ff
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gmp.aee15504eee2c3a0dc06e0fb1bc1215c7c10826776554be23f2699e251730ba2
+#+mpc.841064bf17c1e2256449af032017ea208e9a98fbec1a95450e82499ad5a13cae
+#+mpfr.39fea89b7c6cc36e2b2b1707b306f13c7ac27467025e198f25552f91ee604a4f
 #@sha256:62eb68290502d54b16457509aa0c3995a84116408e6b593d676b9f4c03b6b160:merged.patch
 #@untar:-J:sha256:e0dc77297625631ac8e50fa92fffefe899a4eb702592da5c32ef04e2293aca3a:.
 
@@ -15,8 +15,8 @@
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
@@ -47,9 +47,9 @@ patch -p1 <../merged.patch
 export TZ=UTC
 export SOURCE_DATE_EPOCH=1748000928
 
-mcm=/versions/musl-cross-make.22dc62e0fb617806f87b8c176baf8a254b6e3f4000c4922a5bbd25c711a753ee
+mcm=/versions/musl-cross-make.54dd6edc9bf08879bd3befb4053c5b17fc817f12c2a133e69d0136b697ddf55e
 mcm_bin=$mcm/bin/x86_64-linux-musl
-musl=/versions/musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
+musl=/versions/musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
 build_env_static
 
 sysroot="${pthbs_workdir}/sysroot"
diff --git a/variants/root-x86_64/getconf b/variants/root-x86_64/getconf
@@ -1,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
 #@sha256:d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c:getconf.c
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
 #@sha256:002c1a216f6bed0f816ab1cfebde94a0b127193ef410c36b2190599983e015b8:getent.c
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,40 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+m4.a61864a21512ed75ea7bcd752e8600e5392ae095487060f27ffeda895bf1330c
-#+libressl.bb138b71407428bdbaa535460d64b56c272b073487744b79a189033121a2fa5f
-#+curl.0af20f1a4685bb3f765331dd9ad8bbec4e5dc700086b5efb7a242cb6a7b600ac
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+m4.915d4de6f7fcffd54583accd119a9e43494fecba0d87d1c52763cb8f91c08544
+#+libressl.1de2bbcf63a2e25dfc53f2ec10bce4b4c76305694cde2848c482a06f9cae58db
+#+curl.b450477c75a16d6ce85090270fe5b788fa2abacc85a18c5c23918ab33f0f8acb
 #@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.22dc62e0fb617806f87b8c176baf8a254b6e3f4000c4922a5bbd25c711a753ee
-#+gnu-make.eade157dc9f705700afa644952c4a4b2c9d4b4dc359009904bb383e72ee66c5e
-#+busybox.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+m4.8f840f8239439a7d886fabf117d4e4a7df929209049e7af829fa88d5a6d3bcc9
-#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
+#+musl-cross-make.54dd6edc9bf08879bd3befb4053c5b17fc817f12c2a133e69d0136b697ddf55e
+#+gnu-make.c437f52cec5900e752ee976cde1c70c02af126c44a60a80cf9e96d997b07383e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+m4.503d428659d089b1c68a5490d21a386642f57f1b792029fb6f5260ffd8d8643a
+#+nawk.c00d6bfea54d17362a10f318ccbfdb556d7ac63d364bdfb3aefef5681d3189ff
 #@untar:-J:sha256:a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898:.
 
 
@@ -33,8 +33,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,10 +1,10 @@
 #!/usr/bin/env pthbs-build
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.eade157dc9f705700afa644952c4a4b2c9d4b4dc359009904bb383e72ee66c5e
-#+busybox.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.c437f52cec5900e752ee976cde1c70c02af126c44a60a80cf9e96d997b07383e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+nawk.c00d6bfea54d17362a10f318ccbfdb556d7ac63d364bdfb3aefef5681d3189ff
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -34,8 +34,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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.22dc62e0fb617806f87b8c176baf8a254b6e3f4000c4922a5bbd25c711a753ee
-#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
+#+musl-cross-make.54dd6edc9bf08879bd3befb4053c5b17fc817f12c2a133e69d0136b697ddf55e
+#+nawk.c00d6bfea54d17362a10f318ccbfdb556d7ac63d364bdfb3aefef5681d3189ff
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -37,7 +37,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'make-4.4.1'
 
 
-mcm=/versions/musl-cross-make.22dc62e0fb617806f87b8c176baf8a254b6e3f4000c4922a5bbd25c711a753ee
+mcm=/versions/musl-cross-make.54dd6edc9bf08879bd3befb4053c5b17fc817f12c2a133e69d0136b697ddf55e
 
 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.c2fb2e2455bfe14d4a02160674f83b5bb7b7a7b45aa37fb736efc2335ef029ae
-#+gnu-make.aefac1011f80fc35ae17a394eab3fddadeda6b788a6a49889efbe78d7365eb91
-#+busybox.bb6f1d57e91d00ac686a3dc3897152433b98f066ee9e6ae95d7d35863496ffac
-#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
+#+musl-cross-make.e9946dfdf62ed06dc86a580d49ab0125cb534acbc0d2623f6c2d0f6960857960
+#+gnu-make.367f296c3c6c53a03ebd428e60b59f50b1c0a8a4fcf767fcda70fce8740773d9
+#+busybox.eae69ad708db8919d4776903fdb6d7b383802d9c837c31cc25779477429e49fb
+#+nawk.c00d6bfea54d17362a10f318ccbfdb556d7ac63d364bdfb3aefef5681d3189ff
 #@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.0db83a03695adab20fbf668e85604a1b9d6ffbcff71618bafc909c053f801192
+#+musl-cross-make.6d127b68c31bc67a13293f51dc2c6104c6919f18893bcd4e18a19dee6278c4e0
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -30,7 +30,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'make-4.4.1'
 
 
-mcm=/versions/musl-cross-make.0db83a03695adab20fbf668e85604a1b9d6ffbcff71618bafc909c053f801192
+mcm=/versions/musl-cross-make.6d127b68c31bc67a13293f51dc2c6104c6919f18893bcd4e18a19dee6278c4e0
 
 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,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+m4.a61864a21512ed75ea7bcd752e8600e5392ae095487060f27ffeda895bf1330c
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+m4.915d4de6f7fcffd54583accd119a9e43494fecba0d87d1c52763cb8f91c08544
 #@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:.
 
 
@@ -62,8 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
 #@sha256:f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7:iconv.c
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+m4.a61864a21512ed75ea7bcd752e8600e5392ae095487060f27ffeda895bf1330c
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+m4.915d4de6f7fcffd54583accd119a9e43494fecba0d87d1c52763cb8f91c08544
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 
@@ -63,8 +63,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+m4.a61864a21512ed75ea7bcd752e8600e5392ae095487060f27ffeda895bf1330c
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+m4.915d4de6f7fcffd54583accd119a9e43494fecba0d87d1c52763cb8f91c08544
 #@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:.
 
 
@@ -62,8 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+m4.a61864a21512ed75ea7bcd752e8600e5392ae095487060f27ffeda895bf1330c
-#+libmd.2e5cdbafce1b8cdccf591bb293ee0871b6b09f881e2f77ec0f457ddcce0227c8
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+m4.915d4de6f7fcffd54583accd119a9e43494fecba0d87d1c52763cb8f91c08544
+#+libmd.9c618923970d40181c99fa9b47a34206c06c29b7abd6e55847270d8ff64af3f5
 #@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:.
 
 
@@ -63,8 +63,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,46 +1,46 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+pkgconf-pkg-config.bad1bdc30add7fe2e1a5558c68fb5fc463836feb1e941a11314b7d2f598fdbb1
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+pkgconf-pkg-config.f61cd4ef48da754d83ca0eb39c26316cd0e9f8e0f59ba8f33fd02d77239b592b
 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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.22dc62e0fb617806f87b8c176baf8a254b6e3f4000c4922a5bbd25c711a753ee
-#+gnu-make.eade157dc9f705700afa644952c4a4b2c9d4b4dc359009904bb383e72ee66c5e
-#+busybox.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
+#+musl-cross-make.54dd6edc9bf08879bd3befb4053c5b17fc817f12c2a133e69d0136b697ddf55e
+#+gnu-make.c437f52cec5900e752ee976cde1c70c02af126c44a60a80cf9e96d997b07383e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+nawk.c00d6bfea54d17362a10f318ccbfdb556d7ac63d364bdfb3aefef5681d3189ff
 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:.
 
 
diff --git a/variants/root-x86_64/libcgroup b/variants/root-x86_64/libcgroup
@@ -1,41 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+m4.a61864a21512ed75ea7bcd752e8600e5392ae095487060f27ffeda895bf1330c
-#+flex.5713d65d97748b6cfc910831781c963c9e1218b05f57540206dba32dcd1d7f84
-#+bison.e31219f23ec5823e903483a03ccdc94e423e2fb48a67af9dd3dee74abccce1fe
-#+musl-fts.282669bf3d44117774ba764987825f7e7d456dc82bc5a0e678691a29ec503089
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+m4.915d4de6f7fcffd54583accd119a9e43494fecba0d87d1c52763cb8f91c08544
+#+flex.5380b424ecae363df5aad941b61d38d9dc5b9c6edc32611bbd1da8830203a220
+#+bison.4a49fc6e493a36712e2f4a890e584fe7b1df4b9c7224ac5346b46dd4c2ea0d93
+#+musl-fts.e5dd2be010048b923122a9f3aeac824ddf89956ad5758feafdc5e2a041183f04
 #@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:.
 
 
@@ -65,8 +65,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,46 +1,46 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+zstd.b32e156387e297d76a06a61df269492fc0e0428d431c464b2c822cda41c68f66
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+zstd.ba62fc1046eab5dd0a0a55729857788ad51d84bf380d5c7e6d1241403e6ab2f2
 #@git:288355d104ff9930520c0283fe82556c6cc5c16f:libelf
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+m4.a61864a21512ed75ea7bcd752e8600e5392ae095487060f27ffeda895bf1330c
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+m4.915d4de6f7fcffd54583accd119a9e43494fecba0d87d1c52763cb8f91c08544
 #@untar:-J:sha256:1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332:.
 
 
@@ -62,8 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+m4.a61864a21512ed75ea7bcd752e8600e5392ae095487060f27ffeda895bf1330c
-#+ca-certificates-wip-donotuse.fc7a182360a1c907f308157c6cabab4406488ce16d3a458d753558b5c5277d6b
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+m4.915d4de6f7fcffd54583accd119a9e43494fecba0d87d1c52763cb8f91c08544
+#+ca-certificates-wip-donotuse.e8311fe4cdb30eccd52feba46eb0fc61eabfde299e8f518c9a3e45fbe7736b9a
 #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c
 #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:.
 
@@ -64,8 +64,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
@@ -103,7 +103,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.fc7a182360a1c907f308157c6cabab4406488ce16d3a458d753558b5c5277d6b/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
+cp -vs '/versions/ca-certificates-wip-donotuse.e8311fe4cdb30eccd52feba46eb0fc61eabfde299e8f518c9a3e45fbe7736b9a/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
 ./c_rehash  "$pthbs_destdir/$prefix/config/ssl/certs/"
 cd  "$pthbs_destdir/$prefix/config/ssl/"
 mv cert.pem libressl-cert.pem
diff --git a/variants/root-x86_64/libseccomp b/variants/root-x86_64/libseccomp
@@ -1,40 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+m4.a61864a21512ed75ea7bcd752e8600e5392ae095487060f27ffeda895bf1330c
-#+pkgconf-pkg-config.bad1bdc30add7fe2e1a5558c68fb5fc463836feb1e941a11314b7d2f598fdbb1
-#+gperf.10e270275617ffe94208a814bab24b52fb90e237909cfab4a1193d380e263352
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+m4.915d4de6f7fcffd54583accd119a9e43494fecba0d87d1c52763cb8f91c08544
+#+pkgconf-pkg-config.f61cd4ef48da754d83ca0eb39c26316cd0e9f8e0f59ba8f33fd02d77239b592b
+#+gperf.09a8f6e788f894c606e5b87dcdc7141d8891c096780d34c08b552eeacf686c59
 #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:.
 
 
@@ -64,8 +64,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+m4.a61864a21512ed75ea7bcd752e8600e5392ae095487060f27ffeda895bf1330c
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+m4.915d4de6f7fcffd54583accd119a9e43494fecba0d87d1c52763cb8f91c08544
 #@untar:-z:sha256:ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157:.
 
 
@@ -62,8 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,46 +1,46 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nofail_digest
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-modutils.8c23fe774b013e036b71f8481ab87185ba3de4d4d7cc79088f92ce8994ab1ed9
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+findutils.2142059583b53f519cfb29a1f0213ebeb886831e1a52294c5b89b9268f3a2d7c
-#+diffutils.ac0e612291c45111f16c52fd2e291104c1a1ac367b666ed9061214162e301b84
-#+patch.7b9c4e1c303eebd9d10cdd03a98031cdaeb7c2dd6284993cce893a198370fc98
-#+flex.5713d65d97748b6cfc910831781c963c9e1218b05f57540206dba32dcd1d7f84
-#+bison.e31219f23ec5823e903483a03ccdc94e423e2fb48a67af9dd3dee74abccce1fe
-#+rsync.e306e1d227381c0191f961f8d427a6ee3bb03ff1651397894cc665955c747842
-#+zstd.b32e156387e297d76a06a61df269492fc0e0428d431c464b2c822cda41c68f66
-#+libelf.211f86e5d228781b9d8fe503b364f6c23e0cd06627204ebb046bb679c6963290
-#+pkgconf-pkg-config.bad1bdc30add7fe2e1a5558c68fb5fc463836feb1e941a11314b7d2f598fdbb1
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-modutils.73bb6354fd27e775627ba098b52a6168b57724c8296964f92daade6317ca0bd3
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+findutils.148657b9e3199a5e7edf2742184f8bdb96f8eaee4b8d857f23d0dcb74882a929
+#+diffutils.61a843cd41f96387bfab2cd85021b04474dc079cfa4913ed4f0c4e22e2423c78
+#+patch.938ec0e5bec811c233bf8169955722f2d649291cfcd4bbd51505d5a8a01a02c3
+#+flex.5380b424ecae363df5aad941b61d38d9dc5b9c6edc32611bbd1da8830203a220
+#+bison.4a49fc6e493a36712e2f4a890e584fe7b1df4b9c7224ac5346b46dd4c2ea0d93
+#+rsync.b3ef71cec80999c1bf120b20fc539e965c65a39d5cb2e483f344e7a8de974e2d
+#+zstd.ba62fc1046eab5dd0a0a55729857788ad51d84bf380d5c7e6d1241403e6ab2f2
+#+libelf.61bd557c9d04ad92d1437871d3d4c78fc106f805522f3df5c788cd2bd2c0e3d0
+#+pkgconf-pkg-config.f61cd4ef48da754d83ca0eb39c26316cd0e9f8e0f59ba8f33fd02d77239b592b
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
 #@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.22dc62e0fb617806f87b8c176baf8a254b6e3f4000c4922a5bbd25c711a753ee
-#+gnu-make.eade157dc9f705700afa644952c4a4b2c9d4b4dc359009904bb383e72ee66c5e
-#+busybox.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
-#+skalibs.2464832f18423982fed29e9fcbbe9ccb56808bf06c995b035cd6733c089f607b
-#+execline.9db66d1bbde05bac349b09581470cf86b564f2cefdd740900138a397f3e8f432
-#+libcap.f4c8179b072452f3e694721bc32f6c74d007a4c9656aae068bc0773d8cb91605
+#+musl-cross-make.54dd6edc9bf08879bd3befb4053c5b17fc817f12c2a133e69d0136b697ddf55e
+#+gnu-make.c437f52cec5900e752ee976cde1c70c02af126c44a60a80cf9e96d997b07383e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+nawk.c00d6bfea54d17362a10f318ccbfdb556d7ac63d364bdfb3aefef5681d3189ff
+#+skalibs.6fc2bb9d53d8c9bd20da6a8b34282899af37e219092ee9ccc6ec32e01313e506
+#+execline.9ba20223877c9b59ca004686b97e4287b455536d1cd07a1235a86547295825f3
+#+libcap.b0e993c2fd5eb3c8eba3a68b9e2b70e124aa12e7615f723ebc90288b215b09ab
 #@git:7fbfb934cdaa187a063a4df41498c06c46d4a6a9:lnstools
 
 
diff --git a/variants/root-x86_64/logincaps b/variants/root-x86_64/logincaps
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+zsh.940fb164d1b08494f9050c2d0a703ca17b52aef114c5b743188afa6e0cc2535a
-#+pthbs-banginstall.385ee92921055459329c5747e278d9afcde737a2739d6b049c75d8c8e52dfe05
-#+execline.02acbe14d5e97b9ae7bae85f02af414eecafa660af770c137bd2db3c1e9e55f8
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+ccx-utils.00b6ee06b6f1a1104ca3e26bbf5a436efabc4ec3fd007e2e9650a07087e56e54
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+zsh.ee33e58971ec7f0fcbef113a52c386426b21d53d9fd11b3364fc3c01c3d23150
+#+pthbs-banginstall.36288015cc9c716da55767223cc33a3f8f31c46c14dbc223cf37ea59d25263d3
+#+execline.931baf79ba1e4d471d96c87209f1d6dd12e06b907a86677ed7c646407fc44f91
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+ccx-utils.0295a796ae6b996801942e410346743efa0420cffa1c802b36146b6f3e64afca
 #@git:409db79b3e7e5fc6b73305471d9bbb6ac5c14036:logincaps
 
 
diff --git a/variants/root-x86_64/m4 b/variants/root-x86_64/m4
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+nawk.c00d6bfea54d17362a10f318ccbfdb556d7ac63d364bdfb3aefef5681d3189ff
 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
 
 
@@ -61,8 +61,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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.22dc62e0fb617806f87b8c176baf8a254b6e3f4000c4922a5bbd25c711a753ee
-#+gnu-make.eade157dc9f705700afa644952c4a4b2c9d4b4dc359009904bb383e72ee66c5e
-#+busybox.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
+#+musl-cross-make.54dd6edc9bf08879bd3befb4053c5b17fc817f12c2a133e69d0136b697ddf55e
+#+gnu-make.c437f52cec5900e752ee976cde1c70c02af126c44a60a80cf9e96d997b07383e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+nawk.c00d6bfea54d17362a10f318ccbfdb556d7ac63d364bdfb3aefef5681d3189ff
 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
 
 
@@ -32,8 +32,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
 #@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.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+zsh.940fb164d1b08494f9050c2d0a703ca17b52aef114c5b743188afa6e0cc2535a
-#+pthbs-banginstall.385ee92921055459329c5747e278d9afcde737a2739d6b049c75d8c8e52dfe05
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+zsh.ee33e58971ec7f0fcbef113a52c386426b21d53d9fd11b3364fc3c01c3d23150
+#+pthbs-banginstall.36288015cc9c716da55767223cc33a3f8f31c46c14dbc223cf37ea59d25263d3
 #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts
 
 
diff --git a/variants/root-x86_64/mdevd b/variants/root-x86_64/mdevd
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+skalibs.996c296dc6913eafb73cae5d800ec88eb7910bd5f769c7bd76801b0862bf8798
-#+execline.02acbe14d5e97b9ae7bae85f02af414eecafa660af770c137bd2db3c1e9e55f8
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+skalibs.3c52744da310a82cb7bea2ab5407487c409a3d7b88b4267afab55694cade488c
+#+execline.931baf79ba1e4d471d96c87209f1d6dd12e06b907a86677ed7c646407fc44f91
 #@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd
 
 
@@ -49,7 +49,7 @@ cd 'mdevd'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.996c296dc6913eafb73cae5d800ec88eb7910bd5f769c7bd76801b0862bf8798/sysdeps' \
+	--with-sysdeps='/versions/skalibs.3c52744da310a82cb7bea2ab5407487c409a3d7b88b4267afab55694cade488c/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.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-dosfstools.71bc76a0ed81f75f627cdad20afad3c043a742ac5b596f9fea7d346c70a121bb
-#+busybox-e2fsprogs.b0bdc0e6ab9e92ea85207b4725ed273f32ef9800890eb9c0aa966ebb1d6741fc
-#+busybox-iproute2.6ff8eea2f6058b3e00c3209144bb6a80c3b4914e446115b7014cf987f4d3ddc1
-#+busybox-iputils.78685d282f393c31b9fbcb7d7723543b2b9892f609411c646bec3c0f8d64c982
-#+busybox-net-misc.2aae98f296fd0d15269f1b6a72932dd0a0905b62dbd28be67f8cbb16ec798a16
-#+busybox-net-tools.d50ec3c3d82a9084545fcb1525947814f703fb7622882484b28e6e2c75cdaabb
-#+busybox-traceroute.8a295cff05cf57f9c4c32116fb9f216b50cd352a5d6d2ece31af95aacd9c01bc
-#+busybox-wget.941d8e621ef79b83cf954caacd4d36a558d0f89a1f7f5842db3c49ca66f2d401
-#+busybox-chpst.2e94bfa7a9d9469bb306f2e14172c3cbd7e3952058836bd771c2c96d01959555
-#+busybox-console.b358f2f28ef1fe7801a45bb277f49dad3b51a077619525cd6c2814d27d5d4135
-#+busybox-getty.53ec1d2582847d9e416abf924ef3d7d6000529a12d6a55a38dbd3b96e1cd0c20
-#+busybox-i2c-tools.75c0164ed1ef37ca9dce1fb2a43a43889e498a9dce07d823718f088056fc4617
-#+busybox-linux-extra.9c7d95eeaee4233fcdec59eeb11c8008a7b471c5d47bc476fc5341baef97e056
-#+busybox-mtd-utils.a81de2fc6ea4bd9be64976f3b363e5051bfac161e86ee34757d320e1eba64fb9
-#+busybox-shadow.48db62ed1844e2e2023d2d1701d26f3093c5950f630dda0cd9e3fead0ec62433
-#+busybox-su.c611b757a09501f3accbad8cfe5bb5e5d21a7f237ca06ab40f077f754914b082
-#+busybox-util-linux-priv.979ec553d01dbffd268ef6c5b3e32476d49f48047cb0946226ced57bf94268ba
-#+busybox-logging.8fc0e29eb774d0a0005f020849e6af96ff8607f1785cac4cc019c1e3c2368e7d
-#+busybox-cron.f1d58c9ff941fb7a40717c1b17b7accaca47a3e94eb95bbe26a75b48b9c2d007
-#+execline.02acbe14d5e97b9ae7bae85f02af414eecafa660af770c137bd2db3c1e9e55f8
-#+s6.aa379bb33c5efeb8d7b4773f1a01131c91e8868516914c6b5f7eca15dcdca9b5
-#+mdev-scripts.5b6aac3f2f601148bce908794b6a9a94fec9e3de024258c1acd345d36ae21d41
-#+mdevd.6994a3bb1f8d77dc9beeedc060621e709c6383dea3d3b27772a45ba6a8376a54
-#+busybox-modutils.8c23fe774b013e036b71f8481ab87185ba3de4d4d7cc79088f92ce8994ab1ed9-
\ No newline at end of file
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-dosfstools.bb76e2e4e59c77e74d9e2c266b754d13ac39eae7fd5253624c2bf36a00fc5b4b
+#+busybox-e2fsprogs.0c93cbcbc3b30cd119deb01ebc66000f5ea76f0e5389e1cedb4f09cd610a5f9f
+#+busybox-iproute2.32cd371493752a8781d107b84ec658e6513081e741b7b4d875cb36cc4ee41626
+#+busybox-iputils.ca5d7f38855fc2c30e38418c1fcea44fdd303830303964f9081616d1f89a4c1e
+#+busybox-net-misc.ba3e6053fdc4d949bd7ca03ff5c6881340516c9ab7430ec8064f284abe1b438b
+#+busybox-net-tools.89228f43d3a2db82a50dbf7a4794ec3845a50aedc560508dbc688c5428c90f75
+#+busybox-traceroute.65281d2051f2772efd303373f6df2580248163c9581850064284967b936c848f
+#+busybox-wget.94600d8031914b48747bbe47215b3502ce5b96b6a630ca687d99d9d3855ae514
+#+busybox-chpst.2166432deeba221223fe77449cfd006be27cd8c843b065408ee45622ee1836f8
+#+busybox-console.f81511b1c1fe8b84224b37d96f17bfa287d5ceaeb0a3774a6dcde0964f7fbe86
+#+busybox-getty.3b92b6dcf1f2ef9e42eedda2f4ba4d37822b79663f27dd34a89c7db50815b576
+#+busybox-i2c-tools.9c37efd9b5dbfb343fff869989d253783d6f6760d0c42b365fe07c0ecf9eb8f0
+#+busybox-linux-extra.4824b1a20af565f0330a77eea497984e1bc116f25f3dd2c04624c3264f65c8e8
+#+busybox-mtd-utils.3e612b2a5696c569d6ff5e5177a1493e9505c89bbc9e5f5f4f477ddaf69d869a
+#+busybox-shadow.5ffff209d39d2c486ececfcd19781d643048eaecdda9ef0825d05dd7ff8b230e
+#+busybox-su.efc07bf5aaeabd2813b7d81dc9d26177d95577fdd22f539ed410124b46ac33c7
+#+busybox-util-linux-priv.f91c6722d0cea27dd003e9e6f7a9fbd70a035bf56da58bf908fbafbb0b0abe98
+#+busybox-logging.577bdef100ed53f33650e97b77a281a33742d7aedbc01a90d1705378e89ce27e
+#+busybox-cron.550fb7656af835f36463a67046f264b6cb225d34e17196108ae38991db81be3f
+#+execline.931baf79ba1e4d471d96c87209f1d6dd12e06b907a86677ed7c646407fc44f91
+#+s6.b8ee6272cc50fbd1f413b539cb0a149258a5b8fdd90c3136f55356334d79ffa5
+#+mdev-scripts.8ae9f6141fc83e0227e7d6f35414ede03e1febbbe6528a73a21d2dbe21b8cdb0
+#+mdevd.ead9a47ae83c2cff99002456d454c8623deedd43084266ace85360f1e35d4223
+#+busybox-modutils.73bb6354fd27e775627ba098b52a6168b57724c8296964f92daade6317ca0bd3+
\ No newline at end of file
diff --git a/variants/root-x86_64/mlog b/variants/root-x86_64/mlog
@@ -1,44 +1,44 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
 #@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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.22dc62e0fb617806f87b8c176baf8a254b6e3f4000c4922a5bbd25c711a753ee
-#+gnu-make.eade157dc9f705700afa644952c4a4b2c9d4b4dc359009904bb383e72ee66c5e
-#+busybox.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+m4.8f840f8239439a7d886fabf117d4e4a7df929209049e7af829fa88d5a6d3bcc9
-#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
-#+gmp.99096972087ca365742966aea595c9189c36a1ef401cb9d5db17bee73535c618
-#+mpfr.080366b19250c8b393ee06172de67ded2513b31c105a0ae4021c45441742e5b8
+#+musl-cross-make.54dd6edc9bf08879bd3befb4053c5b17fc817f12c2a133e69d0136b697ddf55e
+#+gnu-make.c437f52cec5900e752ee976cde1c70c02af126c44a60a80cf9e96d997b07383e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+m4.503d428659d089b1c68a5490d21a386642f57f1b792029fb6f5260ffd8d8643a
+#+nawk.c00d6bfea54d17362a10f318ccbfdb556d7ac63d364bdfb3aefef5681d3189ff
+#+gmp.aee15504eee2c3a0dc06e0fb1bc1215c7c10826776554be23f2699e251730ba2
+#+mpfr.39fea89b7c6cc36e2b2b1707b306f13c7ac27467025e198f25552f91ee604a4f
 #@untar:-z:sha256:ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8:.
 
 
@@ -35,8 +35,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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.22dc62e0fb617806f87b8c176baf8a254b6e3f4000c4922a5bbd25c711a753ee
-#+gnu-make.eade157dc9f705700afa644952c4a4b2c9d4b4dc359009904bb383e72ee66c5e
-#+busybox.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+m4.8f840f8239439a7d886fabf117d4e4a7df929209049e7af829fa88d5a6d3bcc9
-#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
-#+gmp.99096972087ca365742966aea595c9189c36a1ef401cb9d5db17bee73535c618
+#+musl-cross-make.54dd6edc9bf08879bd3befb4053c5b17fc817f12c2a133e69d0136b697ddf55e
+#+gnu-make.c437f52cec5900e752ee976cde1c70c02af126c44a60a80cf9e96d997b07383e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+m4.503d428659d089b1c68a5490d21a386642f57f1b792029fb6f5260ffd8d8643a
+#+nawk.c00d6bfea54d17362a10f318ccbfdb556d7ac63d364bdfb3aefef5681d3189ff
+#+gmp.aee15504eee2c3a0dc06e0fb1bc1215c7c10826776554be23f2699e251730ba2
 #@untar:-J:sha256:b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01:.
 
 
@@ -34,8 +34,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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.22dc62e0fb617806f87b8c176baf8a254b6e3f4000c4922a5bbd25c711a753ee
-#+gnu-make.eade157dc9f705700afa644952c4a4b2c9d4b4dc359009904bb383e72ee66c5e
-#+busybox.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
+#+musl-cross-make.54dd6edc9bf08879bd3befb4053c5b17fc817f12c2a133e69d0136b697ddf55e
+#+gnu-make.c437f52cec5900e752ee976cde1c70c02af126c44a60a80cf9e96d997b07383e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+nawk.c00d6bfea54d17362a10f318ccbfdb556d7ac63d364bdfb3aefef5681d3189ff
 #@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.22dc62e0fb617806f87b8c176baf8a254b6e3f4000c4922a5bbd25c711a753ee
+mcm=/versions/musl-cross-make.54dd6edc9bf08879bd3befb4053c5b17fc817f12c2a133e69d0136b697ddf55e
 
 ./configure \
 	--prefix="$prefix" \
diff --git a/variants/root-x86_64/musl-cross-make b/variants/root-x86_64/musl-cross-make
@@ -1,8 +1,8 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nofail_digest
-#+musl-cross-make.22dc62e0fb617806f87b8c176baf8a254b6e3f4000c4922a5bbd25c711a753ee
-#+gnu-make.eade157dc9f705700afa644952c4a4b2c9d4b4dc359009904bb383e72ee66c5e
-#+busybox.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
+#+musl-cross-make.54dd6edc9bf08879bd3befb4053c5b17fc817f12c2a133e69d0136b697ddf55e
+#+gnu-make.c437f52cec5900e752ee976cde1c70c02af126c44a60a80cf9e96d997b07383e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
 #@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.e9d77e09d3458df313b93853e02e4c643c5bc31ebf3c7e5cf01e8c56b1b4bf69
-#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
+#+nawk.c00d6bfea54d17362a10f318ccbfdb556d7ac63d364bdfb3aefef5681d3189ff
 #@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.0db83a03695adab20fbf668e85604a1b9d6ffbcff71618bafc909c053f801192
-#+gnu-make.aefac1011f80fc35ae17a394eab3fddadeda6b788a6a49889efbe78d7365eb91
-#+busybox.bb6f1d57e91d00ac686a3dc3897152433b98f066ee9e6ae95d7d35863496ffac
-#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
+#+musl-cross-make.6d127b68c31bc67a13293f51dc2c6104c6919f18893bcd4e18a19dee6278c4e0
+#+gnu-make.367f296c3c6c53a03ebd428e60b59f50b1c0a8a4fcf767fcda70fce8740773d9
+#+busybox.eae69ad708db8919d4776903fdb6d7b383802d9c837c31cc25779477429e49fb
+#+nawk.c00d6bfea54d17362a10f318ccbfdb556d7ac63d364bdfb3aefef5681d3189ff
 #@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.e9d77e09d3458df313b93853e02e4c643c5bc31ebf3c7e5cf01e8c56b1b4bf69
-#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
+#+nawk.c00d6bfea54d17362a10f318ccbfdb556d7ac63d364bdfb3aefef5681d3189ff
 #@sha256:0cdd76777a0dfd3dd3a63f215f030208ddb91c2361d2bcc02acec0f1c16b6a2e:musl-cross-make/sources/binutils-2.44.tar.gz
 #@sha256:a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898:musl-cross-make/sources/gmp-6.3.0.tar.xz
 #@sha256:b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01:musl-cross-make/sources/mpfr-4.2.2.tar.xz
diff --git a/variants/root-x86_64/musl-fts b/variants/root-x86_64/musl-fts
@@ -1,44 +1,44 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
 #@untar:-z:sha256:49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
-#+bison.e31219f23ec5823e903483a03ccdc94e423e2fb48a67af9dd3dee74abccce1fe
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.c00d6bfea54d17362a10f318ccbfdb556d7ac63d364bdfb3aefef5681d3189ff
+#+bison.4a49fc6e493a36712e2f4a890e584fe7b1df4b9c7224ac5346b46dd4c2ea0d93
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
 #@untar:-z:sha256:e031b1e1d2b230f276f975bffb923f0ea15f798c839d15a3f26a1a39448e32d7:.
 
 
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=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
 #@git:51d179dad861640caeb76674b5908ccd79f04fae:netbsd-curses
 
 
diff --git a/variants/root-x86_64/nvi b/variants/root-x86_64/nvi
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+m4.a61864a21512ed75ea7bcd752e8600e5392ae095487060f27ffeda895bf1330c
-#+netbsd-curses.f8706b52558480879327ddaa9b574e502abadaabded1dda2f4fa8669bb403fe2
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+m4.915d4de6f7fcffd54583accd119a9e43494fecba0d87d1c52763cb8f91c08544
+#+netbsd-curses.0ddc12a4770dc087180255befcd2785d4d42345d9ab086982a9763bcb50bbd0d
 #@untar:-z:sha256:755b87aa1e25c24c4c1668de5573d7d9a327b529423ce3ad9ee753bfb2296e33:.
 
 
@@ -63,8 +63,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,41 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+ocaml.45a3eb9a38ae8573eec2fbaca3c426f67cbe00fe550e09935e83a4b9f42af58f
-#+ocaml-findlib.368d937d488b6d52b199f650314999d49878a419a1039f4e150da8e7d205138c
-#+ocamlbuild.fba8815fe233c7027d6def1d2f4965052c1668c386a674d21e17fc44085863d9
-#+opam.d4471e24296699e24480aa345513125b5dacc0f62522d492f9a88be6cf0711b7
-#+ocaml-topkg.c9dba774560e19f1adee31657357126ff8a2c665f98fa15df727c12de4aabca7
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+ocaml.a2b6ef1873dfa7b8cc45e5ea1afe09e3f8488c929baed82ba792e58618ccfdd0
+#+ocaml-findlib.f2e1270a56c3adecb019bf646b0a870f1108f9c7556da3264b30c3bb1f1a1ee7
+#+ocamlbuild.2b12cf5e23c362cf5410024c41b5dce6156252d79398e2c288d248ee061a643a
+#+opam.1c4f222d5296619dcfe7285ccc002c047b65f6b23a964b4fedc21432804cb35e
+#+ocaml-topkg.0e8849e10c89f23d624b4a17dc6e973d259da2ed96168d236effc3a773d73bcf
 #@untar:-j:sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa:.
 
 
diff --git a/variants/root-x86_64/ocaml-base b/variants/root-x86_64/ocaml-base
@@ -1,40 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+ocaml.45a3eb9a38ae8573eec2fbaca3c426f67cbe00fe550e09935e83a4b9f42af58f
-#+dune.5cf4affb5a474e9799665c8268d37ba3e5ecf1ba83e7c986fa3cf6f8a4b3bd10
-#+ocaml_intrinsics_kernel.3136587f2e2fdb5075041f958704ebe5ee27b7be73f7a92cafcf4d5c011d1d04
-#+ocaml-sexplib0.682be9a6f4ce5eb6e45f250a162bdedc00ed41f03ed0c259a9f029e687c3a92a
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+ocaml.a2b6ef1873dfa7b8cc45e5ea1afe09e3f8488c929baed82ba792e58618ccfdd0
+#+dune.d92e9d70c4c9c9b5eb7f723491a99fd30a2b8dd28729d707ba2a4dc615794bc0
+#+ocaml_intrinsics_kernel.a0cf5fdd044984b8327652153f5abaf078c0716eeff81b8d560bf51ca22061da
+#+ocaml-sexplib0.912584b3361cc520d1709665222380e56271aa5f1738bc523f4e71ee4d0353ed
 #@untar:-z:sha256:3f3f64789ab25bb5cb7f5f907dd651dec9cc9440981822fe75df6b94344b7208:.
 
 
diff --git a/variants/root-x86_64/ocaml-bos b/variants/root-x86_64/ocaml-bos
@@ -1,47 +1,47 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+ocaml.45a3eb9a38ae8573eec2fbaca3c426f67cbe00fe550e09935e83a4b9f42af58f
-#+ocaml-findlib.368d937d488b6d52b199f650314999d49878a419a1039f4e150da8e7d205138c
-#+ocamlbuild.fba8815fe233c7027d6def1d2f4965052c1668c386a674d21e17fc44085863d9
-#+opam.d4471e24296699e24480aa345513125b5dacc0f62522d492f9a88be6cf0711b7
-#+ocaml-topkg.c9dba774560e19f1adee31657357126ff8a2c665f98fa15df727c12de4aabca7
-#+ocaml-astring.676b94604ee4909b2fdf8922d620fbb239a3767f989919aede14179a64c7385c
-#+ocaml-fpath.c9b60f1d32f818539d00117dbdc162a4bd351df4ef5a6af7b45b1eaa7724d90c
-#+ocaml-rresult.9e3c27e505235974335c94cf87a5f0681ddfa227ce96d2627aff6b5775c8ce9d
-#+ocaml-fmt.d82b2cf76069081b7120dfe8bc0a64693521f045da4700b785460b4c0f6e073a
-#+ocaml-logs.9173ba3f6c9a5d28538c83d2b58fdd71f3eefb6fedc0065f1e49cdb63db9bad8
-#+ocaml-mtime.db5438819d055de45804ba9b8bfefb7d3f345c2a60b60ef8426b9bc5079570e8
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+ocaml.a2b6ef1873dfa7b8cc45e5ea1afe09e3f8488c929baed82ba792e58618ccfdd0
+#+ocaml-findlib.f2e1270a56c3adecb019bf646b0a870f1108f9c7556da3264b30c3bb1f1a1ee7
+#+ocamlbuild.2b12cf5e23c362cf5410024c41b5dce6156252d79398e2c288d248ee061a643a
+#+opam.1c4f222d5296619dcfe7285ccc002c047b65f6b23a964b4fedc21432804cb35e
+#+ocaml-topkg.0e8849e10c89f23d624b4a17dc6e973d259da2ed96168d236effc3a773d73bcf
+#+ocaml-astring.3f73cbb8eb1d3bc251c62ea96280e6547d5bf31bb0447c1b2bd96d8bc498f577
+#+ocaml-fpath.79c72d624f1960f07562aac7bc7a8f845b44cb4be8c2b8d428d1dcd53102545f
+#+ocaml-rresult.90592a53cd37df1006e3d58d94fc0c685ca89c3d5e9ed0a5943e4a40d57c847c
+#+ocaml-fmt.543afabaa6956382e463d3feb9bbed5fef0488976dae9d917b19b35e84f712f2
+#+ocaml-logs.bff37730630e5bb89a9e7e9b530d2ed7447823e03f027e18e1fa78cf5474ec3e
+#+ocaml-mtime.6c7290f5f18cd173214985ce90e8b6a8fe225e14a9a278ecc5f62de4c094d2ec
 #@untar:-j:sha256:d8d62e786b10d697e0457205a8eedeaa27ebcc90f1855f18df190cac2e3d8f37:.
 
 
diff --git a/variants/root-x86_64/ocaml-cmdliner b/variants/root-x86_64/ocaml-cmdliner
@@ -1,41 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+ocaml.45a3eb9a38ae8573eec2fbaca3c426f67cbe00fe550e09935e83a4b9f42af58f
-#+ocaml-findlib.368d937d488b6d52b199f650314999d49878a419a1039f4e150da8e7d205138c
-#+ocamlbuild.fba8815fe233c7027d6def1d2f4965052c1668c386a674d21e17fc44085863d9
-#+opam.d4471e24296699e24480aa345513125b5dacc0f62522d492f9a88be6cf0711b7
-#+ocaml-topkg.c9dba774560e19f1adee31657357126ff8a2c665f98fa15df727c12de4aabca7
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+ocaml.a2b6ef1873dfa7b8cc45e5ea1afe09e3f8488c929baed82ba792e58618ccfdd0
+#+ocaml-findlib.f2e1270a56c3adecb019bf646b0a870f1108f9c7556da3264b30c3bb1f1a1ee7
+#+ocamlbuild.2b12cf5e23c362cf5410024c41b5dce6156252d79398e2c288d248ee061a643a
+#+opam.1c4f222d5296619dcfe7285ccc002c047b65f6b23a964b4fedc21432804cb35e
+#+ocaml-topkg.0e8849e10c89f23d624b4a17dc6e973d259da2ed96168d236effc3a773d73bcf
 #@untar:-j:sha256:4e547a631c36fbaadff60d3bd7724eb3f83ba274e92fb725950bae7868378582:.
 
 
diff --git a/variants/root-x86_64/ocaml-compiler-libs b/variants/root-x86_64/ocaml-compiler-libs
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+ocaml.45a3eb9a38ae8573eec2fbaca3c426f67cbe00fe550e09935e83a4b9f42af58f
-#+dune.5cf4affb5a474e9799665c8268d37ba3e5ecf1ba83e7c986fa3cf6f8a4b3bd10
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+ocaml.a2b6ef1873dfa7b8cc45e5ea1afe09e3f8488c929baed82ba792e58618ccfdd0
+#+dune.d92e9d70c4c9c9b5eb7f723491a99fd30a2b8dd28729d707ba2a4dc615794bc0
 #@untar:-z:sha256:9b9644d7351db699e57ddba7c767bb4153e6e988ccf45ead2fb238a3bd75cdc7:.
 
 
diff --git a/variants/root-x86_64/ocaml-cppo b/variants/root-x86_64/ocaml-cppo
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+ocaml.45a3eb9a38ae8573eec2fbaca3c426f67cbe00fe550e09935e83a4b9f42af58f
-#+dune.5cf4affb5a474e9799665c8268d37ba3e5ecf1ba83e7c986fa3cf6f8a4b3bd10
-#+ocamlbuild.fba8815fe233c7027d6def1d2f4965052c1668c386a674d21e17fc44085863d9
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+ocaml.a2b6ef1873dfa7b8cc45e5ea1afe09e3f8488c929baed82ba792e58618ccfdd0
+#+dune.d92e9d70c4c9c9b5eb7f723491a99fd30a2b8dd28729d707ba2a4dc615794bc0
+#+ocamlbuild.2b12cf5e23c362cf5410024c41b5dce6156252d79398e2c288d248ee061a643a
 #@untar:-z:sha256:6e62a8ee0217c9cc38d5860110eb18eb8d89c05c420353d298e1431fe8bac00f:.
 
 
diff --git a/variants/root-x86_64/ocaml-findlib b/variants/root-x86_64/ocaml-findlib
@@ -1,41 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+m4.a61864a21512ed75ea7bcd752e8600e5392ae095487060f27ffeda895bf1330c
-#+netbsd-curses.f8706b52558480879327ddaa9b574e502abadaabded1dda2f4fa8669bb403fe2
-#+ocaml.45a3eb9a38ae8573eec2fbaca3c426f67cbe00fe550e09935e83a4b9f42af58f
-#+ocamlbuild.fba8815fe233c7027d6def1d2f4965052c1668c386a674d21e17fc44085863d9
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+m4.915d4de6f7fcffd54583accd119a9e43494fecba0d87d1c52763cb8f91c08544
+#+netbsd-curses.0ddc12a4770dc087180255befcd2785d4d42345d9ab086982a9763bcb50bbd0d
+#+ocaml.a2b6ef1873dfa7b8cc45e5ea1afe09e3f8488c929baed82ba792e58618ccfdd0
+#+ocamlbuild.2b12cf5e23c362cf5410024c41b5dce6156252d79398e2c288d248ee061a643a
 #@untar:-z:sha256:662c910f774e9fee3a19c4e057f380581ab2fc4ee52da4761304ac9c31b8869d:.
 
 
@@ -55,7 +55,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/versions/musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/versions/musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
 			return 0
 			;;
 		(*)
@@ -81,7 +81,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.45a3eb9a38ae8573eec2fbaca3c426f67cbe00fe550e09935e83a4b9f42af58f"
+stdlib="$pthbs_destdir/versions/ocaml.a2b6ef1873dfa7b8cc45e5ea1afe09e3f8488c929baed82ba792e58618ccfdd0"
 mkdir -p "${stdlib%/*}"
 ln -s "$pthbs_package" "$stdlib"
 make install prefix="$pthbs_destdir"
diff --git a/variants/root-x86_64/ocaml-fmt b/variants/root-x86_64/ocaml-fmt
@@ -1,42 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+ocaml.45a3eb9a38ae8573eec2fbaca3c426f67cbe00fe550e09935e83a4b9f42af58f
-#+ocaml-findlib.368d937d488b6d52b199f650314999d49878a419a1039f4e150da8e7d205138c
-#+ocamlbuild.fba8815fe233c7027d6def1d2f4965052c1668c386a674d21e17fc44085863d9
-#+opam.d4471e24296699e24480aa345513125b5dacc0f62522d492f9a88be6cf0711b7
-#+ocaml-topkg.c9dba774560e19f1adee31657357126ff8a2c665f98fa15df727c12de4aabca7
-#+ocaml-cmdliner.ad59aa159747eb7da44939a1db11fc8482f5d7d534df93385c67f2d385d069fd
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+ocaml.a2b6ef1873dfa7b8cc45e5ea1afe09e3f8488c929baed82ba792e58618ccfdd0
+#+ocaml-findlib.f2e1270a56c3adecb019bf646b0a870f1108f9c7556da3264b30c3bb1f1a1ee7
+#+ocamlbuild.2b12cf5e23c362cf5410024c41b5dce6156252d79398e2c288d248ee061a643a
+#+opam.1c4f222d5296619dcfe7285ccc002c047b65f6b23a964b4fedc21432804cb35e
+#+ocaml-topkg.0e8849e10c89f23d624b4a17dc6e973d259da2ed96168d236effc3a773d73bcf
+#+ocaml-cmdliner.0f4b037f82ca3100e3b24d73c2697ed01ec31ffaed29580a0ce3b58561c4a535
 #@untar:-j:sha256:857cfd47a54b52429cd9b3e2665e44173cd1bd3b435bece7172f984ad5376a1b:.
 
 
diff --git a/variants/root-x86_64/ocaml-fpath b/variants/root-x86_64/ocaml-fpath
@@ -1,42 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+ocaml.45a3eb9a38ae8573eec2fbaca3c426f67cbe00fe550e09935e83a4b9f42af58f
-#+ocaml-findlib.368d937d488b6d52b199f650314999d49878a419a1039f4e150da8e7d205138c
-#+ocamlbuild.fba8815fe233c7027d6def1d2f4965052c1668c386a674d21e17fc44085863d9
-#+opam.d4471e24296699e24480aa345513125b5dacc0f62522d492f9a88be6cf0711b7
-#+ocaml-topkg.c9dba774560e19f1adee31657357126ff8a2c665f98fa15df727c12de4aabca7
-#+ocaml-astring.676b94604ee4909b2fdf8922d620fbb239a3767f989919aede14179a64c7385c
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+ocaml.a2b6ef1873dfa7b8cc45e5ea1afe09e3f8488c929baed82ba792e58618ccfdd0
+#+ocaml-findlib.f2e1270a56c3adecb019bf646b0a870f1108f9c7556da3264b30c3bb1f1a1ee7
+#+ocamlbuild.2b12cf5e23c362cf5410024c41b5dce6156252d79398e2c288d248ee061a643a
+#+opam.1c4f222d5296619dcfe7285ccc002c047b65f6b23a964b4fedc21432804cb35e
+#+ocaml-topkg.0e8849e10c89f23d624b4a17dc6e973d259da2ed96168d236effc3a773d73bcf
+#+ocaml-astring.3f73cbb8eb1d3bc251c62ea96280e6547d5bf31bb0447c1b2bd96d8bc498f577
 #@untar:-j:sha256:12b08ff192d037d9b6d69e9ca19d1d385184f20b3237c27231e437ac81ace70f:.
 
 
diff --git a/variants/root-x86_64/ocaml-logs b/variants/root-x86_64/ocaml-logs
@@ -1,44 +1,44 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+ocaml.45a3eb9a38ae8573eec2fbaca3c426f67cbe00fe550e09935e83a4b9f42af58f
-#+ocaml-findlib.368d937d488b6d52b199f650314999d49878a419a1039f4e150da8e7d205138c
-#+ocamlbuild.fba8815fe233c7027d6def1d2f4965052c1668c386a674d21e17fc44085863d9
-#+opam.d4471e24296699e24480aa345513125b5dacc0f62522d492f9a88be6cf0711b7
-#+ocaml-topkg.c9dba774560e19f1adee31657357126ff8a2c665f98fa15df727c12de4aabca7
-#+ocaml-mtime.db5438819d055de45804ba9b8bfefb7d3f345c2a60b60ef8426b9bc5079570e8
-#+ocaml-cmdliner.ad59aa159747eb7da44939a1db11fc8482f5d7d534df93385c67f2d385d069fd
-#+ocaml-fmt.d82b2cf76069081b7120dfe8bc0a64693521f045da4700b785460b4c0f6e073a
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+ocaml.a2b6ef1873dfa7b8cc45e5ea1afe09e3f8488c929baed82ba792e58618ccfdd0
+#+ocaml-findlib.f2e1270a56c3adecb019bf646b0a870f1108f9c7556da3264b30c3bb1f1a1ee7
+#+ocamlbuild.2b12cf5e23c362cf5410024c41b5dce6156252d79398e2c288d248ee061a643a
+#+opam.1c4f222d5296619dcfe7285ccc002c047b65f6b23a964b4fedc21432804cb35e
+#+ocaml-topkg.0e8849e10c89f23d624b4a17dc6e973d259da2ed96168d236effc3a773d73bcf
+#+ocaml-mtime.6c7290f5f18cd173214985ce90e8b6a8fe225e14a9a278ecc5f62de4c094d2ec
+#+ocaml-cmdliner.0f4b037f82ca3100e3b24d73c2697ed01ec31ffaed29580a0ce3b58561c4a535
+#+ocaml-fmt.543afabaa6956382e463d3feb9bbed5fef0488976dae9d917b19b35e84f712f2
 #@untar:-j:sha256:ee97065ba41ce28f19dea9453c6bec4e0ef26165ad7394c4131ea0c65c0f06d5:.
 
 
diff --git a/variants/root-x86_64/ocaml-lun b/variants/root-x86_64/ocaml-lun
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+ocaml.45a3eb9a38ae8573eec2fbaca3c426f67cbe00fe550e09935e83a4b9f42af58f
-#+dune.5cf4affb5a474e9799665c8268d37ba3e5ecf1ba83e7c986fa3cf6f8a4b3bd10
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+ocaml.a2b6ef1873dfa7b8cc45e5ea1afe09e3f8488c929baed82ba792e58618ccfdd0
+#+dune.d92e9d70c4c9c9b5eb7f723491a99fd30a2b8dd28729d707ba2a4dc615794bc0
 #@untar:-j:sha256:cca8badff83b470fdcfb1840116f8e8a6f2cb86cde2f44ed28cf26cbf692a793:.
 
 
diff --git a/variants/root-x86_64/ocaml-mtime b/variants/root-x86_64/ocaml-mtime
@@ -1,41 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+ocaml.45a3eb9a38ae8573eec2fbaca3c426f67cbe00fe550e09935e83a4b9f42af58f
-#+ocaml-findlib.368d937d488b6d52b199f650314999d49878a419a1039f4e150da8e7d205138c
-#+ocamlbuild.fba8815fe233c7027d6def1d2f4965052c1668c386a674d21e17fc44085863d9
-#+opam.d4471e24296699e24480aa345513125b5dacc0f62522d492f9a88be6cf0711b7
-#+ocaml-topkg.c9dba774560e19f1adee31657357126ff8a2c665f98fa15df727c12de4aabca7
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+ocaml.a2b6ef1873dfa7b8cc45e5ea1afe09e3f8488c929baed82ba792e58618ccfdd0
+#+ocaml-findlib.f2e1270a56c3adecb019bf646b0a870f1108f9c7556da3264b30c3bb1f1a1ee7
+#+ocamlbuild.2b12cf5e23c362cf5410024c41b5dce6156252d79398e2c288d248ee061a643a
+#+opam.1c4f222d5296619dcfe7285ccc002c047b65f6b23a964b4fedc21432804cb35e
+#+ocaml-topkg.0e8849e10c89f23d624b4a17dc6e973d259da2ed96168d236effc3a773d73bcf
 #@untar:-j:sha256:097cb2802e3701ead9572e1b483d5a28c6e2f0a39449faaf9b44ad8a89834d88:.
 
 
diff --git a/variants/root-x86_64/ocaml-ppx_derivers b/variants/root-x86_64/ocaml-ppx_derivers
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+ocaml.45a3eb9a38ae8573eec2fbaca3c426f67cbe00fe550e09935e83a4b9f42af58f
-#+dune.5cf4affb5a474e9799665c8268d37ba3e5ecf1ba83e7c986fa3cf6f8a4b3bd10
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+ocaml.a2b6ef1873dfa7b8cc45e5ea1afe09e3f8488c929baed82ba792e58618ccfdd0
+#+dune.d92e9d70c4c9c9b5eb7f723491a99fd30a2b8dd28729d707ba2a4dc615794bc0
 #@untar:-z:sha256:b6595ee187dea792b31fc54a0e1524ab1e48bc6068d3066c45215a138cc73b95:.
 
 
diff --git a/variants/root-x86_64/ocaml-ppx_deriving b/variants/root-x86_64/ocaml-ppx_deriving
@@ -1,45 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+ocaml.45a3eb9a38ae8573eec2fbaca3c426f67cbe00fe550e09935e83a4b9f42af58f
-#+dune.5cf4affb5a474e9799665c8268d37ba3e5ecf1ba83e7c986fa3cf6f8a4b3bd10
-#+ocaml-compiler-libs.04a161e764f7456f609fbb8084142c23764390adb9f166d37a0ca1698e269579
-#+ocaml-cppo.b3fcc4db38a7ba6955d738f0fe00f68a2a223610c8c90f8fed6bb2ff0c320c59
-#+ocaml-findlib.368d937d488b6d52b199f650314999d49878a419a1039f4e150da8e7d205138c
-#+ocaml-ppx_derivers.968d6387cd945a34a05c840de30114c4429e413515195683e59f78fcd0c211c0
-#+ocaml-ppxlib.8e1e6f03b5ea45d89bd57a4c10be5c4d2479345c9bdf664726f9ebbbaa7c235e
-#+ocaml-sexplib0.682be9a6f4ce5eb6e45f250a162bdedc00ed41f03ed0c259a9f029e687c3a92a
-#+ocaml-stdlib-shims.434509dbe44e36e695393a9c5bd77e10dc03ff2ae1ce90a84f09545e45170b5a
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+ocaml.a2b6ef1873dfa7b8cc45e5ea1afe09e3f8488c929baed82ba792e58618ccfdd0
+#+dune.d92e9d70c4c9c9b5eb7f723491a99fd30a2b8dd28729d707ba2a4dc615794bc0
+#+ocaml-compiler-libs.a6c06a44c64b44a015067c1d26e9512b77639de8bf86690da188f250bba79fba
+#+ocaml-cppo.29d4ff08e15956275008a08f35189c59dd4ffaa32e63f62528418f2e87fb8747
+#+ocaml-findlib.f2e1270a56c3adecb019bf646b0a870f1108f9c7556da3264b30c3bb1f1a1ee7
+#+ocaml-ppx_derivers.e6b839e4ff39de91d6b23972257c6b6cf656f1ea74963fec14a643099baf23ce
+#+ocaml-ppxlib.6be9825b9b8821bcc49ecbfd111711a3832bb3311d01f2ac0982cf8e448b34ac
+#+ocaml-sexplib0.912584b3361cc520d1709665222380e56271aa5f1738bc523f4e71ee4d0353ed
+#+ocaml-stdlib-shims.5743ca1c1f8823f30d6b184220508a19dc3ed3b6ad8e1a1f8accfcef27e9b317
 #@untar:-z:sha256:c91d1ea5e15e6928a2f8947dbd135b9f765cc0e2d72be271427981afcd350c24:.
 
 
diff --git a/variants/root-x86_64/ocaml-ppxlib b/variants/root-x86_64/ocaml-ppxlib
@@ -1,42 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+ocaml.45a3eb9a38ae8573eec2fbaca3c426f67cbe00fe550e09935e83a4b9f42af58f
-#+dune.5cf4affb5a474e9799665c8268d37ba3e5ecf1ba83e7c986fa3cf6f8a4b3bd10
-#+ocaml-compiler-libs.04a161e764f7456f609fbb8084142c23764390adb9f166d37a0ca1698e269579
-#+ocaml-ppx_derivers.968d6387cd945a34a05c840de30114c4429e413515195683e59f78fcd0c211c0
-#+ocaml-sexplib0.682be9a6f4ce5eb6e45f250a162bdedc00ed41f03ed0c259a9f029e687c3a92a
-#+ocaml-stdlib-shims.434509dbe44e36e695393a9c5bd77e10dc03ff2ae1ce90a84f09545e45170b5a
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+ocaml.a2b6ef1873dfa7b8cc45e5ea1afe09e3f8488c929baed82ba792e58618ccfdd0
+#+dune.d92e9d70c4c9c9b5eb7f723491a99fd30a2b8dd28729d707ba2a4dc615794bc0
+#+ocaml-compiler-libs.a6c06a44c64b44a015067c1d26e9512b77639de8bf86690da188f250bba79fba
+#+ocaml-ppx_derivers.e6b839e4ff39de91d6b23972257c6b6cf656f1ea74963fec14a643099baf23ce
+#+ocaml-sexplib0.912584b3361cc520d1709665222380e56271aa5f1738bc523f4e71ee4d0353ed
+#+ocaml-stdlib-shims.5743ca1c1f8823f30d6b184220508a19dc3ed3b6ad8e1a1f8accfcef27e9b317
 #@untar:-j:sha256:2e223837e7cecc3bc84a432432c0a72f4e1d5be9165c9c33772f156db85db0b3:.
 
 
diff --git a/variants/root-x86_64/ocaml-rresult b/variants/root-x86_64/ocaml-rresult
@@ -1,41 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+ocaml.45a3eb9a38ae8573eec2fbaca3c426f67cbe00fe550e09935e83a4b9f42af58f
-#+ocaml-findlib.368d937d488b6d52b199f650314999d49878a419a1039f4e150da8e7d205138c
-#+ocamlbuild.fba8815fe233c7027d6def1d2f4965052c1668c386a674d21e17fc44085863d9
-#+opam.d4471e24296699e24480aa345513125b5dacc0f62522d492f9a88be6cf0711b7
-#+ocaml-topkg.c9dba774560e19f1adee31657357126ff8a2c665f98fa15df727c12de4aabca7
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+ocaml.a2b6ef1873dfa7b8cc45e5ea1afe09e3f8488c929baed82ba792e58618ccfdd0
+#+ocaml-findlib.f2e1270a56c3adecb019bf646b0a870f1108f9c7556da3264b30c3bb1f1a1ee7
+#+ocamlbuild.2b12cf5e23c362cf5410024c41b5dce6156252d79398e2c288d248ee061a643a
+#+opam.1c4f222d5296619dcfe7285ccc002c047b65f6b23a964b4fedc21432804cb35e
+#+ocaml-topkg.0e8849e10c89f23d624b4a17dc6e973d259da2ed96168d236effc3a773d73bcf
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
diff --git a/variants/root-x86_64/ocaml-sexplib0 b/variants/root-x86_64/ocaml-sexplib0
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+ocaml.45a3eb9a38ae8573eec2fbaca3c426f67cbe00fe550e09935e83a4b9f42af58f
-#+dune.5cf4affb5a474e9799665c8268d37ba3e5ecf1ba83e7c986fa3cf6f8a4b3bd10
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+ocaml.a2b6ef1873dfa7b8cc45e5ea1afe09e3f8488c929baed82ba792e58618ccfdd0
+#+dune.d92e9d70c4c9c9b5eb7f723491a99fd30a2b8dd28729d707ba2a4dc615794bc0
 #@untar:-z:sha256:86dba26468194512f789f2fb709063515a9cb4e5c4461c021c239a369590701d:.
 
 
diff --git a/variants/root-x86_64/ocaml-stdlib-shims b/variants/root-x86_64/ocaml-stdlib-shims
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+ocaml.45a3eb9a38ae8573eec2fbaca3c426f67cbe00fe550e09935e83a4b9f42af58f
-#+dune.5cf4affb5a474e9799665c8268d37ba3e5ecf1ba83e7c986fa3cf6f8a4b3bd10
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+ocaml.a2b6ef1873dfa7b8cc45e5ea1afe09e3f8488c929baed82ba792e58618ccfdd0
+#+dune.d92e9d70c4c9c9b5eb7f723491a99fd30a2b8dd28729d707ba2a4dc615794bc0
 #@untar:-j:sha256:babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a:.
 
 
diff --git a/variants/root-x86_64/ocaml-topkg b/variants/root-x86_64/ocaml-topkg
@@ -1,40 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+ocaml.45a3eb9a38ae8573eec2fbaca3c426f67cbe00fe550e09935e83a4b9f42af58f
-#+ocaml-findlib.368d937d488b6d52b199f650314999d49878a419a1039f4e150da8e7d205138c
-#+ocamlbuild.fba8815fe233c7027d6def1d2f4965052c1668c386a674d21e17fc44085863d9
-#+opam.d4471e24296699e24480aa345513125b5dacc0f62522d492f9a88be6cf0711b7
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+ocaml.a2b6ef1873dfa7b8cc45e5ea1afe09e3f8488c929baed82ba792e58618ccfdd0
+#+ocaml-findlib.f2e1270a56c3adecb019bf646b0a870f1108f9c7556da3264b30c3bb1f1a1ee7
+#+ocamlbuild.2b12cf5e23c362cf5410024c41b5dce6156252d79398e2c288d248ee061a643a
+#+opam.1c4f222d5296619dcfe7285ccc002c047b65f6b23a964b4fedc21432804cb35e
 #@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.45a3eb9a38ae8573eec2fbaca3c426f67cbe00fe550e09935e83a4b9f42af58f
-#+dune.5cf4affb5a474e9799665c8268d37ba3e5ecf1ba83e7c986fa3cf6f8a4b3bd10
-#+ocamlbuild.fba8815fe233c7027d6def1d2f4965052c1668c386a674d21e17fc44085863d9
-#+ocaml-base.ac9d6b42c0b4fa0e623f5d9e24f1adbeee81f225c83800caa7f702f7fd2c6d44
-#+opam.d4471e24296699e24480aa345513125b5dacc0f62522d492f9a88be6cf0711b7
-#+ocaml-bos.224ebc19276398d27db1309462e1db24641b21092646ef9652e03195337492e9
-#+ocaml-lun.53699ee78f4711c363a3b2422aacc12610c9ce57223fb965f2038c62c83c391c
-#+ocaml-ppx_deriving.e132a5684479fa30149975750b7d976b0ca7596475b043252425a960914c1d38-
\ No newline at end of file
+#+ocaml.a2b6ef1873dfa7b8cc45e5ea1afe09e3f8488c929baed82ba792e58618ccfdd0
+#+dune.d92e9d70c4c9c9b5eb7f723491a99fd30a2b8dd28729d707ba2a4dc615794bc0
+#+ocamlbuild.2b12cf5e23c362cf5410024c41b5dce6156252d79398e2c288d248ee061a643a
+#+ocaml-base.eeb3ba851290f6e0826e00f97da1ac1d1ce7631ef33d0a8fda40283094af9a51
+#+opam.1c4f222d5296619dcfe7285ccc002c047b65f6b23a964b4fedc21432804cb35e
+#+ocaml-bos.eca7b749c191dfcf14ac28ae186bd386b246870df5454438b6fbf25eb04f6d8d
+#+ocaml-lun.f56068b82d3bc902fd3e17a1571cdae5ce68a06ebb9f9bd66f6b0963c30331ce
+#+ocaml-ppx_deriving.6a7d72f75ee734f73fb4f5d0851b9ffdea51e2e69e919ba9b06c9d577818e5cd+
\ No newline at end of file
diff --git a/variants/root-x86_64/ocaml:dynlink b/variants/root-x86_64/ocaml:dynlink
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+m4.a61864a21512ed75ea7bcd752e8600e5392ae095487060f27ffeda895bf1330c
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+m4.915d4de6f7fcffd54583accd119a9e43494fecba0d87d1c52763cb8f91c08544
 #@untar:-J:sha256:dfaa8a2e11c799bc1765d8bef44911406ee5f4803027190382a939f88c912266:.
 
 
diff --git a/variants/root-x86_64/ocaml_intrinsics_kernel b/variants/root-x86_64/ocaml_intrinsics_kernel
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+ocaml.45a3eb9a38ae8573eec2fbaca3c426f67cbe00fe550e09935e83a4b9f42af58f
-#+dune.5cf4affb5a474e9799665c8268d37ba3e5ecf1ba83e7c986fa3cf6f8a4b3bd10
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+ocaml.a2b6ef1873dfa7b8cc45e5ea1afe09e3f8488c929baed82ba792e58618ccfdd0
+#+dune.d92e9d70c4c9c9b5eb7f723491a99fd30a2b8dd28729d707ba2a4dc615794bc0
 #@untar:-z:sha256:c988b7769a59749631c3c98ba5edd1d2fe91f5dc380b5e0593c073c92f4bee01:.
 
 
diff --git a/variants/root-x86_64/ocamlbuild b/variants/root-x86_64/ocamlbuild
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+m4.a61864a21512ed75ea7bcd752e8600e5392ae095487060f27ffeda895bf1330c
-#+ocaml.45a3eb9a38ae8573eec2fbaca3c426f67cbe00fe550e09935e83a4b9f42af58f
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+m4.915d4de6f7fcffd54583accd119a9e43494fecba0d87d1c52763cb8f91c08544
+#+ocaml.a2b6ef1873dfa7b8cc45e5ea1afe09e3f8488c929baed82ba792e58618ccfdd0
 #@untar:-z:sha256:2ba6857f2991b7f69368e8db818b163d31cf5a367f15f5953bf8f01a77b3d4fc:.
 
 
@@ -53,7 +53,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/versions/musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/versions/musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
 			return 0
 			;;
 		(*)
@@ -77,7 +77,7 @@ make configure \
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
 # workaround ocamlbuild manpage getting installed to stdlib directory
-stdlib="$pthbs_destdir/versions/ocaml.45a3eb9a38ae8573eec2fbaca3c426f67cbe00fe550e09935e83a4b9f42af58f"
+stdlib="$pthbs_destdir/versions/ocaml.a2b6ef1873dfa7b8cc45e5ea1afe09e3f8488c929baed82ba792e58618ccfdd0"
 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.bb6f1d57e91d00ac686a3dc3897152433b98f066ee9e6ae95d7d35863496ffac
-#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
-#+gnu-make.aefac1011f80fc35ae17a394eab3fddadeda6b788a6a49889efbe78d7365eb91
-#+musl-cross-make.0db83a03695adab20fbf668e85604a1b9d6ffbcff71618bafc909c053f801192-
\ No newline at end of file
+#+busybox.eae69ad708db8919d4776903fdb6d7b383802d9c837c31cc25779477429e49fb
+#+nawk.c00d6bfea54d17362a10f318ccbfdb556d7ac63d364bdfb3aefef5681d3189ff
+#+gnu-make.367f296c3c6c53a03ebd428e60b59f50b1c0a8a4fcf767fcda70fce8740773d9
+#+musl-cross-make.6d127b68c31bc67a13293f51dc2c6104c6919f18893bcd4e18a19dee6278c4e0+
\ 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.c2fb2e2455bfe14d4a02160674f83b5bb7b7a7b45aa37fb736efc2335ef029ae
-#+busybox.dd5cf98d9494e9abc1bd344b06d4162b156b986d61a5b4718f693576ad6512f9
-#+gnu-make.42ed6990a39c70ad6ecb3ed449d55f4e7a49773e365359ef61730f1dd0a91348-
\ No newline at end of file
+#+musl-cross-make.e9946dfdf62ed06dc86a580d49ab0125cb534acbc0d2623f6c2d0f6960857960
+#+busybox.ffd1832c5b3e467109c81cca5ea659ba9347ceb186d01b0f1645f1cd195c1622
+#+gnu-make.767fdcc2a908a26ed20f0954599ce1a451c9381f8a53fe31b11d392fd3efcf00+
\ No newline at end of file
diff --git a/variants/root-x86_64/opam b/variants/root-x86_64/opam
@@ -1,41 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+diffutils.ac0e612291c45111f16c52fd2e291104c1a1ac367b666ed9061214162e301b84
-#+patch.7b9c4e1c303eebd9d10cdd03a98031cdaeb7c2dd6284993cce893a198370fc98
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+getconf.cdf702f3ccd85f4383d235055f3e582f8a82dcd913ac99922c2997b962b0a578
-#+ocaml.45a3eb9a38ae8573eec2fbaca3c426f67cbe00fe550e09935e83a4b9f42af58f
-#+dune.5cf4affb5a474e9799665c8268d37ba3e5ecf1ba83e7c986fa3cf6f8a4b3bd10
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+diffutils.61a843cd41f96387bfab2cd85021b04474dc079cfa4913ed4f0c4e22e2423c78
+#+patch.938ec0e5bec811c233bf8169955722f2d649291cfcd4bbd51505d5a8a01a02c3
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+getconf.454343aa919ab414e6686dc0a264b529d00efe88fc72b7146d4c7902758d6012
+#+ocaml.a2b6ef1873dfa7b8cc45e5ea1afe09e3f8488c929baed82ba792e58618ccfdd0
+#+dune.d92e9d70c4c9c9b5eb7f723491a99fd30a2b8dd28729d707ba2a4dc615794bc0
 #@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:.
 
 
@@ -74,7 +74,7 @@ export DUNE_CACHE=disabled
 	--infodir="$prefix/info" \
 	--localedir="$prefix/locale" \
 	--localstatedir='/var/pthbs' \
-	--with-dune='/versions/dune.5cf4affb5a474e9799665c8268d37ba3e5ecf1ba83e7c986fa3cf6f8a4b3bd10/command/dune' \
+	--with-dune='/versions/dune.d92e9d70c4c9c9b5eb7f723491a99fd30a2b8dd28729d707ba2a4dc615794bc0/command/dune' \
 	--with-mccs \
 	--with-vendored-deps \
 	--enable-static
diff --git a/variants/root-x86_64/patch b/variants/root-x86_64/patch
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+m4.a61864a21512ed75ea7bcd752e8600e5392ae095487060f27ffeda895bf1330c
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+m4.915d4de6f7fcffd54583accd119a9e43494fecba0d87d1c52763cb8f91c08544
 #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:.
 
 
@@ -62,8 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+m4.a61864a21512ed75ea7bcd752e8600e5392ae095487060f27ffeda895bf1330c
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+m4.915d4de6f7fcffd54583accd119a9e43494fecba0d87d1c52763cb8f91c08544
 #@untar:-J:sha256:3a224f2accf091b77a5781316e27b9ee3ba82c083cc2e539e08940b68a44fec5:.
 
 
@@ -62,8 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+pkgconf.336ec60351a0b8287af244ffc0778af13ccd12cc4b26d754211a49779e0d9c25
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+pkgconf.51f5967b295f991c080d5d89f8ae68dfa1fa7cc890d935d1e16c963ebebc005e
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/popt b/variants/root-x86_64/popt
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+m4.a61864a21512ed75ea7bcd752e8600e5392ae095487060f27ffeda895bf1330c
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+m4.915d4de6f7fcffd54583accd119a9e43494fecba0d87d1c52763cb8f91c08544
 #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:.
 
 
@@ -62,8 +62,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+zsh.940fb164d1b08494f9050c2d0a703ca17b52aef114c5b743188afa6e0cc2535a
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+zsh.ee33e58971ec7f0fcbef113a52c386426b21d53d9fd11b3364fc3c01c3d23150
 #@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.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
-#+execline.9db66d1bbde05bac349b09581470cf86b564f2cefdd740900138a397f3e8f432
-#+lnstools.b4d2872a8c989d8c7c6673c5e607900124a25c76b36ecb231d1b7294baf7ca77
-#+sandbox_rootfs.a0b326f0760a05ab6f86c28950cf90c6607ad85370d2d2ddaf9128b385f070a3
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+nawk.c00d6bfea54d17362a10f318ccbfdb556d7ac63d364bdfb3aefef5681d3189ff
+#+execline.9ba20223877c9b59ca004686b97e4287b455536d1cd07a1235a86547295825f3
+#+lnstools.740f6b0625a320090c9cb455fa2d786e9d94ce076c102609617e18509e7d6d10
+#+sandbox_rootfs.658cbe8dd3f898fc94c9a9f5e4230435ede22e17728d40eb981dd02f6d5c4301
 #@sha256:b85634a91129f85a5aad5cae51d4084dd7ce62544b5585f0899058576c16451f:abspaths.awk
 #@sha256:df0c24312e4941b1035a6292504fbf569f0f8b81b083835d7df84586decef25c:sandbox-rootns.in
 
diff --git a/variants/root-x86_64/rsync b/variants/root-x86_64/rsync
@@ -1,41 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+m4.a61864a21512ed75ea7bcd752e8600e5392ae095487060f27ffeda895bf1330c
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+popt.0964dc385e37ae2d96c604d862381ca279c6af2892edd37bc0133df6856a9cbf
-#+libressl.bb138b71407428bdbaa535460d64b56c272b073487744b79a189033121a2fa5f
-#+zstd.b32e156387e297d76a06a61df269492fc0e0428d431c464b2c822cda41c68f66
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+m4.915d4de6f7fcffd54583accd119a9e43494fecba0d87d1c52763cb8f91c08544
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+popt.297995f07a12bc650287acee7a23f3353cae96e124d77a753c78478818e09c20
+#+libressl.1de2bbcf63a2e25dfc53f2ec10bce4b4c76305694cde2848c482a06f9cae58db
+#+zstd.ba62fc1046eab5dd0a0a55729857788ad51d84bf380d5c7e6d1241403e6ab2f2
 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:.
 
 
@@ -65,8 +65,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+skalibs.996c296dc6913eafb73cae5d800ec88eb7910bd5f769c7bd76801b0862bf8798
-#+execline.02acbe14d5e97b9ae7bae85f02af414eecafa660af770c137bd2db3c1e9e55f8
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+skalibs.3c52744da310a82cb7bea2ab5407487c409a3d7b88b4267afab55694cade488c
+#+execline.931baf79ba1e4d471d96c87209f1d6dd12e06b907a86677ed7c646407fc44f91
 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6
 
 
@@ -49,7 +49,7 @@ cd 's6'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.996c296dc6913eafb73cae5d800ec88eb7910bd5f769c7bd76801b0862bf8798/sysdeps' \
+	--with-sysdeps='/versions/skalibs.3c52744da310a82cb7bea2ab5407487c409a3d7b88b4267afab55694cade488c/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/root-x86_64/s6-dns b/variants/root-x86_64/s6-dns
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+skalibs.996c296dc6913eafb73cae5d800ec88eb7910bd5f769c7bd76801b0862bf8798
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+skalibs.3c52744da310a82cb7bea2ab5407487c409a3d7b88b4267afab55694cade488c
 #@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns
 
 
@@ -48,7 +48,7 @@ cd 's6-dns'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.996c296dc6913eafb73cae5d800ec88eb7910bd5f769c7bd76801b0862bf8798/sysdeps' \
+	--with-sysdeps='/versions/skalibs.3c52744da310a82cb7bea2ab5407487c409a3d7b88b4267afab55694cade488c/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/root-x86_64/s6-linux-init b/variants/root-x86_64/s6-linux-init
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+skalibs.996c296dc6913eafb73cae5d800ec88eb7910bd5f769c7bd76801b0862bf8798
-#+execline.02acbe14d5e97b9ae7bae85f02af414eecafa660af770c137bd2db3c1e9e55f8
-#+s6.aa379bb33c5efeb8d7b4773f1a01131c91e8868516914c6b5f7eca15dcdca9b5
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+skalibs.3c52744da310a82cb7bea2ab5407487c409a3d7b88b4267afab55694cade488c
+#+execline.931baf79ba1e4d471d96c87209f1d6dd12e06b907a86677ed7c646407fc44f91
+#+s6.b8ee6272cc50fbd1f413b539cb0a149258a5b8fdd90c3136f55356334d79ffa5
 #@git:b298e515efe16210048e504e3aec89ea1e627b73:s6-linux-init
 
 
@@ -50,7 +50,7 @@ cd 's6-linux-init'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.996c296dc6913eafb73cae5d800ec88eb7910bd5f769c7bd76801b0862bf8798/sysdeps' \
+	--with-sysdeps='/versions/skalibs.3c52744da310a82cb7bea2ab5407487c409a3d7b88b4267afab55694cade488c/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/root-x86_64/s6-linux-utils b/variants/root-x86_64/s6-linux-utils
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+skalibs.996c296dc6913eafb73cae5d800ec88eb7910bd5f769c7bd76801b0862bf8798
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+skalibs.3c52744da310a82cb7bea2ab5407487c409a3d7b88b4267afab55694cade488c
 #@git:a9e7acac41a8854546246dd39cb4daee54ead2cb:s6-linux-utils
 
 
@@ -48,7 +48,7 @@ cd 's6-linux-utils'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.996c296dc6913eafb73cae5d800ec88eb7910bd5f769c7bd76801b0862bf8798/sysdeps' \
+	--with-sysdeps='/versions/skalibs.3c52744da310a82cb7bea2ab5407487c409a3d7b88b4267afab55694cade488c/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/root-x86_64/s6-networking b/variants/root-x86_64/s6-networking
@@ -1,41 +1,41 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+skalibs.996c296dc6913eafb73cae5d800ec88eb7910bd5f769c7bd76801b0862bf8798
-#+execline.02acbe14d5e97b9ae7bae85f02af414eecafa660af770c137bd2db3c1e9e55f8
-#+s6.aa379bb33c5efeb8d7b4773f1a01131c91e8868516914c6b5f7eca15dcdca9b5
-#+s6-dns.ac084844e2b646fec44ee51274e21dbddfadd46672f09084807b3a73f4ea2d2a
-#+libressl.bb138b71407428bdbaa535460d64b56c272b073487744b79a189033121a2fa5f
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+skalibs.3c52744da310a82cb7bea2ab5407487c409a3d7b88b4267afab55694cade488c
+#+execline.931baf79ba1e4d471d96c87209f1d6dd12e06b907a86677ed7c646407fc44f91
+#+s6.b8ee6272cc50fbd1f413b539cb0a149258a5b8fdd90c3136f55356334d79ffa5
+#+s6-dns.2249a941b110f6a3d691cead4787ba251f2c08df5316ea202ecbd30adeb58837
+#+libressl.1de2bbcf63a2e25dfc53f2ec10bce4b4c76305694cde2848c482a06f9cae58db
 #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking
 
 
@@ -52,7 +52,7 @@ cd 's6-networking'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.996c296dc6913eafb73cae5d800ec88eb7910bd5f769c7bd76801b0862bf8798/sysdeps' \
+	--with-sysdeps='/versions/skalibs.3c52744da310a82cb7bea2ab5407487c409a3d7b88b4267afab55694cade488c/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/root-x86_64/s6-portable-utils b/variants/root-x86_64/s6-portable-utils
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+skalibs.996c296dc6913eafb73cae5d800ec88eb7910bd5f769c7bd76801b0862bf8798
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+skalibs.3c52744da310a82cb7bea2ab5407487c409a3d7b88b4267afab55694cade488c
 #@git:dc96d8a020e83b16dd7a8bd093bdb00ab2b944c0:s6-portable-utils
 
 
@@ -48,7 +48,7 @@ cd 's6-portable-utils'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.996c296dc6913eafb73cae5d800ec88eb7910bd5f769c7bd76801b0862bf8798/sysdeps' \
+	--with-sysdeps='/versions/skalibs.3c52744da310a82cb7bea2ab5407487c409a3d7b88b4267afab55694cade488c/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
diff --git a/variants/root-x86_64/s6-rc b/variants/root-x86_64/s6-rc
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+skalibs.996c296dc6913eafb73cae5d800ec88eb7910bd5f769c7bd76801b0862bf8798
-#+execline.02acbe14d5e97b9ae7bae85f02af414eecafa660af770c137bd2db3c1e9e55f8
-#+s6.aa379bb33c5efeb8d7b4773f1a01131c91e8868516914c6b5f7eca15dcdca9b5
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+skalibs.3c52744da310a82cb7bea2ab5407487c409a3d7b88b4267afab55694cade488c
+#+execline.931baf79ba1e4d471d96c87209f1d6dd12e06b907a86677ed7c646407fc44f91
+#+s6.b8ee6272cc50fbd1f413b539cb0a149258a5b8fdd90c3136f55356334d79ffa5
 #@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc
 
 
@@ -50,7 +50,7 @@ cd 's6-rc'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.996c296dc6913eafb73cae5d800ec88eb7910bd5f769c7bd76801b0862bf8798/sysdeps' \
+	--with-sysdeps='/versions/skalibs.3c52744da310a82cb7bea2ab5407487c409a3d7b88b4267afab55694cade488c/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.22dc62e0fb617806f87b8c176baf8a254b6e3f4000c4922a5bbd25c711a753ee
-#+gnu-make.eade157dc9f705700afa644952c4a4b2c9d4b4dc359009904bb383e72ee66c5e
-#+busybox.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
-#+skalibs.2464832f18423982fed29e9fcbbe9ccb56808bf06c995b035cd6733c089f607b
+#+musl-cross-make.54dd6edc9bf08879bd3befb4053c5b17fc817f12c2a133e69d0136b697ddf55e
+#+gnu-make.c437f52cec5900e752ee976cde1c70c02af126c44a60a80cf9e96d997b07383e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+nawk.c00d6bfea54d17362a10f318ccbfdb556d7ac63d364bdfb3aefef5681d3189ff
+#+skalibs.6fc2bb9d53d8c9bd20da6a8b34282899af37e219092ee9ccc6ec32e01313e506
 #@sha256:8d716caa5ea940bbbb8f68ac0907cea36773c183bd4c1eebad030f6cc7deaec9:argv0exec.c
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,4 +1,4 @@
 #!/usr/bin/env pthbs-build
-#+lnstools.b4d2872a8c989d8c7c6673c5e607900124a25c76b36ecb231d1b7294baf7ca77
-#+sandbox_rootfs.a0b326f0760a05ab6f86c28950cf90c6607ad85370d2d2ddaf9128b385f070a3
-#+pthbs-sandbox-rootns.5e753304c7ba01adb32b4b2fb3fdac1912f1b68d9382af66035b110290c86105-
\ No newline at end of file
+#+lnstools.740f6b0625a320090c9cb455fa2d786e9d94ce076c102609617e18509e7d6d10
+#+sandbox_rootfs.658cbe8dd3f898fc94c9a9f5e4230435ede22e17728d40eb981dd02f6d5c4301
+#+pthbs-sandbox-rootns.e48deb520e7bcfb972a1f6d585f3a916ce69dab93079beab997749ac1d6a6625+
\ No newline at end of file
diff --git a/variants/root-x86_64/skalibs b/variants/root-x86_64/skalibs
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
 #@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.22dc62e0fb617806f87b8c176baf8a254b6e3f4000c4922a5bbd25c711a753ee
-#+gnu-make.eade157dc9f705700afa644952c4a4b2c9d4b4dc359009904bb383e72ee66c5e
-#+busybox.fd5f25405b96ed7abc745d6b95cffdba1b77524c9369b9c1cf257e2e661bd674
-#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
+#+musl-cross-make.54dd6edc9bf08879bd3befb4053c5b17fc817f12c2a133e69d0136b697ddf55e
+#+gnu-make.c437f52cec5900e752ee976cde1c70c02af126c44a60a80cf9e96d997b07383e
+#+busybox.7f36cc3c81c30e85d1f319f2aac3d44d7eac7fa635020df34e1619363d959804
+#+nawk.c00d6bfea54d17362a10f318ccbfdb556d7ac63d364bdfb3aefef5681d3189ff
 #@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.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+zsh.940fb164d1b08494f9050c2d0a703ca17b52aef114c5b743188afa6e0cc2535a
-#+pthbs-banginstall.385ee92921055459329c5747e278d9afcde737a2739d6b049c75d8c8e52dfe05
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+zsh.ee33e58971ec7f0fcbef113a52c386426b21d53d9fd11b3364fc3c01c3d23150
+#+pthbs-banginstall.36288015cc9c716da55767223cc33a3f8f31c46c14dbc223cf37ea59d25263d3
 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep
 
 
diff --git a/variants/root-x86_64/squashfs-tools b/variants/root-x86_64/squashfs-tools
@@ -1,47 +1,47 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+attr.ed3e525ee851c376301f5f83452406ff9d6541f5e13c1822fcc21c11e17ca4b0
-#+zstd.b32e156387e297d76a06a61df269492fc0e0428d431c464b2c822cda41c68f66
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+attr.bb15046e2552e647ee6a77fe4430a663cab6a31d06afe5a01c1235cd8b90cde8
+#+zstd.ba62fc1046eab5dd0a0a55729857788ad51d84bf380d5c7e6d1241403e6ab2f2
 #@untar:-z:sha256:4672b5c47d9418d3a5ae5b243defc6d9eae8275b9771022247c6a6082c815914:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,40 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+m4.a61864a21512ed75ea7bcd752e8600e5392ae095487060f27ffeda895bf1330c
-#+patch.7b9c4e1c303eebd9d10cdd03a98031cdaeb7c2dd6284993cce893a198370fc98
-#+libunwind.8d396fc70b3b4904b36f0f3de1e6f87397308d98287e495e71ec5301d83c1724
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+m4.915d4de6f7fcffd54583accd119a9e43494fecba0d87d1c52763cb8f91c08544
+#+patch.938ec0e5bec811c233bf8169955722f2d649291cfcd4bbd51505d5a8a01a02c3
+#+libunwind.a342cd9d86870874e009c0f633e6cb6e52badfad418b82c86d19eae30df39f47
 #@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch
 #@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:.
 
@@ -65,8 +65,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-dosfstools.71bc76a0ed81f75f627cdad20afad3c043a742ac5b596f9fea7d346c70a121bb
-#+busybox-e2fsprogs.b0bdc0e6ab9e92ea85207b4725ed273f32ef9800890eb9c0aa966ebb1d6741fc
-#+busybox-iproute2.6ff8eea2f6058b3e00c3209144bb6a80c3b4914e446115b7014cf987f4d3ddc1
-#+busybox-iputils.78685d282f393c31b9fbcb7d7723543b2b9892f609411c646bec3c0f8d64c982
-#+busybox-net-misc.2aae98f296fd0d15269f1b6a72932dd0a0905b62dbd28be67f8cbb16ec798a16
-#+busybox-net-tools.d50ec3c3d82a9084545fcb1525947814f703fb7622882484b28e6e2c75cdaabb
-#+busybox-traceroute.8a295cff05cf57f9c4c32116fb9f216b50cd352a5d6d2ece31af95aacd9c01bc
-#+busybox-wget.941d8e621ef79b83cf954caacd4d36a558d0f89a1f7f5842db3c49ca66f2d401
-#+busybox-chpst.2e94bfa7a9d9469bb306f2e14172c3cbd7e3952058836bd771c2c96d01959555
-#+busybox-console.b358f2f28ef1fe7801a45bb277f49dad3b51a077619525cd6c2814d27d5d4135
-#+busybox-getty.53ec1d2582847d9e416abf924ef3d7d6000529a12d6a55a38dbd3b96e1cd0c20
-#+busybox-i2c-tools.75c0164ed1ef37ca9dce1fb2a43a43889e498a9dce07d823718f088056fc4617
-#+busybox-linux-extra.9c7d95eeaee4233fcdec59eeb11c8008a7b471c5d47bc476fc5341baef97e056
-#+busybox-mtd-utils.a81de2fc6ea4bd9be64976f3b363e5051bfac161e86ee34757d320e1eba64fb9
-#+busybox-shadow.48db62ed1844e2e2023d2d1701d26f3093c5950f630dda0cd9e3fead0ec62433
-#+busybox-su.c611b757a09501f3accbad8cfe5bb5e5d21a7f237ca06ab40f077f754914b082
-#+busybox-util-linux-priv.979ec553d01dbffd268ef6c5b3e32476d49f48047cb0946226ced57bf94268ba
-#+busybox-logging.8fc0e29eb774d0a0005f020849e6af96ff8607f1785cac4cc019c1e3c2368e7d
-#+busybox-cron.f1d58c9ff941fb7a40717c1b17b7accaca47a3e94eb95bbe26a75b48b9c2d007
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+diffutils.ac0e612291c45111f16c52fd2e291104c1a1ac367b666ed9061214162e301b84
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+aat.3f965ca95e2659c4f819fc3aef112366e6fc7e0d3baf84cbfa6969c380cae808
-#+fileset.d4fd5c0a028109c7f91690724f766dd42405f6d2abf4814a9526f5c116aca3e6
-#+rsync.e306e1d227381c0191f961f8d427a6ee3bb03ff1651397894cc665955c747842
-#+execline.02acbe14d5e97b9ae7bae85f02af414eecafa660af770c137bd2db3c1e9e55f8
-#+kbd.f4b4c64eb6a65c071485ba49ec5a88aef7934c0bf9d094cd31e45cb72588ab12
-#+mdevd.6994a3bb1f8d77dc9beeedc060621e709c6383dea3d3b27772a45ba6a8376a54
-#+s6-linux-utils.e2c953bf26b378cf5633f192de4f011964af9fc7d287f8882e2ff897549a6c78
-#+s6-rc.696330547add10bffce9574b1d40d31d6322a7353b3cec21fc379b4793eaf02c
-#+s6.aa379bb33c5efeb8d7b4773f1a01131c91e8868516914c6b5f7eca15dcdca9b5
-#+zsh.940fb164d1b08494f9050c2d0a703ca17b52aef114c5b743188afa6e0cc2535a
-#+libcgroup.e052f1492f065406266551128fe4dccc0342fd29b4c1c2b5e27ad8148879f684
-#+system-config-scripts.dafcf3279f4057e0dcb07c6ec9cdf23086708f1dd4f1540929f4e6584bc27031
-#+logincaps.7c9f1a355b1e85c36fe8fde2cd2144c262e8f6ad7eb5ef104191609398665bcd
-#+busybox-modutils.8c23fe774b013e036b71f8481ab87185ba3de4d4d7cc79088f92ce8994ab1ed9
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-dosfstools.bb76e2e4e59c77e74d9e2c266b754d13ac39eae7fd5253624c2bf36a00fc5b4b
+#+busybox-e2fsprogs.0c93cbcbc3b30cd119deb01ebc66000f5ea76f0e5389e1cedb4f09cd610a5f9f
+#+busybox-iproute2.32cd371493752a8781d107b84ec658e6513081e741b7b4d875cb36cc4ee41626
+#+busybox-iputils.ca5d7f38855fc2c30e38418c1fcea44fdd303830303964f9081616d1f89a4c1e
+#+busybox-net-misc.ba3e6053fdc4d949bd7ca03ff5c6881340516c9ab7430ec8064f284abe1b438b
+#+busybox-net-tools.89228f43d3a2db82a50dbf7a4794ec3845a50aedc560508dbc688c5428c90f75
+#+busybox-traceroute.65281d2051f2772efd303373f6df2580248163c9581850064284967b936c848f
+#+busybox-wget.94600d8031914b48747bbe47215b3502ce5b96b6a630ca687d99d9d3855ae514
+#+busybox-chpst.2166432deeba221223fe77449cfd006be27cd8c843b065408ee45622ee1836f8
+#+busybox-console.f81511b1c1fe8b84224b37d96f17bfa287d5ceaeb0a3774a6dcde0964f7fbe86
+#+busybox-getty.3b92b6dcf1f2ef9e42eedda2f4ba4d37822b79663f27dd34a89c7db50815b576
+#+busybox-i2c-tools.9c37efd9b5dbfb343fff869989d253783d6f6760d0c42b365fe07c0ecf9eb8f0
+#+busybox-linux-extra.4824b1a20af565f0330a77eea497984e1bc116f25f3dd2c04624c3264f65c8e8
+#+busybox-mtd-utils.3e612b2a5696c569d6ff5e5177a1493e9505c89bbc9e5f5f4f477ddaf69d869a
+#+busybox-shadow.5ffff209d39d2c486ececfcd19781d643048eaecdda9ef0825d05dd7ff8b230e
+#+busybox-su.efc07bf5aaeabd2813b7d81dc9d26177d95577fdd22f539ed410124b46ac33c7
+#+busybox-util-linux-priv.f91c6722d0cea27dd003e9e6f7a9fbd70a035bf56da58bf908fbafbb0b0abe98
+#+busybox-logging.577bdef100ed53f33650e97b77a281a33742d7aedbc01a90d1705378e89ce27e
+#+busybox-cron.550fb7656af835f36463a67046f264b6cb225d34e17196108ae38991db81be3f
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+diffutils.61a843cd41f96387bfab2cd85021b04474dc079cfa4913ed4f0c4e22e2423c78
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+aat.60749f0c5fd088ecc667b0db36cfba83130c4546e4ab8c6bf010d8ee7d772f9e
+#+fileset.824e16ae67c4278108fc62431e7e3eeeecde9a78e211dbb1510993f2a53be77c
+#+rsync.b3ef71cec80999c1bf120b20fc539e965c65a39d5cb2e483f344e7a8de974e2d
+#+execline.931baf79ba1e4d471d96c87209f1d6dd12e06b907a86677ed7c646407fc44f91
+#+kbd.3794f687a32ef77a5c5360b058b4f615b62dad11dcde77958b6065ca46f60bd7
+#+mdevd.ead9a47ae83c2cff99002456d454c8623deedd43084266ace85360f1e35d4223
+#+s6-linux-utils.9111f50b5749c31ff8576b664e3c2182f50c5a282ac65def5c1172516f793468
+#+s6-rc.be85015b4bf42b82451e6c451999682e347534153aeefb68438d46b8102f5da3
+#+s6.b8ee6272cc50fbd1f413b539cb0a149258a5b8fdd90c3136f55356334d79ffa5
+#+zsh.ee33e58971ec7f0fcbef113a52c386426b21d53d9fd11b3364fc3c01c3d23150
+#+libcgroup.9d683bd921edd380beff7d94d42cccd347b00484ae1d9c8e2a6d1fc3aa18a071
+#+system-config-scripts.d4c3bc9b8d7fde3aeea29263e54103c235e6757fd49f0ceb069cf4408cdcb2a8
+#+logincaps.fba94255e77cb3dd50a7f390c8abe999bec75baa75646df64a29218709bc5382
+#+busybox-modutils.73bb6354fd27e775627ba098b52a6168b57724c8296964f92daade6317ca0bd3
 #@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.2e7f35c0e12b0b0a155b5a8d54860ed112c1c70ebb210817d49d9f1a1ce9a276' \
-	'pthbs_path_mdevd=/versions/env.2c66880d37f18797a3098334fc10c011ba830efd5be87abdb41b0f5d87255287' \
+	'pthbs_path_containers=/versions/env.94134ae2aec625f9c30a111a6b23f1beb22a2b6c220189486dce469f2932b415' \
+	'pthbs_path_mdevd=/versions/env.b3b52f9b46416b3320b175fa70a821b18c706f1b6b451314449b7a420338373c' \
 	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.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-dosfstools.71bc76a0ed81f75f627cdad20afad3c043a742ac5b596f9fea7d346c70a121bb
-#+busybox-e2fsprogs.b0bdc0e6ab9e92ea85207b4725ed273f32ef9800890eb9c0aa966ebb1d6741fc
-#+busybox-iproute2.6ff8eea2f6058b3e00c3209144bb6a80c3b4914e446115b7014cf987f4d3ddc1
-#+busybox-iputils.78685d282f393c31b9fbcb7d7723543b2b9892f609411c646bec3c0f8d64c982
-#+busybox-net-misc.2aae98f296fd0d15269f1b6a72932dd0a0905b62dbd28be67f8cbb16ec798a16
-#+busybox-net-tools.d50ec3c3d82a9084545fcb1525947814f703fb7622882484b28e6e2c75cdaabb
-#+busybox-traceroute.8a295cff05cf57f9c4c32116fb9f216b50cd352a5d6d2ece31af95aacd9c01bc
-#+busybox-wget.941d8e621ef79b83cf954caacd4d36a558d0f89a1f7f5842db3c49ca66f2d401
-#+busybox-chpst.2e94bfa7a9d9469bb306f2e14172c3cbd7e3952058836bd771c2c96d01959555
-#+busybox-console.b358f2f28ef1fe7801a45bb277f49dad3b51a077619525cd6c2814d27d5d4135
-#+busybox-getty.53ec1d2582847d9e416abf924ef3d7d6000529a12d6a55a38dbd3b96e1cd0c20
-#+busybox-i2c-tools.75c0164ed1ef37ca9dce1fb2a43a43889e498a9dce07d823718f088056fc4617
-#+busybox-linux-extra.9c7d95eeaee4233fcdec59eeb11c8008a7b471c5d47bc476fc5341baef97e056
-#+busybox-mtd-utils.a81de2fc6ea4bd9be64976f3b363e5051bfac161e86ee34757d320e1eba64fb9
-#+busybox-shadow.48db62ed1844e2e2023d2d1701d26f3093c5950f630dda0cd9e3fead0ec62433
-#+busybox-su.c611b757a09501f3accbad8cfe5bb5e5d21a7f237ca06ab40f077f754914b082
-#+busybox-util-linux-priv.979ec553d01dbffd268ef6c5b3e32476d49f48047cb0946226ced57bf94268ba
-#+busybox-logging.8fc0e29eb774d0a0005f020849e6af96ff8607f1785cac4cc019c1e3c2368e7d
-#+busybox-cron.f1d58c9ff941fb7a40717c1b17b7accaca47a3e94eb95bbe26a75b48b9c2d007
-#+s6.aa379bb33c5efeb8d7b4773f1a01131c91e8868516914c6b5f7eca15dcdca9b5
-#+s6-rc.696330547add10bffce9574b1d40d31d6322a7353b3cec21fc379b4793eaf02c
-#+s6-portable-utils.dc6132005629eaa08b67af34b8adba42a193ad3e056cab40470a1d33de5f4c64
-#+s6-linux-init.8dc3f42e55efb671af3a6f8ecac3b7e2092c62b68648f900291d0bdf1d8e8205
-#+execline.02acbe14d5e97b9ae7bae85f02af414eecafa660af770c137bd2db3c1e9e55f8
-#+system-config-rc.e346d7f437bdbb50a19f06f213bd85b2c59fbec69305ef82bd737a691a002aba
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-dosfstools.bb76e2e4e59c77e74d9e2c266b754d13ac39eae7fd5253624c2bf36a00fc5b4b
+#+busybox-e2fsprogs.0c93cbcbc3b30cd119deb01ebc66000f5ea76f0e5389e1cedb4f09cd610a5f9f
+#+busybox-iproute2.32cd371493752a8781d107b84ec658e6513081e741b7b4d875cb36cc4ee41626
+#+busybox-iputils.ca5d7f38855fc2c30e38418c1fcea44fdd303830303964f9081616d1f89a4c1e
+#+busybox-net-misc.ba3e6053fdc4d949bd7ca03ff5c6881340516c9ab7430ec8064f284abe1b438b
+#+busybox-net-tools.89228f43d3a2db82a50dbf7a4794ec3845a50aedc560508dbc688c5428c90f75
+#+busybox-traceroute.65281d2051f2772efd303373f6df2580248163c9581850064284967b936c848f
+#+busybox-wget.94600d8031914b48747bbe47215b3502ce5b96b6a630ca687d99d9d3855ae514
+#+busybox-chpst.2166432deeba221223fe77449cfd006be27cd8c843b065408ee45622ee1836f8
+#+busybox-console.f81511b1c1fe8b84224b37d96f17bfa287d5ceaeb0a3774a6dcde0964f7fbe86
+#+busybox-getty.3b92b6dcf1f2ef9e42eedda2f4ba4d37822b79663f27dd34a89c7db50815b576
+#+busybox-i2c-tools.9c37efd9b5dbfb343fff869989d253783d6f6760d0c42b365fe07c0ecf9eb8f0
+#+busybox-linux-extra.4824b1a20af565f0330a77eea497984e1bc116f25f3dd2c04624c3264f65c8e8
+#+busybox-mtd-utils.3e612b2a5696c569d6ff5e5177a1493e9505c89bbc9e5f5f4f477ddaf69d869a
+#+busybox-shadow.5ffff209d39d2c486ececfcd19781d643048eaecdda9ef0825d05dd7ff8b230e
+#+busybox-su.efc07bf5aaeabd2813b7d81dc9d26177d95577fdd22f539ed410124b46ac33c7
+#+busybox-util-linux-priv.f91c6722d0cea27dd003e9e6f7a9fbd70a035bf56da58bf908fbafbb0b0abe98
+#+busybox-logging.577bdef100ed53f33650e97b77a281a33742d7aedbc01a90d1705378e89ce27e
+#+busybox-cron.550fb7656af835f36463a67046f264b6cb225d34e17196108ae38991db81be3f
+#+s6.b8ee6272cc50fbd1f413b539cb0a149258a5b8fdd90c3136f55356334d79ffa5
+#+s6-rc.be85015b4bf42b82451e6c451999682e347534153aeefb68438d46b8102f5da3
+#+s6-portable-utils.36126ef3d67a3d1fef864c401d15c1c9e7d5bee1fe25118991f836233eacc2c0
+#+s6-linux-init.6b33c37028163a0e514c1cda61acf127102e184efa23465765b0f3233031c689
+#+execline.931baf79ba1e4d471d96c87209f1d6dd12e06b907a86677ed7c646407fc44f91
+#+system-config-rc.7de1066077668b413bd47d05d26b04797125b29732a911b7d8555b3075960f6e
 
 
 # - build script start -
@@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-s6rcdb=/versions/system-config-rc.e346d7f437bdbb50a19f06f213bd85b2c59fbec69305ef82bd737a691a002aba/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.7de1066077668b413bd47d05d26b04797125b29732a911b7d8555b3075960f6e/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.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+s6-rc.696330547add10bffce9574b1d40d31d6322a7353b3cec21fc379b4793eaf02c
-#+fileset.d4fd5c0a028109c7f91690724f766dd42405f6d2abf4814a9526f5c116aca3e6
-#+system-config.59b75bbd1bda06730f96ed601c94b0db3ff3dd29da14a05101f1dfe3af1fccfd
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+s6-rc.be85015b4bf42b82451e6c451999682e347534153aeefb68438d46b8102f5da3
+#+fileset.824e16ae67c4278108fc62431e7e3eeeecde9a78e211dbb1510993f2a53be77c
+#+system-config.4f7ee13d9d8f89e946b1da865cc2faebd35a38ea86fc43ed3ec4eed95497751e
 
 
 # - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-src=/versions/system-config.59b75bbd1bda06730f96ed601c94b0db3ff3dd29da14a05101f1dfe3af1fccfd/config/s6-rc-source
+src=/versions/system-config.4f7ee13d9d8f89e946b1da865cc2faebd35a38ea86fc43ed3ec4eed95497751e/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.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+zsh.940fb164d1b08494f9050c2d0a703ca17b52aef114c5b743188afa6e0cc2535a
-#+pthbs-banginstall.385ee92921055459329c5747e278d9afcde737a2739d6b049c75d8c8e52dfe05
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+zsh.ee33e58971ec7f0fcbef113a52c386426b21d53d9fd11b3364fc3c01c3d23150
+#+pthbs-banginstall.36288015cc9c716da55767223cc33a3f8f31c46c14dbc223cf37ea59d25263d3
 #@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.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+zsh.940fb164d1b08494f9050c2d0a703ca17b52aef114c5b743188afa6e0cc2535a
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+zsh.ee33e58971ec7f0fcbef113a52c386426b21d53d9fd11b3364fc3c01c3d23150
 #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh
 
 
diff --git a/variants/root-x86_64/tinyssh b/variants/root-x86_64/tinyssh
@@ -1,45 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
 #@untar:-z:sha256:f3ae622c765db4e0d791ea90a9feba39d7f693ef9cb949a797f7ad6b404a2d61:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073-
\ No newline at end of file
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc+
\ 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.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+execline.02acbe14d5e97b9ae7bae85f02af414eecafa660af770c137bd2db3c1e9e55f8
-#+pthbs-banginstall.385ee92921055459329c5747e278d9afcde737a2739d6b049c75d8c8e52dfe05
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+execline.931baf79ba1e4d471d96c87209f1d6dd12e06b907a86677ed7c646407fc44f91
+#+pthbs-banginstall.36288015cc9c716da55767223cc33a3f8f31c46c14dbc223cf37ea59d25263d3
 #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env
 
 
diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment
@@ -1,93 +1,93 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-dosfstools.71bc76a0ed81f75f627cdad20afad3c043a742ac5b596f9fea7d346c70a121bb
-#+busybox-e2fsprogs.b0bdc0e6ab9e92ea85207b4725ed273f32ef9800890eb9c0aa966ebb1d6741fc
-#+busybox-iproute2.6ff8eea2f6058b3e00c3209144bb6a80c3b4914e446115b7014cf987f4d3ddc1
-#+busybox-iputils.78685d282f393c31b9fbcb7d7723543b2b9892f609411c646bec3c0f8d64c982
-#+busybox-net-misc.2aae98f296fd0d15269f1b6a72932dd0a0905b62dbd28be67f8cbb16ec798a16
-#+busybox-net-tools.d50ec3c3d82a9084545fcb1525947814f703fb7622882484b28e6e2c75cdaabb
-#+busybox-traceroute.8a295cff05cf57f9c4c32116fb9f216b50cd352a5d6d2ece31af95aacd9c01bc
-#+busybox-wget.941d8e621ef79b83cf954caacd4d36a558d0f89a1f7f5842db3c49ca66f2d401
-#+busybox-chpst.2e94bfa7a9d9469bb306f2e14172c3cbd7e3952058836bd771c2c96d01959555
-#+busybox-console.b358f2f28ef1fe7801a45bb277f49dad3b51a077619525cd6c2814d27d5d4135
-#+busybox-getty.53ec1d2582847d9e416abf924ef3d7d6000529a12d6a55a38dbd3b96e1cd0c20
-#+busybox-i2c-tools.75c0164ed1ef37ca9dce1fb2a43a43889e498a9dce07d823718f088056fc4617
-#+busybox-linux-extra.9c7d95eeaee4233fcdec59eeb11c8008a7b471c5d47bc476fc5341baef97e056
-#+busybox-mtd-utils.a81de2fc6ea4bd9be64976f3b363e5051bfac161e86ee34757d320e1eba64fb9
-#+busybox-shadow.48db62ed1844e2e2023d2d1701d26f3093c5950f630dda0cd9e3fead0ec62433
-#+busybox-su.c611b757a09501f3accbad8cfe5bb5e5d21a7f237ca06ab40f077f754914b082
-#+busybox-util-linux-priv.979ec553d01dbffd268ef6c5b3e32476d49f48047cb0946226ced57bf94268ba
-#+busybox-logging.8fc0e29eb774d0a0005f020849e6af96ff8607f1785cac4cc019c1e3c2368e7d
-#+busybox-cron.f1d58c9ff941fb7a40717c1b17b7accaca47a3e94eb95bbe26a75b48b9c2d007
-#+attr.ed3e525ee851c376301f5f83452406ff9d6541f5e13c1822fcc21c11e17ca4b0
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+diffutils.ac0e612291c45111f16c52fd2e291104c1a1ac367b666ed9061214162e301b84
-#+patch.7b9c4e1c303eebd9d10cdd03a98031cdaeb7c2dd6284993cce893a198370fc98
-#+flex.5713d65d97748b6cfc910831781c963c9e1218b05f57540206dba32dcd1d7f84
-#+bison.e31219f23ec5823e903483a03ccdc94e423e2fb48a67af9dd3dee74abccce1fe
-#+rsync.e306e1d227381c0191f961f8d427a6ee3bb03ff1651397894cc665955c747842
-#+execline.02acbe14d5e97b9ae7bae85f02af414eecafa660af770c137bd2db3c1e9e55f8
-#+s6.aa379bb33c5efeb8d7b4773f1a01131c91e8868516914c6b5f7eca15dcdca9b5
-#+s6-rc.696330547add10bffce9574b1d40d31d6322a7353b3cec21fc379b4793eaf02c
-#+s6-portable-utils.dc6132005629eaa08b67af34b8adba42a193ad3e056cab40470a1d33de5f4c64
-#+s6-linux-utils.e2c953bf26b378cf5633f192de4f011964af9fc7d287f8882e2ff897549a6c78
-#+s6-linux-init.8dc3f42e55efb671af3a6f8ecac3b7e2092c62b68648f900291d0bdf1d8e8205
-#+mdevd.6994a3bb1f8d77dc9beeedc060621e709c6383dea3d3b27772a45ba6a8376a54
-#+s6-dns.ac084844e2b646fec44ee51274e21dbddfadd46672f09084807b3a73f4ea2d2a
-#+libressl.bb138b71407428bdbaa535460d64b56c272b073487744b79a189033121a2fa5f
-#+s6-networking.dfc967b9b92873fc0028bf9dbafaa4d2d2af9fd7a7c226cacb936f87deacdca0
-#+zsh.940fb164d1b08494f9050c2d0a703ca17b52aef114c5b743188afa6e0cc2535a
-#+pthbs-banginstall.385ee92921055459329c5747e278d9afcde737a2739d6b049c75d8c8e52dfe05
-#+aat.3f965ca95e2659c4f819fc3aef112366e6fc7e0d3baf84cbfa6969c380cae808
-#+confz.6b8f67da9ef12cf858b8e3537c50d94576c88d8f9d3f4a976cfb8b2fa1b30fb9
-#+containers.335b3b7f78a24d768f414bbd6a4719a4ae326c998fb51dac251ee49cb5526b91
-#+fileset.d4fd5c0a028109c7f91690724f766dd42405f6d2abf4814a9526f5c116aca3e6
-#+logincaps.7c9f1a355b1e85c36fe8fde2cd2144c262e8f6ad7eb5ef104191609398665bcd
-#+snaprep.6c6b8428400f14dfff47f6784c01d85e15fc931ac0b88be538cd55186ede6149
-#+curl.0af20f1a4685bb3f765331dd9ad8bbec4e5dc700086b5efb7a242cb6a7b600ac
-#+git.688ee0647723b9aa256b609feb5158a2fba925adb88677e849b1390510fda6b6
-#+xbps.7c7e27304546bb8230b23c962e0cf4c9fe28859aee1f386104828f41b3d6d7f1
-#+apk-tools.cfef771674dd1221a4b4d7636dde002724db65c0598fc6a91498e0b5e2f71370
-#+getent.750f459c53befd09df4c0d2961873f124bcf5d6a0125b22a1ee6d45408db1a21
-#+getconf.cdf702f3ccd85f4383d235055f3e582f8a82dcd913ac99922c2997b962b0a578
-#+iconv.1aca6e4748b9ccf0880bb70f12d14834905146db12333d0974b46808e1d52adb
-#+libcap.f0a236db04827d73d84ee29f216723ee0aaddd6540b0f5f31864fdc5b890a177
-#+applyuidgid-caps.03ca171fe909745ae01f59b5148232e288cffea517d8fca3a285f98ed79e9ec0
-#+ccx-utils.00b6ee06b6f1a1104ca3e26bbf5a436efabc4ec3fd007e2e9650a07087e56e54
-#+user-env.37a0437e90ca2d43e3db54aa51e9b4588782fe9eeb9679779e94e7464f55baa6
-#+strace.f9187de5f494b54eb75c5ae50737236de09bc561b5ee950fe4ca29538ad724ae
-#+mlog.32695f0cd20543c4643622e8694125c4be21209905b76db9e392832d8e896efb
-#+findutils.2142059583b53f519cfb29a1f0213ebeb886831e1a52294c5b89b9268f3a2d7c
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+nvi.fa5e5fbb8fbfd2fd6605ab81a7cd8c4da2ff08443e34bd1d20c4b62955814a45
-#+squashfs-tools.98d86a4a71f2d9b7116962cf18343351bc071fec8dd27dae2657dccf8388e74b
-#+mandoc.48e8dacdc321aff1d4d7ed88617d41a73e4d1300b156af8383d71fbc112725e9
-#+tinyssh.fc1e24c89c55e30ab6318d1b9ed9bd8e73d4da9f6583c636c86b62f221108541-
\ No newline at end of file
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-dosfstools.bb76e2e4e59c77e74d9e2c266b754d13ac39eae7fd5253624c2bf36a00fc5b4b
+#+busybox-e2fsprogs.0c93cbcbc3b30cd119deb01ebc66000f5ea76f0e5389e1cedb4f09cd610a5f9f
+#+busybox-iproute2.32cd371493752a8781d107b84ec658e6513081e741b7b4d875cb36cc4ee41626
+#+busybox-iputils.ca5d7f38855fc2c30e38418c1fcea44fdd303830303964f9081616d1f89a4c1e
+#+busybox-net-misc.ba3e6053fdc4d949bd7ca03ff5c6881340516c9ab7430ec8064f284abe1b438b
+#+busybox-net-tools.89228f43d3a2db82a50dbf7a4794ec3845a50aedc560508dbc688c5428c90f75
+#+busybox-traceroute.65281d2051f2772efd303373f6df2580248163c9581850064284967b936c848f
+#+busybox-wget.94600d8031914b48747bbe47215b3502ce5b96b6a630ca687d99d9d3855ae514
+#+busybox-chpst.2166432deeba221223fe77449cfd006be27cd8c843b065408ee45622ee1836f8
+#+busybox-console.f81511b1c1fe8b84224b37d96f17bfa287d5ceaeb0a3774a6dcde0964f7fbe86
+#+busybox-getty.3b92b6dcf1f2ef9e42eedda2f4ba4d37822b79663f27dd34a89c7db50815b576
+#+busybox-i2c-tools.9c37efd9b5dbfb343fff869989d253783d6f6760d0c42b365fe07c0ecf9eb8f0
+#+busybox-linux-extra.4824b1a20af565f0330a77eea497984e1bc116f25f3dd2c04624c3264f65c8e8
+#+busybox-mtd-utils.3e612b2a5696c569d6ff5e5177a1493e9505c89bbc9e5f5f4f477ddaf69d869a
+#+busybox-shadow.5ffff209d39d2c486ececfcd19781d643048eaecdda9ef0825d05dd7ff8b230e
+#+busybox-su.efc07bf5aaeabd2813b7d81dc9d26177d95577fdd22f539ed410124b46ac33c7
+#+busybox-util-linux-priv.f91c6722d0cea27dd003e9e6f7a9fbd70a035bf56da58bf908fbafbb0b0abe98
+#+busybox-logging.577bdef100ed53f33650e97b77a281a33742d7aedbc01a90d1705378e89ce27e
+#+busybox-cron.550fb7656af835f36463a67046f264b6cb225d34e17196108ae38991db81be3f
+#+attr.bb15046e2552e647ee6a77fe4430a663cab6a31d06afe5a01c1235cd8b90cde8
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+diffutils.61a843cd41f96387bfab2cd85021b04474dc079cfa4913ed4f0c4e22e2423c78
+#+patch.938ec0e5bec811c233bf8169955722f2d649291cfcd4bbd51505d5a8a01a02c3
+#+flex.5380b424ecae363df5aad941b61d38d9dc5b9c6edc32611bbd1da8830203a220
+#+bison.4a49fc6e493a36712e2f4a890e584fe7b1df4b9c7224ac5346b46dd4c2ea0d93
+#+rsync.b3ef71cec80999c1bf120b20fc539e965c65a39d5cb2e483f344e7a8de974e2d
+#+execline.931baf79ba1e4d471d96c87209f1d6dd12e06b907a86677ed7c646407fc44f91
+#+s6.b8ee6272cc50fbd1f413b539cb0a149258a5b8fdd90c3136f55356334d79ffa5
+#+s6-rc.be85015b4bf42b82451e6c451999682e347534153aeefb68438d46b8102f5da3
+#+s6-portable-utils.36126ef3d67a3d1fef864c401d15c1c9e7d5bee1fe25118991f836233eacc2c0
+#+s6-linux-utils.9111f50b5749c31ff8576b664e3c2182f50c5a282ac65def5c1172516f793468
+#+s6-linux-init.6b33c37028163a0e514c1cda61acf127102e184efa23465765b0f3233031c689
+#+mdevd.ead9a47ae83c2cff99002456d454c8623deedd43084266ace85360f1e35d4223
+#+s6-dns.2249a941b110f6a3d691cead4787ba251f2c08df5316ea202ecbd30adeb58837
+#+libressl.1de2bbcf63a2e25dfc53f2ec10bce4b4c76305694cde2848c482a06f9cae58db
+#+s6-networking.a0feb271d8691df131aa6c112209abd9bfcc9537eb27f4da38ed41a6af28b9af
+#+zsh.ee33e58971ec7f0fcbef113a52c386426b21d53d9fd11b3364fc3c01c3d23150
+#+pthbs-banginstall.36288015cc9c716da55767223cc33a3f8f31c46c14dbc223cf37ea59d25263d3
+#+aat.60749f0c5fd088ecc667b0db36cfba83130c4546e4ab8c6bf010d8ee7d772f9e
+#+confz.07ac34dd17f105ef70f14fdeab05d6d9e5e90e22739090762556044e2a320235
+#+containers.e67fc04cd44f693494bdb72cb7e9d4ec195f0b09f1c8ef16fea64db296da085f
+#+fileset.824e16ae67c4278108fc62431e7e3eeeecde9a78e211dbb1510993f2a53be77c
+#+logincaps.fba94255e77cb3dd50a7f390c8abe999bec75baa75646df64a29218709bc5382
+#+snaprep.b898d4a8409635992d45c91efbb2d441e63677636f99c437ccddf31db5c06fe9
+#+curl.b450477c75a16d6ce85090270fe5b788fa2abacc85a18c5c23918ab33f0f8acb
+#+git.2cc2435ad58455dc617c8f4dd75ef36bd99a7e0314da7f4d4b4aa59036ac513a
+#+xbps.c296c18b8d65685acd77b3a55e5087148cddf11ccc82b4c2a292adcb36bc58da
+#+apk-tools.309e64608d42767229d26caa8e7f9b4e6d07edf9911ba7eb657f045d4d9733f8
+#+getent.43690362bd3e2e2db8ddf93a4b86432e487e6e427bca4fecd6cb283a54cf0890
+#+getconf.454343aa919ab414e6686dc0a264b529d00efe88fc72b7146d4c7902758d6012
+#+iconv.45e1c108910e13f87263b680ca477fe50e5cc34969eefa5457fb3173fa197820
+#+libcap.0b7bf4a1ceae78011eebade98d279b5740ea41d7b3bfb4487c57299ea173d6ac
+#+applyuidgid-caps.4a02e3df334cde9fbc0a08224c60c1f1cea899574eeddedc372a14c31681d3d7
+#+ccx-utils.0295a796ae6b996801942e410346743efa0420cffa1c802b36146b6f3e64afca
+#+user-env.1212e5c2630ac92d48507fffa3908a820522c0473d0f865b62e36ac823bf4efe
+#+strace.4a4a7b04820ac5645bc20d52e8ea2ab654a920205701c969739192631ac38dbf
+#+mlog.1eefecd0fbafb09725b30b5c8d762c6e9e337037a015bd52f9bf7f68cb539ed5
+#+findutils.148657b9e3199a5e7edf2742184f8bdb96f8eaee4b8d857f23d0dcb74882a929
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+nvi.986e12ea2acbff99baa7b2aa76ce90e7c6e0a5833f6a327b522c97ab29d0a4ed
+#+squashfs-tools.d49e72ac14c495446f5d3bc94d1d5efa973e7029ad4db324b9ae79626e5f8e4c
+#+mandoc.a6e8294a3316c241e413f429586909ae2b32ea195c6ded7179841cde982a00d3
+#+tinyssh.a90d8635256bbca902bf668cd25ca0ff0d87852146d2996b68de0d95c9309e61+
\ 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.31d67c981e86afb9613bcbf07a8a6f0224bc6d0184a0153188ecf835972cf705-
\ No newline at end of file
+#+linux-qemu-guest.d696a5b96b5c21989071efc035e6d09e2f1b6e22e8c5b15797d4982a4edc9a93+
\ No newline at end of file
diff --git a/variants/root-x86_64/xbps b/variants/root-x86_64/xbps
@@ -1,47 +1,47 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+libarchive.2ccded633a7e03d11c9ce3300cbd029c8a9c777a5105cc805ed7b5a4a81708fd
-#+libressl.bb138b71407428bdbaa535460d64b56c272b073487744b79a189033121a2fa5f
-#+pkgconf-pkg-config.bad1bdc30add7fe2e1a5558c68fb5fc463836feb1e941a11314b7d2f598fdbb1
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+libarchive.b71d040353e37d2d99481682a207a8ace1bb9bcc999601bf156709c27b460799
+#+libressl.1de2bbcf63a2e25dfc53f2ec10bce4b4c76305694cde2848c482a06f9cae58db
+#+pkgconf-pkg-config.f61cd4ef48da754d83ca0eb39c26316cd0e9f8e0f59ba8f33fd02d77239b592b
 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,40 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+m4.a61864a21512ed75ea7bcd752e8600e5392ae095487060f27ffeda895bf1330c
-#+netbsd-curses.f8706b52558480879327ddaa9b574e502abadaabded1dda2f4fa8669bb403fe2
-#+libbsd.bbf493796657cbb348c50434e134638ccbd80b87ae62361f7f8fe54a283e76ee
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+m4.915d4de6f7fcffd54583accd119a9e43494fecba0d87d1c52763cb8f91c08544
+#+netbsd-curses.0ddc12a4770dc087180255befcd2785d4d42345d9ab086982a9763bcb50bbd0d
+#+libbsd.26edbb02537a90a11ec4411273ece84e17ae6a7e57678e243948441178faf5d6
 #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config
 #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:.
 
@@ -65,8 +65,8 @@ autotools_config_static() {
 }
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	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,45 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.465e961835c64103b81da3b73210c49b9b377b1165340e9cd48b716a866bed5e
-#+busybox-bzip2.63787c3c78ff8caf77f07a70e9ec19295ecaa15d3a5cf1cd8c65b86d08c448b1
-#+busybox-gzip.460315f1f88fdbcd70fd599edaff757d783ec26e8efc155c7640f4483971e6cf
-#+busybox-lzop.9adc7bf39d1ec9fa6081660763c2e9023c2d20217345ca5f5b13f784ea33c548
-#+busybox-unzip.1522333d4c49ae981b2f22ba0ec4dff86f0959fa3f3d4f60851329ce800b0d7d
-#+busybox-xz.153fd681d2909274c3c13d14ca6b01287c405bea78ab4e8a6f38c01ebf149687
-#+busybox-cpio.b116c9ab700e0d1222fa95665f45e12c37afcfc357d7c84b2f3b1e5a5eb25555
-#+busybox-dpkg.bc90352ff75f0a199184b98369598d2f921fb1334fa70c617b8a4438d3fc368a
-#+busybox-rpm.e6131f495ed4e9d52c48dda5aa8c0f94f087a9bc2ce9cf3a41db95efb734b1cc
-#+busybox-tar.f52b211adac5aa990280fda71d4c5747b2b26a12665e43a9862cbaf898f508ac
-#+busybox-ed.d7e782bc35dc492b3dc1d5d79b9fb927eeda16db3b9445817842b83859ea40d4
-#+busybox-sed.ec815f9549d1b78af655e2c859a67ff73482abe4db3455ca731ef28d8cac0b4f
-#+busybox-vi.3f86f6c9d9966c50a7be8c1519a9f596ea618e1fa139a57663b38237aae8ff3c
-#+busybox-xxd.e745e0eed647a4b71e7b0d4fa5a2c3840cd4eb65a561bd9f436bfd3506440dce
-#+busybox-process-extra.8ada8c0a82cc647d302d9ef0141c9941bcf584d3f92992bd644364c662d93b68
-#+busybox-procps.0106ef4e5a606076500ae96e126012ecc337855b13fb2c8668bf3f4ec5514303
-#+busybox-psmisc.b6d47b4493bc6f18376d08b71ac5412abed080add7f2bd529eaf576ba8813c17
-#+busybox-ash.d4b9e78555db12320b2bcf4613c03ff54313c83726eae69a987b188c54ea5624
-#+busybox-bc.9e8654326ffd26794545fc116e03e28bf35a1e5959b6d252007b03ca2ce3ad9c
-#+busybox-coreutils.1ea713a2b5e12ea3974fe1982df36046508d0c9f7fe539204e93f6264c397b75
-#+busybox-coreutils-extra.20e82e894afdf6a7a9a4b97be61e14190542a5dc33d81cac3feed237bfb2eabe
-#+busybox-daemontools.7a0e7bce63489ec116bcd5e2014d4f1d5c3290c1157157fc30b2eafedb6e856c
-#+busybox-grep.fdc0267ac6b9cf82acc4d62be6ad2d26946257e4bdb6c3f376162ac51f7e871c
-#+busybox-misc.60758ab56f7d1c6fb7747df23fa8e8621c9b32e911d5468cd68405964d8ab1b4
-#+busybox-sh.46ef3470396032d8bac02cdefc1a5da13b1cd7a71750da3f5b9a9e083eb298e4
-#+busybox-util-linux-unpriv.ab0ad886bbe7400cc9c3a8b68bc52f35fc59c91f0720d9ac87a39808876bbe1f
-#+busybox-findutils.96c1f6e96aac8a44bd279a7ac3b11973704d1d02e081f384ff67683c674a2f3d
-#+nawk.586739f9d09a60aaaac45f23b0f48f1da5722b3326dcc7e9d5a42ec3b4ba791a
-#+musl.2bc843f10a8989d3e9d3f4352171d455a57a59f1ce56484faa37b9464d95abd8
-#+gcc.4584606b84ccb2f919deedf653333cf555f9658e5270fa68f84fcd5071d96ad4
-#+binutils.a1ecb0f4c04fabe8b48a5a60ae7a8b52c305b1cc94e6aa9ea465ee3dcc72c073
-#+gnu-make.622b1b4045229c75d91a9779ae31e8aa656f9799f8755c63e370186edc707df8
-#+busybox-diffutils.1117f3df3320fb22f09ba8cdbcce39c6b508ce39030beaba137ea50c6c6bb2c2
+#+busybox.c9b8edb281d9193c2a8bf63cf207db0a9d197a05b6892f4b461e5e1bfe232188
+#+busybox-bzip2.3454673372c3ab7e00dde1ed5f527cc1db87f5722d5658cadfce5ff1431be12b
+#+busybox-gzip.5fcdf366f5606cee1d67a624547c19076fb408487ad41dbda9ddb424270d1686
+#+busybox-lzop.686dff79faeccc7dd30b37996f1769a0d8aa47973b492e7fccf8303312c73043
+#+busybox-unzip.6e08aa85c6138d0edf7e6a2682b52fe0ae8822c2790da8129bf4a22bb991ea90
+#+busybox-xz.0c493ddb5bf3e944465fca6e39aa247af99187f83e6f2612d40ae9af0ad2c8a2
+#+busybox-cpio.befbbf5cef7b85100b352930d5690ace296d6ddf2fa63862782031e3900201b7
+#+busybox-dpkg.ab81e2d4239ea65a19f41d1dd1ec1ea4788af0d1d6a34b0aa7416aa98ab508c5
+#+busybox-rpm.892d03b6864d76c8e6375f5b42c973217865cad46567f78632df0136243b8e25
+#+busybox-tar.e03d68cf2ed3c40d4872a63584c4075d477f6e10759e3b598f321edb48f37b90
+#+busybox-ed.f4d6135fab7c04318364dc7a4210a108d1b1c2deea88428c87ae1ecf4e55c37f
+#+busybox-sed.a4bf86b4a5b719fa27a62d50b9cd919bef8933567cf93b3c05944e74bd857a98
+#+busybox-vi.bc1c6744741039d7be717eecc37d56538db3dc6d3cfbe838c179ecb2f22001fe
+#+busybox-xxd.7a1e51017e9969adb385aa21354b8af6faa525be2c4763c5991c60b304997c94
+#+busybox-process-extra.59d2515c64a2daf15f03b3cae33bbdf2c76ed6117ba34adb6e13d947c5431994
+#+busybox-procps.8fd6bda80e6cce8299502681ae309b0e1d27c110c682814bcd67ecd11ee75dfa
+#+busybox-psmisc.8fe56d98e9c6a78912786c072caa3227ab533eba0446d621c66e1a5aafd6da64
+#+busybox-ash.216752e93cb06bb1c4b9ce36652d2dfdf093c66a72e8bce0bceb6522db1ca82e
+#+busybox-bc.07344af96ec24d682447b17dafca0ea780fada87e2e05313ea6a93e751ff4d54
+#+busybox-coreutils.cb45a19dfef237d939365a30c1e906b810eeafe84115c615837cb3a2d56f4529
+#+busybox-coreutils-extra.d242fdc3781e929789bcb94092d1450a8028678d7ace21ebe53dde13f678ac27
+#+busybox-daemontools.ad0f374c2fa741165cb62e3d9274ce2abd73901db74cca46651798c638487b11
+#+busybox-grep.34e2c6537d0760278f23656a7acdbbcb5fc10fbe7c8bdfe0ab6f65e3895f9d59
+#+busybox-misc.d75663af2648d78ef983905fc886cd1368dc7417c925b9b978ea26511a6d698b
+#+busybox-sh.2b7996fde8e16f3124a240ba3acceb137a38c9bda95f4fadc267d4306046c760
+#+busybox-util-linux-unpriv.42b7a736537cd0105492e02aa23ec56cd781a4889859cfd56657c9d8e0504e57
+#+busybox-findutils.e1e450fa133b21ed06d1581236e193c877cc470dc2c265bad71e8e1e96552776
+#+nawk.5ecdd701eb6a3283e826e4292084011288cadc314947f81683adbd8f729f33f0
+#+musl.3eb2023ea9b5804aafaeb97df1a6e9681b560d18df18f08bc52502ee8ad50fa0
+#+gcc.9a2d986a202c4e227942c62b9e133791966af6b6f575fe95309f85b07012b4d4
+#+binutils.bfc97adfc3d6353023ff0744a5f2c3a9326bae8b5e9f8ee41a6fcc86d70b14cc
+#+gnu-make.89a43a4d633767c53d988a77cadc0ebf0fad65cc05bf309fef3b7d76c7b56ca2
+#+busybox-diffutils.ea02bad345f67ec3d4a79a8d1a6f92e1725c07ce8b0673d62df348824e13c4e8
 #@untar:-z:sha256:98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1:.
 
 
 # - build script start -
 
 build_env_static() {
-	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
-	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
+	export CFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${pthbs_workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"