mrrl

commit 63e3c147d0f6a9f6a937f24965594602f93c3d94
parent d9471fef56f85db48dc3724ce21a884bc4eb9c0e
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Sat,  6 Dec 2025 16:44:36 +0000

bootstrap

Diffstat:
M
templates/functions/build_env_dynamic
 | 
2
++
M
templates/functions/build_env_static
 | 
2
++
M
templates/pkg/gcc
 | 
6
+++---
M
templates/pkg/musl-cross-make:bootstrap-1
 | 
2
+-
M
variants/ccx-x86_64/aat
 | 
60
++++++++++++++++++++++++++++++------------------------------
M
variants/ccx-x86_64/abduco
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/alpine-keys
 | 
56
++++++++++++++++++++++++++++----------------------------
M
variants/ccx-x86_64/apk-tools
 | 
76
+++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/applyuidgid-caps
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/argp-standalone
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/attr
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/binutils
 | 
12
+++++++-----
M
variants/ccx-x86_64/bison
 | 
72
+++++++++++++++++++++++++++++++++++++-----------------------------------
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
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/certdata2pem
 | 
64
+++++++++++++++++++++++++++++++++-------------------------------
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
 | 
72
+++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/default.environment
 | 
198
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/ccx-x86_64/diffutils
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/dune
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/easyseccomp
 | 
82
++++++++++++++++++++++++++++++++++++++++---------------------------------------
M
variants/ccx-x86_64/error-standalone
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
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
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/flex
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/gcc
 | 
28
+++++++++++++++-------------
M
variants/ccx-x86_64/getconf
 | 
64
+++++++++++++++++++++++++++++++++-------------------------------
M
variants/ccx-x86_64/getent
 | 
64
+++++++++++++++++++++++++++++++++-------------------------------
M
variants/ccx-x86_64/git
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/gmp
 | 
12
+++++++-----
M
variants/ccx-x86_64/gnu-make
 | 
14
++++++++------
M
variants/ccx-x86_64/gnu-make:bootstrap
 | 
6
+++---
M
variants/ccx-x86_64/gnu-make:old
 | 
8
++++----
M
variants/ccx-x86_64/gnu-make:oldbootstrap
 | 
4
++--
M
variants/ccx-x86_64/gperf
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/iconv
 | 
64
+++++++++++++++++++++++++++++++++-------------------------------
M
variants/ccx-x86_64/kbd
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/kernel.environment
 | 
6
+++---
M
variants/ccx-x86_64/libarchive
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/libbsd
 | 
72
+++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/libcap
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/libcap:bootstrap
 | 
8
++++----
M
variants/ccx-x86_64/libcgroup
 | 
76
+++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/libelf
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/libmd
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/libressl
 | 
74
++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/libseccomp
 | 
74
++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/libunwind
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/linux
 | 
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
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/m4:bootstrap
 | 
10
++++++----
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
 | 
66
++++++++++++++++++++++++++++++++++--------------------------------
M
variants/ccx-x86_64/mpc
 | 
16
+++++++++-------
M
variants/ccx-x86_64/mpfr
 | 
14
++++++++------
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
 | 
4
++--
M
variants/ccx-x86_64/musl-cross-make:old
 | 
8
++++----
M
variants/ccx-x86_64/musl-cross-make:oldbootstrap-1
 | 
2
+-
M
variants/ccx-x86_64/musl-fts
 | 
66
++++++++++++++++++++++++++++++++++--------------------------------
M
variants/ccx-x86_64/nawk
 | 
66
+++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/nawk:bootstrap
 | 
2
++
M
variants/ccx-x86_64/netbsd-curses
 | 
64
++++++++++++++++++++++++++++++++--------------------------------
M
variants/ccx-x86_64/nvi
 | 
72
+++++++++++++++++++++++++++++++++++++-----------------------------------
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
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
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
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/pkgconf
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/pkgconf-pkg-config
 | 
54
+++++++++++++++++++++++++++---------------------------
M
variants/ccx-x86_64/popt
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/pthbs-banginstall
 | 
58
+++++++++++++++++++++++++++++-----------------------------
M
variants/ccx-x86_64/pthbs-sandbox-rootns
 | 
10
+++++-----
M
variants/ccx-x86_64/rsync
 | 
76
+++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/s6
 | 
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
 | 
12
+++++++-----
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
 | 
72
+++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/strace
 | 
74
++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/system-config
 | 
130
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/ccx-x86_64/system-config-init
 | 
108
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/ccx-x86_64/system-config-rc
 | 
66
+++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/system-config-scripts
 | 
60
++++++++++++++++++++++++++++++------------------------------
M
variants/ccx-x86_64/system-config-zsh
 | 
58
+++++++++++++++++++++++++++++-----------------------------
M
variants/ccx-x86_64/tinyssh
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/toolchain.environment
 | 
8
++++----
M
variants/ccx-x86_64/user-env
 | 
60
++++++++++++++++++++++++++++++------------------------------
M
variants/ccx-x86_64/userspace.environment
 | 
186
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/ccx-x86_64/vm.environment
 | 
4
++--
M
variants/ccx-x86_64/xbps
 | 
72
+++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/zsh
 | 
74
++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/zstd
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/aat
 | 
60
++++++++++++++++++++++++++++++------------------------------
M
variants/root-x86_64/abduco
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/alpine-keys
 | 
56
++++++++++++++++++++++++++++----------------------------
M
variants/root-x86_64/apk-tools
 | 
76
+++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/applyuidgid-caps
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/argp-standalone
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/attr
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/binutils
 | 
12
+++++++-----
M
variants/root-x86_64/bison
 | 
72
+++++++++++++++++++++++++++++++++++++-----------------------------------
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
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/certdata2pem
 | 
64
+++++++++++++++++++++++++++++++++-------------------------------
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
 | 
72
+++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/default.environment
 | 
198
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/root-x86_64/diffutils
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/dune
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/easyseccomp
 | 
82
++++++++++++++++++++++++++++++++++++++++---------------------------------------
M
variants/root-x86_64/error-standalone
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
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
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/flex
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/gcc
 | 
28
+++++++++++++++-------------
M
variants/root-x86_64/getconf
 | 
64
+++++++++++++++++++++++++++++++++-------------------------------
M
variants/root-x86_64/getent
 | 
64
+++++++++++++++++++++++++++++++++-------------------------------
M
variants/root-x86_64/git
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/gmp
 | 
12
+++++++-----
M
variants/root-x86_64/gnu-make
 | 
14
++++++++------
M
variants/root-x86_64/gnu-make:bootstrap
 | 
6
+++---
M
variants/root-x86_64/gnu-make:old
 | 
8
++++----
M
variants/root-x86_64/gnu-make:oldbootstrap
 | 
4
++--
M
variants/root-x86_64/gperf
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/iconv
 | 
64
+++++++++++++++++++++++++++++++++-------------------------------
M
variants/root-x86_64/kbd
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/libarchive
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/libbsd
 | 
72
+++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/libcap
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/libcap:bootstrap
 | 
8
++++----
M
variants/root-x86_64/libcgroup
 | 
76
+++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/libelf
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/libmd
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/libressl
 | 
74
++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/libseccomp
 | 
74
++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/libunwind
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/linux-qemu-guest
 | 
82
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/root-x86_64/lnstools:bootstrap
 | 
14
+++++++-------
M
variants/root-x86_64/logincaps
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/m4
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/m4:bootstrap
 | 
10
++++++----
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
 | 
66
++++++++++++++++++++++++++++++++++--------------------------------
M
variants/root-x86_64/mpc
 | 
16
+++++++++-------
M
variants/root-x86_64/mpfr
 | 
14
++++++++------
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
 | 
4
++--
M
variants/root-x86_64/musl-cross-make:old
 | 
8
++++----
M
variants/root-x86_64/musl-cross-make:oldbootstrap-1
 | 
2
+-
M
variants/root-x86_64/musl-fts
 | 
66
++++++++++++++++++++++++++++++++++--------------------------------
M
variants/root-x86_64/nawk
 | 
66
+++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/nawk:bootstrap
 | 
2
++
M
variants/root-x86_64/netbsd-curses
 | 
64
++++++++++++++++++++++++++++++++--------------------------------
M
variants/root-x86_64/nvi
 | 
72
+++++++++++++++++++++++++++++++++++++-----------------------------------
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
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
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
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/pkgconf
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/pkgconf-pkg-config
 | 
54
+++++++++++++++++++++++++++---------------------------
M
variants/root-x86_64/popt
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/pthbs-banginstall
 | 
58
+++++++++++++++++++++++++++++-----------------------------
M
variants/root-x86_64/pthbs-sandbox-rootns
 | 
10
+++++-----
M
variants/root-x86_64/rsync
 | 
76
+++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/s6
 | 
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
 | 
12
+++++++-----
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
 | 
72
+++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/strace
 | 
74
++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/system-config
 | 
130
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/root-x86_64/system-config-init
 | 
108
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/root-x86_64/system-config-rc
 | 
66
+++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/system-config-scripts
 | 
60
++++++++++++++++++++++++++++++------------------------------
M
variants/root-x86_64/system-config-zsh
 | 
58
+++++++++++++++++++++++++++++-----------------------------
M
variants/root-x86_64/tinyssh
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/toolchain.environment
 | 
8
++++----
M
variants/root-x86_64/user-env
 | 
60
++++++++++++++++++++++++++++++------------------------------
M
variants/root-x86_64/userspace.environment
 | 
186
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/root-x86_64/vm.environment
 | 
4
++--
M
variants/root-x86_64/xbps
 | 
72
+++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/zsh
 | 
74
++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/zstd
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------

381 files changed, 8358 insertions(+), 8150 deletions(-)
diff --git a/templates/functions/build_env_dynamic b/templates/functions/build_env_dynamic
@@ -1,4 +1,6 @@
 build_env_dynamic() {
+	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/{{dynlibdir}}"
 	export CPATH="$pthbs_build_environment/{{includedir}}"
 	export LDFLAGS="-L$pthbs_build_environment/{{dynlibdir}} $LDFLAGS"
diff --git a/templates/functions/build_env_static b/templates/functions/build_env_static
@@ -1,4 +1,6 @@
 build_env_static() {
+	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${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/templates/pkg/gcc b/templates/pkg/gcc
@@ -28,9 +28,9 @@ mcm_bin=$mcm/bin/{{triplet}}
 musl={{versions}}/musl.{{pkg_sha256("musl")}}
 build_env_static
 
-sysroot="$(realpath ..)/sysroot"
-objdir="$(realpath ..)/objdir"
-installdir="$(realpath ..)/install"
+sysroot="${workdir}/sysroot"
+objdir="${workdir}/objdir"
+installdir="${workdir}/install"
 src="$(realpath .)"
 
 with_make_vars() {
diff --git a/templates/pkg/musl-cross-make:bootstrap-1 b/templates/pkg/musl-cross-make:bootstrap-1
@@ -24,7 +24,7 @@ bootstrap={{versions}}/musl-cross-make.{{pkg_sha256("musl-cross-make:bootstrap-0
 {{ super() }}
 printf '%s\n' >>config.mak \
 	"bbin=$bootstrap/bin" \
-	"repro=-ffile-prefix-map=$(realpath ..)=builddir" '
+	"repro=-ffile-prefix-map=${workdir}=builddir" '
 LINUX_VER={{linux_ver}}
 st=-static --static
 fl=-g0 -O2 ${st} ${repro}
diff --git a/variants/ccx-x86_64/aat b/variants/ccx-x86_64/aat
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+zsh.18c555bf0c5f5c5f5b9f9b2a6c41598f3263a98486fd8dc6093cd0249d760ba2
-#+pthbs-banginstall.20e5ac5777e73f3e8d828b781725ef0817c49b2edf7ef99bd809080ff9b53e0b
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+zsh.057868ea48812b41739c94bc6a0f8da6ed951681a62ea6ce2d4a23a783d06ce9
+#+pthbs-banginstall.84944d58ad6aae47612623ded72158b3d3e274ff012dd88db303686b6f364365
 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat
 
 
diff --git a/variants/ccx-x86_64/abduco b/variants/ccx-x86_64/abduco
@@ -1,43 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
 #@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 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
 #@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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+patch.ae7492228d69152bfaa0183750edd3cc0a74226ff2436a39e1718547035eab5d
-#+libressl.f56a6b4d6e3a363e5166c16cd200ac8827222ca834d3a0f101d2abeaf653548f
-#+zstd.b9ffad24deb43d62222ff3e100c4059c2e695157111c958628cee0ef931c1791
-#+pkgconf-pkg-config.c1a9f7d82167c9bb3e81e02aecb1e70e008eba1baeeac105b295fe118cab1fdd
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+patch.5557660270847d7de668356fc2dea208575218d87f439624d6b1db9030e60dac
+#+libressl.0a80f4ef368cf90a5fed4e1b2e9e327b6e2335d9bb1e56bdc4d242ec89c5ea18
+#+zstd.710b62ae5807615b4b2b81554d87f293ef95fe4842858d0a22121bef6d29ce14
+#+pkgconf-pkg-config.652821c31e2ebaa4f95a1a83f2dea31a62ff60bfc77590543198d2ed37115be1
 #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch
 #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools
 
@@ -43,6 +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 LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
diff --git a/variants/ccx-x86_64/applyuidgid-caps b/variants/ccx-x86_64/applyuidgid-caps
@@ -1,43 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+skalibs.45b697b31beb1f3b2d4c5fd78216d30ae31190e869f7f8745980fb502302cc6c
-#+libcap.86979187f7be609cea36203949e4d143b93c5a5b449ca19400c651ae306dde43
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+skalibs.f3f639ae58dbc34c732bcd02b9791c5a3f0272c59e7605f8f16595b3116df208
+#+libcap.7e952925a0f701d005130f2a8cf7146e9d66249a9862aba077577177ea4caaa2
 #@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 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+m4.b38ed60ffea1a09d5f57a79eab2fc576b64f38c5e871bf1395b64829322d2709
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+m4.3e1bd43513a03b656cff43101e0084ea4d21508d79c8e1d85d711455314508c7
 #@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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+m4.b38ed60ffea1a09d5f57a79eab2fc576b64f38c5e871bf1395b64829322d2709
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+m4.3e1bd43513a03b656cff43101e0084ea4d21508d79c8e1d85d711455314508c7
 #@untar:-z:sha256:39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87:.
 
 
@@ -62,6 +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 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.34634128d8e3c128d962de9027a8246e908c6852a54ba46075a3be0639b1d0e8
-#+gnu-make.aec55aaebe092e32a5684107e717636469632e626abd9ccde8ee014b6b9f3528
-#+busybox.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+m4.e492b2846bbfb7a5a69e55d67054a6298da3ad7444fdacffd97a048480717b02
-#+nawk.333d5fb08091dff9b4012b7ff3c846c07579fe04ee66aa65eeb8dda7e9caabc0
+#+musl-cross-make.363da45526527aac5f37d0770fa78e454d0a7664f3c1042e9bdd14680d67b79e
+#+gnu-make.7e359c54f7829391a5095ac8c288230eb9bc5feb032b4ab41b3ae34e259a80a6
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+m4.257f1534f2ce0186257279c3dbf9790f9ae6e3a48e8bc139b16aa129fbac5240
+#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
 #@sha256:a119e7e50cae23feaad160a533d69a90073a519521924da56abc74724cec65c6:merged.patch
 #@untar:-z:sha256:0cdd76777a0dfd3dd3a63f215f030208ddb91c2361d2bcc02acec0f1c16b6a2e:.
 
@@ -34,6 +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 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.333d5fb08091dff9b4012b7ff3c846c07579fe04ee66aa65eeb8dda7e9caabc0
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+m4.b38ed60ffea1a09d5f57a79eab2fc576b64f38c5e871bf1395b64829322d2709
-#+flex.37e656a6152b2bf1f6ad605702ab066d52d2fad0ef579ea8f1ed41921045bb8d
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+m4.3e1bd43513a03b656cff43101e0084ea4d21508d79c8e1d85d711455314508c7
+#+flex.876444ede8e785cda0d73fe830a2704b02a4e1d854481e59ffdffbe169a98840
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 
@@ -64,6 +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 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+gnu-make.aec55aaebe092e32a5684107e717636469632e626abd9ccde8ee014b6b9f3528
-#+musl-cross-make.34634128d8e3c128d962de9027a8246e908c6852a54ba46075a3be0639b1d0e8-
\ No newline at end of file
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+gnu-make.7e359c54f7829391a5095ac8c288230eb9bc5feb032b4ab41b3ae34e259a80a6
+#+musl-cross-make.363da45526527aac5f37d0770fa78e454d0a7664f3c1042e9bdd14680d67b79e+
\ 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.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.aec55aaebe092e32a5684107e717636469632e626abd9ccde8ee014b6b9f3528
-#+busybox.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.7e359c54f7829391a5095ac8c288230eb9bc5feb032b4ab41b3ae34e259a80a6
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
 #@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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
 
 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.34634128d8e3c128d962de9027a8246e908c6852a54ba46075a3be0639b1d0e8
-#+gnu-make.aec55aaebe092e32a5684107e717636469632e626abd9ccde8ee014b6b9f3528
-#+nawk.333d5fb08091dff9b4012b7ff3c846c07579fe04ee66aa65eeb8dda7e9caabc0
+#+musl-cross-make.363da45526527aac5f37d0770fa78e454d0a7664f3c1042e9bdd14680d67b79e
+#+gnu-make.7e359c54f7829391a5095ac8c288230eb9bc5feb032b4ab41b3ae34e259a80a6
+#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
 #@git:8d7ae80eda7e08ee361f8793683ae58216caf720:busybox
 #@sha256:13ed92216aef70e6fc431b2e66a9b20a71b5f4b69a3d7a84acbc4d1210d6ea6a:busybox/.config
 
 PATH="$pthbs_build_environment/command:$PATH"
-mcm=/home/ccx/versions/musl-cross-make.34634128d8e3c128d962de9027a8246e908c6852a54ba46075a3be0639b1d0e8
-make=/home/ccx/versions/gnu-make.aec55aaebe092e32a5684107e717636469632e626abd9ccde8ee014b6b9f3528
+mcm=/home/ccx/versions/musl-cross-make.363da45526527aac5f37d0770fa78e454d0a7664f3c1042e9bdd14680d67b79e
+make=/home/ccx/versions/gnu-make.7e359c54f7829391a5095ac8c288230eb9bc5feb032b4ab41b3ae34e259a80a6
 
 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.d6ec83b71192b572b754ee2c9e4d4b335b0e06779ade4a2882f822f6f1320893
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
+#+linux-qemu-guest.b390fb55ca8c468d1ec7d010f9aa7a66903ab2b72ca7c51ef0ca652957e74a23
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
 #@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.d6ec83b71192b572b754ee2c9e4d4b335b0e06779ade4a2882f822f6f1320893"
+CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux-qemu-guest.b390fb55ca8c468d1ec7d010f9aa7a66903ab2b72ca7c51ef0ca652957e74a23"
 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.73ec27e1b55df8f7cd25d2de5d1a41bfdfaf0a0d27dabc32e5a1d777da12595a
-#+gnu-make.afdc243f050ed6c15aac1d4a9bfc090c15f0535514894841379b590617e28001
-#+busybox.657e98b7dd88d5f7caa5ee8303e52ad8649a9da3f5e8db31c7c20bc5d1ea90f9
-#+nawk.333d5fb08091dff9b4012b7ff3c846c07579fe04ee66aa65eeb8dda7e9caabc0
+#+musl-cross-make.3e9a10d515ab8608f8eda7125d1b223da285a62e85a87a56be316a539821605c
+#+gnu-make.aa211b51bd7f8182794c40f039947bdf19ade8460ebfc071f9f33e6fb91a968e
+#+busybox.5792386228c725ccfeffe301dd3918f307e1f4d1391f7bdef45910089bdea8cc
+#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
 #@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.84898b757dbaac4798cdf42674f90ac2c88ba1d5d44d4978267ca33cdecbedcf
-#+gnu-make.afdc243f050ed6c15aac1d4a9bfc090c15f0535514894841379b590617e28001
+#+musl-cross-make.e4db999a4586836d858df99d45eee1aaa59d4fed1a5fa24f0365db08cddb59de
+#+gnu-make.aa211b51bd7f8182794c40f039947bdf19ade8460ebfc071f9f33e6fb91a968e
 #@git:8d7ae80eda7e08ee361f8793683ae58216caf720:busybox
 #@sha256:13ed92216aef70e6fc431b2e66a9b20a71b5f4b69a3d7a84acbc4d1210d6ea6a:busybox/.config
 
-mcm=/home/ccx/versions/musl-cross-make.84898b757dbaac4798cdf42674f90ac2c88ba1d5d44d4978267ca33cdecbedcf
-make=/home/ccx/versions/gnu-make.afdc243f050ed6c15aac1d4a9bfc090c15f0535514894841379b590617e28001
+mcm=/home/ccx/versions/musl-cross-make.e4db999a4586836d858df99d45eee1aaa59d4fed1a5fa24f0365db08cddb59de
+make=/home/ccx/versions/gnu-make.aa211b51bd7f8182794c40f039947bdf19ade8460ebfc071f9f33e6fb91a968e
 
 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+certdata2pem.a94a394bdc2623fc4c2dd3741ba0747d050c8aead907327062b20df32efbbf27
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+certdata2pem.2a813d0639f61fca235958874b16f90defb28a7efba4988c44bfcab6717ac682
 #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:.
 
 
diff --git a/variants/ccx-x86_64/ccx-utils b/variants/ccx-x86_64/ccx-utils
@@ -1,44 +1,46 @@
 #!/usr/bin/env pthbs-build
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+skalibs.45b697b31beb1f3b2d4c5fd78216d30ae31190e869f7f8745980fb502302cc6c
-#+s6.dcf16e70cf77b51db10172aa0aed80cfbf707768fcea10963cbd4a73b9411c78
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+skalibs.f3f639ae58dbc34c732bcd02b9791c5a3f0272c59e7605f8f16595b3116df208
+#+s6.28d26067984c57e64d05677a5f2d3cd6495380a7f2e4fff7742dca8783422bd5
 #@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 LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
diff --git a/variants/ccx-x86_64/certdata2pem b/variants/ccx-x86_64/certdata2pem
@@ -1,41 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
 #@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 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+zsh.18c555bf0c5f5c5f5b9f9b2a6c41598f3263a98486fd8dc6093cd0249d760ba2
-#+pthbs-banginstall.20e5ac5777e73f3e8d828b781725ef0817c49b2edf7ef99bd809080ff9b53e0b
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+zsh.057868ea48812b41739c94bc6a0f8da6ed951681a62ea6ce2d4a23a783d06ce9
+#+pthbs-banginstall.84944d58ad6aae47612623ded72158b3d3e274ff012dd88db303686b6f364365
 #@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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-dosfstools.3b07d4970844246538d5c08763ec57c56f9963e44013479610d950ef0bf9be68
-#+busybox-e2fsprogs.80b6af3d856d840824891f904fe7f259dee03045475ceeb3c7dd11cd092005a2
-#+busybox-iproute2.b58f15841af75ef3102a718ea4eb6b69ddfe2eca9355d63f53d304760fa1f2ac
-#+busybox-iputils.df3c7684bc3a71f00f9333c70ccd7931253d75d6af68f3a1eb3304fc1530754a
-#+busybox-net-misc.97cee1851eb00b65d60a0322dfce0dde1758069345e20fd0943b1cf8a967230c
-#+busybox-net-tools.9dad3928df16a9c0c19380b1563419fe9013a3f2fdedbc087bf959edbdf541fa
-#+busybox-traceroute.626cc03c9309af2e6da9764486c7f37aca68655ad4028219c9046b21cdbf0ad8
-#+busybox-wget.dfecd481358e3be308cfccbae06a205c179d1454dacc17a0a19d4f341a999b0a
-#+busybox-chpst.6b228b94b35258b6925b6f4b41c08027755bfcdf097522716679359fb74268e8
-#+busybox-console.a3fae472e5eb70be7b109e6f0fdd40483fa8ba99fa065fa5d6e3566da4d1d75a
-#+busybox-getty.1e6fded52616d20dba493de51208394a8da9e3fd6f80ff58e1f9a3f9b4a74b89
-#+busybox-i2c-tools.9ea05daf881c103213d8b6287479133b4d36fe0a62149c32bb1c78a999c2fbc8
-#+busybox-linux-extra.de992405ee5deace9608fc21f8e4ca8b8330740fd6483e640effd2b32be1b81b
-#+busybox-mtd-utils.0051966b109c1cc762c62967187cadf84209f4dd63c26c615eac1f8b903d3083
-#+busybox-shadow.ec57e3f86ac3a7a6c96c2814a4eb2cf8b4322a78f4bd13d287b9da3da9a8cb93
-#+busybox-su.745ee52adbebf63523412f53f65b114c391b6a5777c0c33a941d71135a7f7228
-#+busybox-util-linux-priv.7245c21eded17e163f55ed4289c1258d807b5a661bc6a59046baf3682054c772
-#+busybox-logging.50bef788ce9cad7126b03d255879dc06cbcdc7b92e4906972c19756a0fd5742d
-#+busybox-cron.20bea026a7b215e23ab3f6cfb73cb35b1300cbe069dfbe91e8568217fe6a1506
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+busybox-login.57703aa6bd11ed76cf0f1dee37a3e13ebe4d27431c131001080140e5eea561e4
-#+execline.e3f3b3c8842ec7bc726c55776e121afe6c3b66aab17352c7b8ce1be95cebd71b
-#+s6.dcf16e70cf77b51db10172aa0aed80cfbf707768fcea10963cbd4a73b9411c78
-#+ccx-utils.223610778f1d536eefeb1bdfc88c0eca25b2dfdd84ae13d11742ae79f4925d33
-#+applyuidgid-caps.78612b44171e5ff88c6a9c85ea1e2beb8e341ecb3e94e40760cfebff24820e63
-#+easyseccomp.47b024074659298a419c36851cec9e27ee9edaf016bbe52da78a7c550a0823f9
-#+mlog.d21750060e2285d43226bf9cf50ac4dc1df5560e10de6200f2e77a0d1c2e490b
-#+abduco.1a55018feb33db3476641800aa9d3c7d9fc4e1cc98d7d4f2726995c7e12ae3fe
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-dosfstools.46839c69e3ed18254f53762d20df008d95bdc2e819164568707f033febc08d7e
+#+busybox-e2fsprogs.9cc251ffec2f59d8fbadacc1d6291a9e4f0cb7ac714dfab2457dcb1a15d1c5c8
+#+busybox-iproute2.7cc94775547fcf5d1eb54671a34b00338908fd0d987bfc1da7d73ab3b32d7e8a
+#+busybox-iputils.13c494c9bc1958d249c4c6a6958d24ae676bb87ba1dd5997b3ae6ed4ca0662b5
+#+busybox-net-misc.36ea542042d1fba14d03a48c57752107f992c544b4e7fe3ea0ea876f470b7391
+#+busybox-net-tools.3ce4197f5d1f036f0f87ce02f1d5b82a879517c6c16ff98d880f306d43e96271
+#+busybox-traceroute.b70675fd3b29af5b2f6e93d9cac4e86364cae556b5db2575a7f531b4480efda1
+#+busybox-wget.6a661b9479402379c9d0f2e068151fc62b57d01796ee81b1e285a4519d019a9b
+#+busybox-chpst.1dade3b1fb4a2a68c148872af2318725946bfc62f7dc95843c6bcfaad9a721b0
+#+busybox-console.29378cfd34077da4fea08b7c4c6f8d153c662add36e4aace9234f3959314988f
+#+busybox-getty.357c8a64b56672ebdd2f0fd3b09e54f989768b4d60c1bdb4eedc11720d930679
+#+busybox-i2c-tools.f7a77ce59583a14c72f18ed908f33bf9cd07c0cc072149140e782341f5dfd227
+#+busybox-linux-extra.f17fb1ca015cf81185b578ffc8453ca77c01490b62e99a8849d9d67d7bd6c8f6
+#+busybox-mtd-utils.1ab41a1bfab417082471980932fab87a28275809c15e3bbf7921a4ab38b7b657
+#+busybox-shadow.38dba9565aa8305ffcc962c7422193c90996508e0d7ec0c07d8cfc47a36b8b10
+#+busybox-su.0dfdccfb99cf9aa8b2570d7742dd0aee77237d279943543f7477b8f3da240241
+#+busybox-util-linux-priv.3368741fb0581b4865974e41d562ea4b3389dac456b27080da96fb41709fcbc0
+#+busybox-logging.a68be6fb5bd8854f736c9c4b2e6e91b6356eca63cffdc9f5bbd2a250546fcc2f
+#+busybox-cron.ffddbd413744596d5110757dd1b8905cfbb6ea5785b99e8d32a5cfe64fe83bbc
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+busybox-login.aca61eebb6e7428d12cbbd5bc92db7c0db6c7612cdc84723078763095c313e48
+#+execline.a4658f442ed6e60530cde701afc6e777f6909679fc1e8fc9492a58cd56761c77
+#+s6.28d26067984c57e64d05677a5f2d3cd6495380a7f2e4fff7742dca8783422bd5
+#+ccx-utils.7bcd7c863a7a7f773ed98939d9a99b315d761fe4668a33929b4aec445ab84549
+#+applyuidgid-caps.655228402ff7064981ac0ccf2a2dd2983f20eda29e117368b86b986174b91a14
+#+easyseccomp.40cbbe7cedf040be6eb3c3d2aedb98420c48fd0095431bc951349268e16bd2dd
+#+mlog.531e39c6f3258c498ac01c8feddaed795045a21688701efba9e61fcff614b4f6
+#+abduco.71d6c9b1f41c289184ef25df03d62c7670460df04a4ada795a697002b8941379
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
 #@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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+zsh.18c555bf0c5f5c5f5b9f9b2a6c41598f3263a98486fd8dc6093cd0249d760ba2
-#+pthbs-banginstall.20e5ac5777e73f3e8d828b781725ef0817c49b2edf7ef99bd809080ff9b53e0b
-#+execline.e3f3b3c8842ec7bc726c55776e121afe6c3b66aab17352c7b8ce1be95cebd71b
-#+alpine-keys.8e66ce3985a424c8faaa7d3cc06fd6e17d5e18a80429690d13f791e94adf2a98
-#+apk-tools.2136082d8feada0a90f89b3095bb30a9244a288d0e71f43519b1384e3e0c2271
-#+xbps.6bc66384f0fdb43736ac201b3f8a0a99e2e832984276ca3f49d5068ec655984f
-#+container-bin-image.96bf4640d72305fe1e9cdac56a02ce72fd8e9373a69e40130046deff53b6e269
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+zsh.057868ea48812b41739c94bc6a0f8da6ed951681a62ea6ce2d4a23a783d06ce9
+#+pthbs-banginstall.84944d58ad6aae47612623ded72158b3d3e274ff012dd88db303686b6f364365
+#+execline.a4658f442ed6e60530cde701afc6e777f6909679fc1e8fc9492a58cd56761c77
+#+alpine-keys.f70784daff54e4fe63648ca9c706fd7a9234f0ad78101faec038af26de27ca65
+#+apk-tools.f0861208b70b58dadf90e1c8966d13f224ccf311bb2844647bfb256830431832
+#+xbps.a774d99181a683cf091488a2ac3f0cea75b65b1009aae28316cfedc31a7a4f81
+#+container-bin-image.045f7d053f29396c975f221cbc8744eba3487833e51e36208e94803769f60419
 #@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.2136082d8feada0a90f89b3095bb30a9244a288d0e71f43519b1384e3e0c2271/command/apk.static' "${dest}/deps/command/"
-ln -sf '/home/ccx/versions/xbps.6bc66384f0fdb43736ac201b3f8a0a99e2e832984276ca3f49d5068ec655984f/command/xbps-install.static' "${dest}/deps/command/"
+ln -sf '/home/ccx/versions/apk-tools.f0861208b70b58dadf90e1c8966d13f224ccf311bb2844647bfb256830431832/command/apk.static' "${dest}/deps/command/"
+ln -sf '/home/ccx/versions/xbps.a774d99181a683cf091488a2ac3f0cea75b65b1009aae28316cfedc31a7a4f81/command/xbps-install.static' "${dest}/deps/command/"
 
-for f in '/home/ccx/versions/alpine-keys.8e66ce3985a424c8faaa7d3cc06fd6e17d5e18a80429690d13f791e94adf2a98'/keys/alpine/*/*; do
+for f in '/home/ccx/versions/alpine-keys.f70784daff54e4fe63648ca9c706fd7a9234f0ad78101faec038af26de27ca65'/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.8e66ce3985a424c8faaa7d3cc06fd6e17d5e18a
 done
  
 mkdir -p "${dest}/deps/keys/void"
-for f in '/home/ccx/versions/xbps.6bc66384f0fdb43736ac201b3f8a0a99e2e832984276ca3f49d5068ec655984f'/keys/void/*; do
+for f in '/home/ccx/versions/xbps.a774d99181a683cf091488a2ac3f0cea75b65b1009aae28316cfedc31a7a4f81'/keys/void/*; do
 	ln -sf "$f" "${dest}/deps/keys/void/"
 done
 
-test -d '/home/ccx/versions/container-bin-image.96bf4640d72305fe1e9cdac56a02ce72fd8e9373a69e40130046deff53b6e269/container-bin-image'
-test -f '/home/ccx/versions/container-bin-image.96bf4640d72305fe1e9cdac56a02ce72fd8e9373a69e40130046deff53b6e269/container-bin-image/if'
-ln -sf '/home/ccx/versions/container-bin-image.96bf4640d72305fe1e9cdac56a02ce72fd8e9373a69e40130046deff53b6e269/container-bin-image' "${dest}/deps/"
+test -d '/home/ccx/versions/container-bin-image.045f7d053f29396c975f221cbc8744eba3487833e51e36208e94803769f60419/container-bin-image'
+test -f '/home/ccx/versions/container-bin-image.045f7d053f29396c975f221cbc8744eba3487833e51e36208e94803769f60419/container-bin-image/if'
+ln -sf '/home/ccx/versions/container-bin-image.045f7d053f29396c975f221cbc8744eba3487833e51e36208e94803769f60419/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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-dosfstools.3b07d4970844246538d5c08763ec57c56f9963e44013479610d950ef0bf9be68
-#+busybox-e2fsprogs.80b6af3d856d840824891f904fe7f259dee03045475ceeb3c7dd11cd092005a2
-#+busybox-iproute2.b58f15841af75ef3102a718ea4eb6b69ddfe2eca9355d63f53d304760fa1f2ac
-#+busybox-iputils.df3c7684bc3a71f00f9333c70ccd7931253d75d6af68f3a1eb3304fc1530754a
-#+busybox-net-misc.97cee1851eb00b65d60a0322dfce0dde1758069345e20fd0943b1cf8a967230c
-#+busybox-net-tools.9dad3928df16a9c0c19380b1563419fe9013a3f2fdedbc087bf959edbdf541fa
-#+busybox-traceroute.626cc03c9309af2e6da9764486c7f37aca68655ad4028219c9046b21cdbf0ad8
-#+busybox-wget.dfecd481358e3be308cfccbae06a205c179d1454dacc17a0a19d4f341a999b0a
-#+busybox-chpst.6b228b94b35258b6925b6f4b41c08027755bfcdf097522716679359fb74268e8
-#+busybox-console.a3fae472e5eb70be7b109e6f0fdd40483fa8ba99fa065fa5d6e3566da4d1d75a
-#+busybox-getty.1e6fded52616d20dba493de51208394a8da9e3fd6f80ff58e1f9a3f9b4a74b89
-#+busybox-i2c-tools.9ea05daf881c103213d8b6287479133b4d36fe0a62149c32bb1c78a999c2fbc8
-#+busybox-linux-extra.de992405ee5deace9608fc21f8e4ca8b8330740fd6483e640effd2b32be1b81b
-#+busybox-mtd-utils.0051966b109c1cc762c62967187cadf84209f4dd63c26c615eac1f8b903d3083
-#+busybox-shadow.ec57e3f86ac3a7a6c96c2814a4eb2cf8b4322a78f4bd13d287b9da3da9a8cb93
-#+busybox-su.745ee52adbebf63523412f53f65b114c391b6a5777c0c33a941d71135a7f7228
-#+busybox-util-linux-priv.7245c21eded17e163f55ed4289c1258d807b5a661bc6a59046baf3682054c772
-#+busybox-logging.50bef788ce9cad7126b03d255879dc06cbcdc7b92e4906972c19756a0fd5742d
-#+busybox-cron.20bea026a7b215e23ab3f6cfb73cb35b1300cbe069dfbe91e8568217fe6a1506
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+execline.e3f3b3c8842ec7bc726c55776e121afe6c3b66aab17352c7b8ce1be95cebd71b
-#+s6.dcf16e70cf77b51db10172aa0aed80cfbf707768fcea10963cbd4a73b9411c78
-#+s6-portable-utils.3e2dcf3b39963cb5dbff840ff5d5e0acf125d1c1550f1c637cd26fe111e750dd
-#+s6-linux-utils.3bcc200e3a3d2528850945dd701c1fe216d990ff91c9b8e1177370c7b2d8f205
-#+zsh.18c555bf0c5f5c5f5b9f9b2a6c41598f3263a98486fd8dc6093cd0249d760ba2
-#+confz.0f2604cef192b063030f83a7258e0c155ac3ce0a24f63517925e17cbd9a8857f
-#+containers.cfcda35aa3579798937cbb5c73afc00b059f04f7eee3964e79db6ade43e656c4
-#+xbps.6bc66384f0fdb43736ac201b3f8a0a99e2e832984276ca3f49d5068ec655984f
-#+zstd.b9ffad24deb43d62222ff3e100c4059c2e695157111c958628cee0ef931c1791
-#+apk-tools.2136082d8feada0a90f89b3095bb30a9244a288d0e71f43519b1384e3e0c2271
-#+alpine-keys.8e66ce3985a424c8faaa7d3cc06fd6e17d5e18a80429690d13f791e94adf2a98
-#+getent.a6a1998ddee47bf9905f634a5f510385de383b87362f6f7449bb83f3056fc6fc
-#+fileset.6772eb473f298d0cbf0a4c5671642a1932c2ad43ca6186ffccdbe0cc34adb46f
-#+ccx-utils.223610778f1d536eefeb1bdfc88c0eca25b2dfdd84ae13d11742ae79f4925d33
-#+easyseccomp.47b024074659298a419c36851cec9e27ee9edaf016bbe52da78a7c550a0823f9
-#+findutils.88ba358b7b2ff564664303f5e2e55ac2db9ad1a7b5f6391a705f625de23ddfb5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e-
\ No newline at end of file
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-dosfstools.46839c69e3ed18254f53762d20df008d95bdc2e819164568707f033febc08d7e
+#+busybox-e2fsprogs.9cc251ffec2f59d8fbadacc1d6291a9e4f0cb7ac714dfab2457dcb1a15d1c5c8
+#+busybox-iproute2.7cc94775547fcf5d1eb54671a34b00338908fd0d987bfc1da7d73ab3b32d7e8a
+#+busybox-iputils.13c494c9bc1958d249c4c6a6958d24ae676bb87ba1dd5997b3ae6ed4ca0662b5
+#+busybox-net-misc.36ea542042d1fba14d03a48c57752107f992c544b4e7fe3ea0ea876f470b7391
+#+busybox-net-tools.3ce4197f5d1f036f0f87ce02f1d5b82a879517c6c16ff98d880f306d43e96271
+#+busybox-traceroute.b70675fd3b29af5b2f6e93d9cac4e86364cae556b5db2575a7f531b4480efda1
+#+busybox-wget.6a661b9479402379c9d0f2e068151fc62b57d01796ee81b1e285a4519d019a9b
+#+busybox-chpst.1dade3b1fb4a2a68c148872af2318725946bfc62f7dc95843c6bcfaad9a721b0
+#+busybox-console.29378cfd34077da4fea08b7c4c6f8d153c662add36e4aace9234f3959314988f
+#+busybox-getty.357c8a64b56672ebdd2f0fd3b09e54f989768b4d60c1bdb4eedc11720d930679
+#+busybox-i2c-tools.f7a77ce59583a14c72f18ed908f33bf9cd07c0cc072149140e782341f5dfd227
+#+busybox-linux-extra.f17fb1ca015cf81185b578ffc8453ca77c01490b62e99a8849d9d67d7bd6c8f6
+#+busybox-mtd-utils.1ab41a1bfab417082471980932fab87a28275809c15e3bbf7921a4ab38b7b657
+#+busybox-shadow.38dba9565aa8305ffcc962c7422193c90996508e0d7ec0c07d8cfc47a36b8b10
+#+busybox-su.0dfdccfb99cf9aa8b2570d7742dd0aee77237d279943543f7477b8f3da240241
+#+busybox-util-linux-priv.3368741fb0581b4865974e41d562ea4b3389dac456b27080da96fb41709fcbc0
+#+busybox-logging.a68be6fb5bd8854f736c9c4b2e6e91b6356eca63cffdc9f5bbd2a250546fcc2f
+#+busybox-cron.ffddbd413744596d5110757dd1b8905cfbb6ea5785b99e8d32a5cfe64fe83bbc
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+execline.a4658f442ed6e60530cde701afc6e777f6909679fc1e8fc9492a58cd56761c77
+#+s6.28d26067984c57e64d05677a5f2d3cd6495380a7f2e4fff7742dca8783422bd5
+#+s6-portable-utils.e62c4a43c1e0ebcf451fc05403bcd830bab11159f86101f9531a710e94566f0c
+#+s6-linux-utils.8c2d2b9e83da7a4de0f7e54a5d8be6c65ef00709cc724e74a95bd144b7f4aff4
+#+zsh.057868ea48812b41739c94bc6a0f8da6ed951681a62ea6ce2d4a23a783d06ce9
+#+confz.004baddf3bbead550e6bf3c3ec8554b37770eb722b3ffdb98cba01f188fe47f0
+#+containers.16bfebee4df34897c56a3b5fe1734038e2aa78d6d206ba83f3f5cdbe9c8fad7e
+#+xbps.a774d99181a683cf091488a2ac3f0cea75b65b1009aae28316cfedc31a7a4f81
+#+zstd.710b62ae5807615b4b2b81554d87f293ef95fe4842858d0a22121bef6d29ce14
+#+apk-tools.f0861208b70b58dadf90e1c8966d13f224ccf311bb2844647bfb256830431832
+#+alpine-keys.f70784daff54e4fe63648ca9c706fd7a9234f0ad78101faec038af26de27ca65
+#+getent.6f3385fd5170d7fd05daa1d150c87e39fc9b7cb0c9aabbdec4539b4f370eb702
+#+fileset.47a7c317cc93cf99b6bef5dd5fb07bf2f593f547d94b078492ee9c2dd55557c3
+#+ccx-utils.7bcd7c863a7a7f773ed98939d9a99b315d761fe4668a33929b4aec445ab84549
+#+easyseccomp.40cbbe7cedf040be6eb3c3d2aedb98420c48fd0095431bc951349268e16bd2dd
+#+findutils.2598e20961b91dafb2dc243abb65d53a9e9671391124790328fcddd9b293f19b
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1+
\ 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+m4.b38ed60ffea1a09d5f57a79eab2fc576b64f38c5e871bf1395b64829322d2709
-#+libressl.f56a6b4d6e3a363e5166c16cd200ac8827222ca834d3a0f101d2abeaf653548f
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+m4.3e1bd43513a03b656cff43101e0084ea4d21508d79c8e1d85d711455314508c7
+#+libressl.0a80f4ef368cf90a5fed4e1b2e9e327b6e2335d9bb1e56bdc4d242ec89c5ea18
 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:.
 
 
@@ -63,6 +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 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-dosfstools.3b07d4970844246538d5c08763ec57c56f9963e44013479610d950ef0bf9be68
-#+busybox-e2fsprogs.80b6af3d856d840824891f904fe7f259dee03045475ceeb3c7dd11cd092005a2
-#+busybox-iproute2.b58f15841af75ef3102a718ea4eb6b69ddfe2eca9355d63f53d304760fa1f2ac
-#+busybox-iputils.df3c7684bc3a71f00f9333c70ccd7931253d75d6af68f3a1eb3304fc1530754a
-#+busybox-net-misc.97cee1851eb00b65d60a0322dfce0dde1758069345e20fd0943b1cf8a967230c
-#+busybox-net-tools.9dad3928df16a9c0c19380b1563419fe9013a3f2fdedbc087bf959edbdf541fa
-#+busybox-traceroute.626cc03c9309af2e6da9764486c7f37aca68655ad4028219c9046b21cdbf0ad8
-#+busybox-wget.dfecd481358e3be308cfccbae06a205c179d1454dacc17a0a19d4f341a999b0a
-#+busybox-chpst.6b228b94b35258b6925b6f4b41c08027755bfcdf097522716679359fb74268e8
-#+busybox-console.a3fae472e5eb70be7b109e6f0fdd40483fa8ba99fa065fa5d6e3566da4d1d75a
-#+busybox-getty.1e6fded52616d20dba493de51208394a8da9e3fd6f80ff58e1f9a3f9b4a74b89
-#+busybox-i2c-tools.9ea05daf881c103213d8b6287479133b4d36fe0a62149c32bb1c78a999c2fbc8
-#+busybox-linux-extra.de992405ee5deace9608fc21f8e4ca8b8330740fd6483e640effd2b32be1b81b
-#+busybox-mtd-utils.0051966b109c1cc762c62967187cadf84209f4dd63c26c615eac1f8b903d3083
-#+busybox-shadow.ec57e3f86ac3a7a6c96c2814a4eb2cf8b4322a78f4bd13d287b9da3da9a8cb93
-#+busybox-su.745ee52adbebf63523412f53f65b114c391b6a5777c0c33a941d71135a7f7228
-#+busybox-util-linux-priv.7245c21eded17e163f55ed4289c1258d807b5a661bc6a59046baf3682054c772
-#+busybox-logging.50bef788ce9cad7126b03d255879dc06cbcdc7b92e4906972c19756a0fd5742d
-#+busybox-cron.20bea026a7b215e23ab3f6cfb73cb35b1300cbe069dfbe91e8568217fe6a1506
-#+attr.81af2bf47c2f3e0210393797dcb650715b895606edd5c5459302bb3a2f25d6bc
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+diffutils.9a051c85d5055f122a096dc443299e065345d6ac521c1654667ad8e88393e87d
-#+patch.ae7492228d69152bfaa0183750edd3cc0a74226ff2436a39e1718547035eab5d
-#+flex.37e656a6152b2bf1f6ad605702ab066d52d2fad0ef579ea8f1ed41921045bb8d
-#+bison.80145468e33fa5be3e6d7cd01e84d6bfa13dc40149e9483157541fd762661cb7
-#+rsync.2936e4f725a9c6ba9ed8006b0959baa0f6bda147dfdd52946fe341a87690b80a
-#+execline.e3f3b3c8842ec7bc726c55776e121afe6c3b66aab17352c7b8ce1be95cebd71b
-#+s6.dcf16e70cf77b51db10172aa0aed80cfbf707768fcea10963cbd4a73b9411c78
-#+s6-rc.36e7e7fa55107955082a5e57cffe64f396d7ef042821bf94b02af4cf68063d06
-#+s6-portable-utils.3e2dcf3b39963cb5dbff840ff5d5e0acf125d1c1550f1c637cd26fe111e750dd
-#+s6-linux-utils.3bcc200e3a3d2528850945dd701c1fe216d990ff91c9b8e1177370c7b2d8f205
-#+s6-linux-init.4537486c25ddb8f4bb3cfd409a475df6bf30edae1f2b5a00d2d4dcfed49274eb
-#+mdevd.5886ce29fd48c8fb9497b44633f622edfd39b0c3453ed11de8955532c2d234f0
-#+s6-dns.2c9c57069c68e67152ee8aa539e23ec614615843e1aaf4dec9997c46674b88f8
-#+libressl.f56a6b4d6e3a363e5166c16cd200ac8827222ca834d3a0f101d2abeaf653548f
-#+s6-networking.24e57be8aeb7258c82deb050ca3d460716bb94532b9c4d4d7a0e52beabccef8e
-#+zsh.18c555bf0c5f5c5f5b9f9b2a6c41598f3263a98486fd8dc6093cd0249d760ba2
-#+pthbs-banginstall.20e5ac5777e73f3e8d828b781725ef0817c49b2edf7ef99bd809080ff9b53e0b
-#+aat.f1628e530f77a2be903a4a8aea880dd36e9777ef0e20e64b84b8bd741d9060dd
-#+confz.0f2604cef192b063030f83a7258e0c155ac3ce0a24f63517925e17cbd9a8857f
-#+containers.cfcda35aa3579798937cbb5c73afc00b059f04f7eee3964e79db6ade43e656c4
-#+fileset.6772eb473f298d0cbf0a4c5671642a1932c2ad43ca6186ffccdbe0cc34adb46f
-#+logincaps.73371e6ba6f984777f9f20bf08e20a72fc3c1b43b6de06e60181bfc300b499c0
-#+snaprep.e12a87c6161c16a9f96027797e0a49a1b2873e861b0044ca70df530473c4bef1
-#+curl.25d0dc3ae05598ea0d8257be8d4ba675a07ab70ab7aaf1ddd63f90682e097d55
-#+git.81c93b086608ddec44a6ba01a4be86d8f183a4250eeb7f681a7ca5ebd83715df
-#+xbps.6bc66384f0fdb43736ac201b3f8a0a99e2e832984276ca3f49d5068ec655984f
-#+apk-tools.2136082d8feada0a90f89b3095bb30a9244a288d0e71f43519b1384e3e0c2271
-#+getent.a6a1998ddee47bf9905f634a5f510385de383b87362f6f7449bb83f3056fc6fc
-#+getconf.2f4aec5ba1bcd9c7c43ac44c812101e52b43aeb6e2de56e53dce416d561c6839
-#+iconv.5b018ba6f1504db7dcf4c1cd43d052c70b90221890c8244702654f3411272cdd
-#+libcap.86979187f7be609cea36203949e4d143b93c5a5b449ca19400c651ae306dde43
-#+applyuidgid-caps.78612b44171e5ff88c6a9c85ea1e2beb8e341ecb3e94e40760cfebff24820e63
-#+ccx-utils.223610778f1d536eefeb1bdfc88c0eca25b2dfdd84ae13d11742ae79f4925d33
-#+user-env.311d5c0bc0783c5bd48e0a152ad47290d008b32d148dd92246fe5835848ac968
-#+strace.b9c5c96ae73a5448c528634e00f5b25c73a80561b3af202af7b4d0d9068dc983
-#+mlog.d21750060e2285d43226bf9cf50ac4dc1df5560e10de6200f2e77a0d1c2e490b
-#+findutils.88ba358b7b2ff564664303f5e2e55ac2db9ad1a7b5f6391a705f625de23ddfb5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+nvi.6d63bd9712ca5a375b5df2aea6155d927424007776754a59eab6ef5546058133
-#+squashfs-tools.4b4ed54deb6dc113306e316a381482e0f05213b9f5b08c8ef15cb7c36597b735
-#+mandoc.75f1a31647ca0cdd0b8ccc1c3a09756db0a9523bd76ce54a114653e80137130e
-#+tinyssh.13f2e742f01ea7eb14330c28808adf48864256bbe597c072106e2e10c260cbee
-#+system-config.3b09019bbf3e5e953077e5399f57b1378605d38e04f98deeac2e058939445214
-#+system-config-rc.862354e99f92c0e96dfc7a7dde02e91fb7394a862cb10afc7aa6100a0bab3a9d
-#+system-config-scripts.6bf2b4e3206d88ef797d8ee71c71d7734908a496c819c481eafe1b87c41bd98a
-#+system-config-init.5af8ad155c87a6fb008494ee8d34cdf15e14163181ec0d4238f591b24dccbb55
-#+system-config-zsh.c28d9791ba11228764cb60b597cbed0f246db6f0097b8374f32f5903bcaebd2f
-#+busybox.d8eb5ce5039208a2e46e2d7c3375605a9241d1bfbaa6413dbfa1757d6b64ead1-
\ No newline at end of file
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-dosfstools.46839c69e3ed18254f53762d20df008d95bdc2e819164568707f033febc08d7e
+#+busybox-e2fsprogs.9cc251ffec2f59d8fbadacc1d6291a9e4f0cb7ac714dfab2457dcb1a15d1c5c8
+#+busybox-iproute2.7cc94775547fcf5d1eb54671a34b00338908fd0d987bfc1da7d73ab3b32d7e8a
+#+busybox-iputils.13c494c9bc1958d249c4c6a6958d24ae676bb87ba1dd5997b3ae6ed4ca0662b5
+#+busybox-net-misc.36ea542042d1fba14d03a48c57752107f992c544b4e7fe3ea0ea876f470b7391
+#+busybox-net-tools.3ce4197f5d1f036f0f87ce02f1d5b82a879517c6c16ff98d880f306d43e96271
+#+busybox-traceroute.b70675fd3b29af5b2f6e93d9cac4e86364cae556b5db2575a7f531b4480efda1
+#+busybox-wget.6a661b9479402379c9d0f2e068151fc62b57d01796ee81b1e285a4519d019a9b
+#+busybox-chpst.1dade3b1fb4a2a68c148872af2318725946bfc62f7dc95843c6bcfaad9a721b0
+#+busybox-console.29378cfd34077da4fea08b7c4c6f8d153c662add36e4aace9234f3959314988f
+#+busybox-getty.357c8a64b56672ebdd2f0fd3b09e54f989768b4d60c1bdb4eedc11720d930679
+#+busybox-i2c-tools.f7a77ce59583a14c72f18ed908f33bf9cd07c0cc072149140e782341f5dfd227
+#+busybox-linux-extra.f17fb1ca015cf81185b578ffc8453ca77c01490b62e99a8849d9d67d7bd6c8f6
+#+busybox-mtd-utils.1ab41a1bfab417082471980932fab87a28275809c15e3bbf7921a4ab38b7b657
+#+busybox-shadow.38dba9565aa8305ffcc962c7422193c90996508e0d7ec0c07d8cfc47a36b8b10
+#+busybox-su.0dfdccfb99cf9aa8b2570d7742dd0aee77237d279943543f7477b8f3da240241
+#+busybox-util-linux-priv.3368741fb0581b4865974e41d562ea4b3389dac456b27080da96fb41709fcbc0
+#+busybox-logging.a68be6fb5bd8854f736c9c4b2e6e91b6356eca63cffdc9f5bbd2a250546fcc2f
+#+busybox-cron.ffddbd413744596d5110757dd1b8905cfbb6ea5785b99e8d32a5cfe64fe83bbc
+#+attr.2df22b2cac52a4665962b98f71cddea066dc7a4ec934136be10321d5ec08f5ad
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+diffutils.a671ca2f3d74e5d715dad78029e6ca657c8f17d474bf6e225e13606d6be43f36
+#+patch.5557660270847d7de668356fc2dea208575218d87f439624d6b1db9030e60dac
+#+flex.876444ede8e785cda0d73fe830a2704b02a4e1d854481e59ffdffbe169a98840
+#+bison.0cc6df5b7ea8216323721f2134e6fad8adc28ca3c1801945d689b02d7b537e00
+#+rsync.c61887c79312743c999cf09585fb922f3e31f66599ac42dd470a95451c0b888b
+#+execline.a4658f442ed6e60530cde701afc6e777f6909679fc1e8fc9492a58cd56761c77
+#+s6.28d26067984c57e64d05677a5f2d3cd6495380a7f2e4fff7742dca8783422bd5
+#+s6-rc.cb5266e9ae6b3074c676e249fdd444e8e670527d767aa923b1a6b9b85295de49
+#+s6-portable-utils.e62c4a43c1e0ebcf451fc05403bcd830bab11159f86101f9531a710e94566f0c
+#+s6-linux-utils.8c2d2b9e83da7a4de0f7e54a5d8be6c65ef00709cc724e74a95bd144b7f4aff4
+#+s6-linux-init.f2f00c9179408c2e7e8e53c924bd747c3203ad875603e54602f9b828163bd758
+#+mdevd.d19703e5d9576aea60311315656583a6e86e4fcedf5a594816015b3f0a463eed
+#+s6-dns.8340e17f59b32fcd4fdaea3519f76a82941c1b4c4423093abd371edd41ec900e
+#+libressl.0a80f4ef368cf90a5fed4e1b2e9e327b6e2335d9bb1e56bdc4d242ec89c5ea18
+#+s6-networking.0cc0594fb6f6be5461a07ef92c11dc4ab9c4d971edc7801aea4814cfa5b607b5
+#+zsh.057868ea48812b41739c94bc6a0f8da6ed951681a62ea6ce2d4a23a783d06ce9
+#+pthbs-banginstall.84944d58ad6aae47612623ded72158b3d3e274ff012dd88db303686b6f364365
+#+aat.f7b6f292d5b40d77e3a9d893c0914890ae6dc41930a3f3f0ac3dfa7391e495c5
+#+confz.004baddf3bbead550e6bf3c3ec8554b37770eb722b3ffdb98cba01f188fe47f0
+#+containers.16bfebee4df34897c56a3b5fe1734038e2aa78d6d206ba83f3f5cdbe9c8fad7e
+#+fileset.47a7c317cc93cf99b6bef5dd5fb07bf2f593f547d94b078492ee9c2dd55557c3
+#+logincaps.378e1c1f8512bbb9142d43e974e3af5a87f327c54d2365654b38dd96b25d5a6e
+#+snaprep.c7291cb7a25733a426b59180c2614096ec2b4488bcc2de1500e2bcf7667fcd2e
+#+curl.1e86729c8cb8704cfe5ddb014c3a08c02bf46bf3a8bcad3ea93c2af5af2c8ab2
+#+git.557292067a3de9d03d46141247c5eb139edff95b64a331c7af813134962521f9
+#+xbps.a774d99181a683cf091488a2ac3f0cea75b65b1009aae28316cfedc31a7a4f81
+#+apk-tools.f0861208b70b58dadf90e1c8966d13f224ccf311bb2844647bfb256830431832
+#+getent.6f3385fd5170d7fd05daa1d150c87e39fc9b7cb0c9aabbdec4539b4f370eb702
+#+getconf.0a89b938b9483544f9b179a389b8c6ed5576b9be225ebca673ce541c9a81c9a6
+#+iconv.04bd7666ec0c328e901af1ed5407c67d1b7c867f4659911b95e34958ac43921d
+#+libcap.7e952925a0f701d005130f2a8cf7146e9d66249a9862aba077577177ea4caaa2
+#+applyuidgid-caps.655228402ff7064981ac0ccf2a2dd2983f20eda29e117368b86b986174b91a14
+#+ccx-utils.7bcd7c863a7a7f773ed98939d9a99b315d761fe4668a33929b4aec445ab84549
+#+user-env.9fdc47ea614a3f0f568b6875e8a3e9cc6e42d2e4c37e8b267a675a8035ea7b1b
+#+strace.70549a88be39b0f2ff6d0a73e5ccd39be37038cd0205f590e37426ba7f10316f
+#+mlog.531e39c6f3258c498ac01c8feddaed795045a21688701efba9e61fcff614b4f6
+#+findutils.2598e20961b91dafb2dc243abb65d53a9e9671391124790328fcddd9b293f19b
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+nvi.d2eadba43ef6dbce631fe680097cf2fb750f23e7f8ce355fc2162e6270aa3b16
+#+squashfs-tools.c70b7c4c810cdf57571ea0a20af0d6dbd8ee77bccc334e8f3f1f77ee9bd8b756
+#+mandoc.22a54a117a00ef0758924d066ccc4197a51d72fa207e788c9b9c783e4a6892ae
+#+tinyssh.9ee19f56ea055d37b6334e33914575a435b166e6bf612ea0094e63145017cc8d
+#+system-config.2579874deaa452053dfb7d7d9c96642071ebc5a3018ec525ba989265bfb091fc
+#+system-config-rc.9fbfb22d37c92da66361c7d86fcea8249d6dc7c4751c380dc204a5d2950263d4
+#+system-config-scripts.01d50d4de1c706be7ebd2eda1471d33bd04f79e0444ad2a0231c1b0c98c33ac1
+#+system-config-init.433c04ead4ede8e7c210d57fb50d6c1946fdcbeae6688de89fb5d60977ae3f41
+#+system-config-zsh.65888c6151f69a42265a79a4a63976701f0d72face528a564d8d69601711f7f3
+#+busybox.034c9dc6ca5c574a2bc23d2370bcdefe252032a40f13180a25480972badbc091+
\ 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+m4.b38ed60ffea1a09d5f57a79eab2fc576b64f38c5e871bf1395b64829322d2709
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+m4.3e1bd43513a03b656cff43101e0084ea4d21508d79c8e1d85d711455314508c7
 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:.
 
 
@@ -62,6 +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 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+ocaml.edf0818febf189032988af4412256bdc0546c7597e8791c956cafae0f631d327
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+ocaml.b3da28f54c7f8c17ed8383c61bdcdbc0b7787d5b8c7c4e3acde60b592b678114
 #@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.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/home/ccx/versions/musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149/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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+m4.b38ed60ffea1a09d5f57a79eab2fc576b64f38c5e871bf1395b64829322d2709
-#+patch.ae7492228d69152bfaa0183750edd3cc0a74226ff2436a39e1718547035eab5d
-#+flex.37e656a6152b2bf1f6ad605702ab066d52d2fad0ef579ea8f1ed41921045bb8d
-#+bison.80145468e33fa5be3e6d7cd01e84d6bfa13dc40149e9483157541fd762661cb7
-#+libseccomp.0436a221d996d81493cc855e9acc111609926f45b12138b44ef47db156451d37
-#+error-standalone.7d3ae7780494b0e878dd740fc71b62852a2ef667f87336b24d8308112da5986c
-#+argp-standalone.698a0a7c186c83806509f1fa1d6b31ae32cdc0cd747e9e44b831a3147f017ef3
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+m4.3e1bd43513a03b656cff43101e0084ea4d21508d79c8e1d85d711455314508c7
+#+patch.5557660270847d7de668356fc2dea208575218d87f439624d6b1db9030e60dac
+#+flex.876444ede8e785cda0d73fe830a2704b02a4e1d854481e59ffdffbe169a98840
+#+bison.0cc6df5b7ea8216323721f2134e6fad8adc28ca3c1801945d689b02d7b537e00
+#+libseccomp.0dce61ae50125af92c3647c564a3c63fb4537ce669fbb82eb1e694eed4605ad8
+#+error-standalone.61cdd970aae69d023ef4dbba64b1a80d6d45a3395c3c75d382bcdd0b747ab3ba
+#+argp-standalone.2e26f1dd6575c7b740168111c5c7e9a187016f31f52db72b5dc2ccc5558e90a0
 #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp
 #@sha256:eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10:easyseccomp_fix_includes.patch
 #@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
@@ -70,6 +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 LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
diff --git a/variants/ccx-x86_64/error-standalone b/variants/ccx-x86_64/error-standalone
@@ -1,43 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
 #@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 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+skalibs.45b697b31beb1f3b2d4c5fd78216d30ae31190e869f7f8745980fb502302cc6c
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+skalibs.f3f639ae58dbc34c732bcd02b9791c5a3f0272c59e7605f8f16595b3116df208
 #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline
 
 
@@ -48,7 +48,7 @@ cd 'execline'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.45b697b31beb1f3b2d4c5fd78216d30ae31190e869f7f8745980fb502302cc6c/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.f3f639ae58dbc34c732bcd02b9791c5a3f0272c59e7605f8f16595b3116df208/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.34634128d8e3c128d962de9027a8246e908c6852a54ba46075a3be0639b1d0e8
-#+gnu-make.aec55aaebe092e32a5684107e717636469632e626abd9ccde8ee014b6b9f3528
-#+busybox.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+nawk.333d5fb08091dff9b4012b7ff3c846c07579fe04ee66aa65eeb8dda7e9caabc0
-#+skalibs.7ee254b44f67ed6ef6e4fad472aff982a905fd63ff567efd26ff5d255f659136
+#+musl-cross-make.363da45526527aac5f37d0770fa78e454d0a7664f3c1042e9bdd14680d67b79e
+#+gnu-make.7e359c54f7829391a5095ac8c288230eb9bc5feb032b4ab41b3ae34e259a80a6
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
+#+skalibs.9188c60dffffbd4cd629bbf304e048c78abe8ebcf25765ac3a0ab39e3e2e314a
 #@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.7ee254b44f67ed6ef6e4fad472aff982a905fd63ff567efd26ff5d255f659136/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.9188c60dffffbd4cd629bbf304e048c78abe8ebcf25765ac3a0ab39e3e2e314a/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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+zsh.18c555bf0c5f5c5f5b9f9b2a6c41598f3263a98486fd8dc6093cd0249d760ba2
-#+pthbs-banginstall.20e5ac5777e73f3e8d828b781725ef0817c49b2edf7ef99bd809080ff9b53e0b
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+zsh.057868ea48812b41739c94bc6a0f8da6ed951681a62ea6ce2d4a23a783d06ce9
+#+pthbs-banginstall.84944d58ad6aae47612623ded72158b3d3e274ff012dd88db303686b6f364365
 #@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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+m4.b38ed60ffea1a09d5f57a79eab2fc576b64f38c5e871bf1395b64829322d2709
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+m4.3e1bd43513a03b656cff43101e0084ea4d21508d79c8e1d85d711455314508c7
 #@untar:-J:sha256:1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5:.
 
 
@@ -62,6 +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 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.333d5fb08091dff9b4012b7ff3c846c07579fe04ee66aa65eeb8dda7e9caabc0
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+m4.b38ed60ffea1a09d5f57a79eab2fc576b64f38c5e871bf1395b64829322d2709
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+m4.3e1bd43513a03b656cff43101e0084ea4d21508d79c8e1d85d711455314508c7
 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
 
 
@@ -62,6 +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 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.34634128d8e3c128d962de9027a8246e908c6852a54ba46075a3be0639b1d0e8
-#+gnu-make.aec55aaebe092e32a5684107e717636469632e626abd9ccde8ee014b6b9f3528
-#+busybox.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+nawk.333d5fb08091dff9b4012b7ff3c846c07579fe04ee66aa65eeb8dda7e9caabc0
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gmp.bd669d14733b4fb2ab75a685bbebbc7a00b698a3b5dbe0e1800587836d4cd2ed
-#+mpc.20c360987bcf9d83236a9005bbbb0896d8e9ec90e83173b27c8e7406a3f388f9
-#+mpfr.1f13a620c4d8fc4a29662577cfd890fa81748d3204b3d5b8ededc1e5309e0c77
+#+musl-cross-make.363da45526527aac5f37d0770fa78e454d0a7664f3c1042e9bdd14680d67b79e
+#+gnu-make.7e359c54f7829391a5095ac8c288230eb9bc5feb032b4ab41b3ae34e259a80a6
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gmp.9c2c1279ae83f76a4dcf001f969f900bab6306ab78c0b11ca0951929a868a2ce
+#+mpc.1a5197a21fd63acfb8cc4aa6fb887832b6aea7b77e84f553bc235996b6d20364
+#+mpfr.ceef5ad29fb44c1fdbf10431f6146f3202985bff82e023caa3a0fa933dceec27
 #@sha256:62eb68290502d54b16457509aa0c3995a84116408e6b593d676b9f4c03b6b160:merged.patch
 #@untar:-J:sha256:e0dc77297625631ac8e50fa92fffefe899a4eb702592da5c32ef04e2293aca3a:.
 
@@ -15,6 +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 LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
@@ -45,14 +47,14 @@ patch -p1 <../merged.patch
 export TZ=UTC
 export SOURCE_DATE_EPOCH=1748000928
 
-mcm=/home/ccx/versions/musl-cross-make.34634128d8e3c128d962de9027a8246e908c6852a54ba46075a3be0639b1d0e8
+mcm=/home/ccx/versions/musl-cross-make.363da45526527aac5f37d0770fa78e454d0a7664f3c1042e9bdd14680d67b79e
 mcm_bin=$mcm/bin/x86_64-linux-musl
-musl=/home/ccx/versions/musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
+musl=/home/ccx/versions/musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
 build_env_static
 
-sysroot="$(realpath ..)/sysroot"
-objdir="$(realpath ..)/objdir"
-installdir="$(realpath ..)/install"
+sysroot="${workdir}/sysroot"
+objdir="${workdir}/objdir"
+installdir="${workdir}/install"
 src="$(realpath .)"
 
 with_make_vars() {
diff --git a/variants/ccx-x86_64/getconf b/variants/ccx-x86_64/getconf
@@ -1,41 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
 #@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 LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
diff --git a/variants/ccx-x86_64/getent b/variants/ccx-x86_64/getent
@@ -1,41 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
 #@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 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+m4.b38ed60ffea1a09d5f57a79eab2fc576b64f38c5e871bf1395b64829322d2709
-#+libressl.f56a6b4d6e3a363e5166c16cd200ac8827222ca834d3a0f101d2abeaf653548f
-#+curl.25d0dc3ae05598ea0d8257be8d4ba675a07ab70ab7aaf1ddd63f90682e097d55
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+m4.3e1bd43513a03b656cff43101e0084ea4d21508d79c8e1d85d711455314508c7
+#+libressl.0a80f4ef368cf90a5fed4e1b2e9e327b6e2335d9bb1e56bdc4d242ec89c5ea18
+#+curl.1e86729c8cb8704cfe5ddb014c3a08c02bf46bf3a8bcad3ea93c2af5af2c8ab2
 #@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.34634128d8e3c128d962de9027a8246e908c6852a54ba46075a3be0639b1d0e8
-#+gnu-make.aec55aaebe092e32a5684107e717636469632e626abd9ccde8ee014b6b9f3528
-#+busybox.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+m4.e492b2846bbfb7a5a69e55d67054a6298da3ad7444fdacffd97a048480717b02
-#+nawk.333d5fb08091dff9b4012b7ff3c846c07579fe04ee66aa65eeb8dda7e9caabc0
+#+musl-cross-make.363da45526527aac5f37d0770fa78e454d0a7664f3c1042e9bdd14680d67b79e
+#+gnu-make.7e359c54f7829391a5095ac8c288230eb9bc5feb032b4ab41b3ae34e259a80a6
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+m4.257f1534f2ce0186257279c3dbf9790f9ae6e3a48e8bc139b16aa129fbac5240
+#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
 #@untar:-J:sha256:a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898:.
 
 
@@ -33,6 +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 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.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.aec55aaebe092e32a5684107e717636469632e626abd9ccde8ee014b6b9f3528
-#+busybox.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+nawk.333d5fb08091dff9b4012b7ff3c846c07579fe04ee66aa65eeb8dda7e9caabc0
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.7e359c54f7829391a5095ac8c288230eb9bc5feb032b4ab41b3ae34e259a80a6
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -34,6 +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 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.34634128d8e3c128d962de9027a8246e908c6852a54ba46075a3be0639b1d0e8
-#+nawk.333d5fb08091dff9b4012b7ff3c846c07579fe04ee66aa65eeb8dda7e9caabc0
+#+musl-cross-make.363da45526527aac5f37d0770fa78e454d0a7664f3c1042e9bdd14680d67b79e
+#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -37,7 +37,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'make-4.4.1'
 
 
-mcm=/home/ccx/versions/musl-cross-make.34634128d8e3c128d962de9027a8246e908c6852a54ba46075a3be0639b1d0e8
+mcm=/home/ccx/versions/musl-cross-make.363da45526527aac5f37d0770fa78e454d0a7664f3c1042e9bdd14680d67b79e
 
 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.73ec27e1b55df8f7cd25d2de5d1a41bfdfaf0a0d27dabc32e5a1d777da12595a
-#+gnu-make.afdc243f050ed6c15aac1d4a9bfc090c15f0535514894841379b590617e28001
-#+busybox.657e98b7dd88d5f7caa5ee8303e52ad8649a9da3f5e8db31c7c20bc5d1ea90f9
-#+nawk.333d5fb08091dff9b4012b7ff3c846c07579fe04ee66aa65eeb8dda7e9caabc0
+#+musl-cross-make.3e9a10d515ab8608f8eda7125d1b223da285a62e85a87a56be316a539821605c
+#+gnu-make.aa211b51bd7f8182794c40f039947bdf19ade8460ebfc071f9f33e6fb91a968e
+#+busybox.5792386228c725ccfeffe301dd3918f307e1f4d1391f7bdef45910089bdea8cc
+#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
 #@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.84898b757dbaac4798cdf42674f90ac2c88ba1d5d44d4978267ca33cdecbedcf
+#+musl-cross-make.e4db999a4586836d858df99d45eee1aaa59d4fed1a5fa24f0365db08cddb59de
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -30,7 +30,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'make-4.4.1'
 
 
-mcm=/home/ccx/versions/musl-cross-make.84898b757dbaac4798cdf42674f90ac2c88ba1d5d44d4978267ca33cdecbedcf
+mcm=/home/ccx/versions/musl-cross-make.e4db999a4586836d858df99d45eee1aaa59d4fed1a5fa24f0365db08cddb59de
 
 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+m4.b38ed60ffea1a09d5f57a79eab2fc576b64f38c5e871bf1395b64829322d2709
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+m4.3e1bd43513a03b656cff43101e0084ea4d21508d79c8e1d85d711455314508c7
 #@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:.
 
 
@@ -62,6 +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 LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
diff --git a/variants/ccx-x86_64/iconv b/variants/ccx-x86_64/iconv
@@ -1,41 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
 #@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 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+m4.b38ed60ffea1a09d5f57a79eab2fc576b64f38c5e871bf1395b64829322d2709
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+m4.3e1bd43513a03b656cff43101e0084ea4d21508d79c8e1d85d711455314508c7
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 
@@ -63,6 +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 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.d6ec83b71192b572b754ee2c9e4d4b335b0e06779ade4a2882f822f6f1320893
-#+busybox.d8eb5ce5039208a2e46e2d7c3375605a9241d1bfbaa6413dbfa1757d6b64ead1-
\ No newline at end of file
+#+linux-qemu-guest.b390fb55ca8c468d1ec7d010f9aa7a66903ab2b72ca7c51ef0ca652957e74a23
+#+busybox.034c9dc6ca5c574a2bc23d2370bcdefe252032a40f13180a25480972badbc091+
\ 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+m4.b38ed60ffea1a09d5f57a79eab2fc576b64f38c5e871bf1395b64829322d2709
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+m4.3e1bd43513a03b656cff43101e0084ea4d21508d79c8e1d85d711455314508c7
 #@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:.
 
 
@@ -62,6 +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 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+m4.b38ed60ffea1a09d5f57a79eab2fc576b64f38c5e871bf1395b64829322d2709
-#+libmd.0678c13ebf60867e229f9e0bee910f6bc3c7c7458aaa5fca513691da5c859c2e
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+m4.3e1bd43513a03b656cff43101e0084ea4d21508d79c8e1d85d711455314508c7
+#+libmd.f73e58052491acf1ff0ad5cf0b52ebb331cb149b9d15298140662f825b9846be
 #@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:.
 
 
@@ -63,6 +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 LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
diff --git a/variants/ccx-x86_64/libcap b/variants/ccx-x86_64/libcap
@@ -1,44 +1,46 @@
 #!/usr/bin/env pthbs-build
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+pkgconf-pkg-config.c1a9f7d82167c9bb3e81e02aecb1e70e008eba1baeeac105b295fe118cab1fdd
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+pkgconf-pkg-config.652821c31e2ebaa4f95a1a83f2dea31a62ff60bfc77590543198d2ed37115be1
 #@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 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.34634128d8e3c128d962de9027a8246e908c6852a54ba46075a3be0639b1d0e8
-#+gnu-make.aec55aaebe092e32a5684107e717636469632e626abd9ccde8ee014b6b9f3528
-#+busybox.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+nawk.333d5fb08091dff9b4012b7ff3c846c07579fe04ee66aa65eeb8dda7e9caabc0
+#+musl-cross-make.363da45526527aac5f37d0770fa78e454d0a7664f3c1042e9bdd14680d67b79e
+#+gnu-make.7e359c54f7829391a5095ac8c288230eb9bc5feb032b4ab41b3ae34e259a80a6
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
 #@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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+m4.b38ed60ffea1a09d5f57a79eab2fc576b64f38c5e871bf1395b64829322d2709
-#+flex.37e656a6152b2bf1f6ad605702ab066d52d2fad0ef579ea8f1ed41921045bb8d
-#+bison.80145468e33fa5be3e6d7cd01e84d6bfa13dc40149e9483157541fd762661cb7
-#+musl-fts.2b161f507180ac49000e0ba367fd31930e328ab0b3745a0378a3a586a6e28962
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+m4.3e1bd43513a03b656cff43101e0084ea4d21508d79c8e1d85d711455314508c7
+#+flex.876444ede8e785cda0d73fe830a2704b02a4e1d854481e59ffdffbe169a98840
+#+bison.0cc6df5b7ea8216323721f2134e6fad8adc28ca3c1801945d689b02d7b537e00
+#+musl-fts.97e80c10e26163217a08753f6b9f364c21d15148edeb4de6564754112b3c6c2c
 #@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:.
 
 
@@ -65,6 +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 LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
diff --git a/variants/ccx-x86_64/libelf b/variants/ccx-x86_64/libelf
@@ -1,44 +1,46 @@
 #!/usr/bin/env pthbs-build
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+zstd.b9ffad24deb43d62222ff3e100c4059c2e695157111c958628cee0ef931c1791
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+zstd.710b62ae5807615b4b2b81554d87f293ef95fe4842858d0a22121bef6d29ce14
 #@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 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+m4.b38ed60ffea1a09d5f57a79eab2fc576b64f38c5e871bf1395b64829322d2709
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+m4.3e1bd43513a03b656cff43101e0084ea4d21508d79c8e1d85d711455314508c7
 #@untar:-J:sha256:1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332:.
 
 
@@ -62,6 +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 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+m4.b38ed60ffea1a09d5f57a79eab2fc576b64f38c5e871bf1395b64829322d2709
-#+ca-certificates-wip-donotuse.e04c1808c24564d5acc30c9f956ffad17c1d9007c5a2ab4b860e12b02a79d2d4
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+m4.3e1bd43513a03b656cff43101e0084ea4d21508d79c8e1d85d711455314508c7
+#+ca-certificates-wip-donotuse.f8bc93944177c4acedfc0ea2aaf7849938a1486b576fae584fea9a19507e287b
 #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c
 #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:.
 
@@ -64,6 +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 LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
@@ -101,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.e04c1808c24564d5acc30c9f956ffad17c1d9007c5a2ab4b860e12b02a79d2d4/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
+cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.f8bc93944177c4acedfc0ea2aaf7849938a1486b576fae584fea9a19507e287b/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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+m4.b38ed60ffea1a09d5f57a79eab2fc576b64f38c5e871bf1395b64829322d2709
-#+pkgconf-pkg-config.c1a9f7d82167c9bb3e81e02aecb1e70e008eba1baeeac105b295fe118cab1fdd
-#+gperf.e5a7641cc419e48948abee63a0b683fee701795f2855f74c12acbc190b728ad7
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+m4.3e1bd43513a03b656cff43101e0084ea4d21508d79c8e1d85d711455314508c7
+#+pkgconf-pkg-config.652821c31e2ebaa4f95a1a83f2dea31a62ff60bfc77590543198d2ed37115be1
+#+gperf.396e3a84d795833efa1da05c7673790e1fc7720cc988d87e89134fd02b9c8d81
 #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:.
 
 
@@ -64,6 +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 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+m4.b38ed60ffea1a09d5f57a79eab2fc576b64f38c5e871bf1395b64829322d2709
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+m4.3e1bd43513a03b656cff43101e0084ea4d21508d79c8e1d85d711455314508c7
 #@untar:-z:sha256:ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157:.
 
 
@@ -62,6 +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 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-modutils.7f5e29f39dcb0b06e40e57f042b352c5a73e923fa44477c0165282b09ec5ff2c
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+findutils.88ba358b7b2ff564664303f5e2e55ac2db9ad1a7b5f6391a705f625de23ddfb5
-#+diffutils.9a051c85d5055f122a096dc443299e065345d6ac521c1654667ad8e88393e87d
-#+patch.ae7492228d69152bfaa0183750edd3cc0a74226ff2436a39e1718547035eab5d
-#+flex.37e656a6152b2bf1f6ad605702ab066d52d2fad0ef579ea8f1ed41921045bb8d
-#+bison.80145468e33fa5be3e6d7cd01e84d6bfa13dc40149e9483157541fd762661cb7
-#+rsync.2936e4f725a9c6ba9ed8006b0959baa0f6bda147dfdd52946fe341a87690b80a
-#+zstd.b9ffad24deb43d62222ff3e100c4059c2e695157111c958628cee0ef931c1791
-#+libelf.87bb4b3f1287e54d0c650db6c3430cb5fd0412fd4ef6161aa278b2f9b8e95e5d
-#+pkgconf-pkg-config.c1a9f7d82167c9bb3e81e02aecb1e70e008eba1baeeac105b295fe118cab1fdd
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-modutils.37a3d146d36312afc503abb3785ae24539711772f826328ad9f330bace5e8087
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+findutils.2598e20961b91dafb2dc243abb65d53a9e9671391124790328fcddd9b293f19b
+#+diffutils.a671ca2f3d74e5d715dad78029e6ca657c8f17d474bf6e225e13606d6be43f36
+#+patch.5557660270847d7de668356fc2dea208575218d87f439624d6b1db9030e60dac
+#+flex.876444ede8e785cda0d73fe830a2704b02a4e1d854481e59ffdffbe169a98840
+#+bison.0cc6df5b7ea8216323721f2134e6fad8adc28ca3c1801945d689b02d7b537e00
+#+rsync.c61887c79312743c999cf09585fb922f3e31f66599ac42dd470a95451c0b888b
+#+zstd.710b62ae5807615b4b2b81554d87f293ef95fe4842858d0a22121bef6d29ce14
+#+libelf.506d8fd295c5972552b0b221a6516e21995b6ac9c9ef533af98f18f00d0e91f0
+#+pkgconf-pkg-config.652821c31e2ebaa4f95a1a83f2dea31a62ff60bfc77590543198d2ed37115be1
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
 #@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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-modutils.7f5e29f39dcb0b06e40e57f042b352c5a73e923fa44477c0165282b09ec5ff2c
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+findutils.88ba358b7b2ff564664303f5e2e55ac2db9ad1a7b5f6391a705f625de23ddfb5
-#+diffutils.9a051c85d5055f122a096dc443299e065345d6ac521c1654667ad8e88393e87d
-#+patch.ae7492228d69152bfaa0183750edd3cc0a74226ff2436a39e1718547035eab5d
-#+flex.37e656a6152b2bf1f6ad605702ab066d52d2fad0ef579ea8f1ed41921045bb8d
-#+bison.80145468e33fa5be3e6d7cd01e84d6bfa13dc40149e9483157541fd762661cb7
-#+rsync.2936e4f725a9c6ba9ed8006b0959baa0f6bda147dfdd52946fe341a87690b80a
-#+zstd.b9ffad24deb43d62222ff3e100c4059c2e695157111c958628cee0ef931c1791
-#+libelf.87bb4b3f1287e54d0c650db6c3430cb5fd0412fd4ef6161aa278b2f9b8e95e5d
-#+pkgconf-pkg-config.c1a9f7d82167c9bb3e81e02aecb1e70e008eba1baeeac105b295fe118cab1fdd
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-modutils.37a3d146d36312afc503abb3785ae24539711772f826328ad9f330bace5e8087
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+findutils.2598e20961b91dafb2dc243abb65d53a9e9671391124790328fcddd9b293f19b
+#+diffutils.a671ca2f3d74e5d715dad78029e6ca657c8f17d474bf6e225e13606d6be43f36
+#+patch.5557660270847d7de668356fc2dea208575218d87f439624d6b1db9030e60dac
+#+flex.876444ede8e785cda0d73fe830a2704b02a4e1d854481e59ffdffbe169a98840
+#+bison.0cc6df5b7ea8216323721f2134e6fad8adc28ca3c1801945d689b02d7b537e00
+#+rsync.c61887c79312743c999cf09585fb922f3e31f66599ac42dd470a95451c0b888b
+#+zstd.710b62ae5807615b4b2b81554d87f293ef95fe4842858d0a22121bef6d29ce14
+#+libelf.506d8fd295c5972552b0b221a6516e21995b6ac9c9ef533af98f18f00d0e91f0
+#+pkgconf-pkg-config.652821c31e2ebaa4f95a1a83f2dea31a62ff60bfc77590543198d2ed37115be1
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
 #@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.34634128d8e3c128d962de9027a8246e908c6852a54ba46075a3be0639b1d0e8
-#+gnu-make.aec55aaebe092e32a5684107e717636469632e626abd9ccde8ee014b6b9f3528
-#+busybox.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+nawk.333d5fb08091dff9b4012b7ff3c846c07579fe04ee66aa65eeb8dda7e9caabc0
-#+skalibs.7ee254b44f67ed6ef6e4fad472aff982a905fd63ff567efd26ff5d255f659136
-#+execline.14a92c31eab7c6f2f8a4c38520320d7449f1e7492d354189f6efccef4924b2de
-#+libcap.f0d39da70ac0f6f8539bc79ce7203e7fb50f2ec46a8270870859af8207343fc2
+#+musl-cross-make.363da45526527aac5f37d0770fa78e454d0a7664f3c1042e9bdd14680d67b79e
+#+gnu-make.7e359c54f7829391a5095ac8c288230eb9bc5feb032b4ab41b3ae34e259a80a6
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
+#+skalibs.9188c60dffffbd4cd629bbf304e048c78abe8ebcf25765ac3a0ab39e3e2e314a
+#+execline.cbf9c232c7f3e5a5b6a68fbe18cc1beb6452c83e515e2e91df042944a339cbdf
+#+libcap.1824a77998053741e4fe4bfa500bc5df79c0558470a0d5c9a17146292f63b78e
 #@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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+zsh.18c555bf0c5f5c5f5b9f9b2a6c41598f3263a98486fd8dc6093cd0249d760ba2
-#+pthbs-banginstall.20e5ac5777e73f3e8d828b781725ef0817c49b2edf7ef99bd809080ff9b53e0b
-#+execline.e3f3b3c8842ec7bc726c55776e121afe6c3b66aab17352c7b8ce1be95cebd71b
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+ccx-utils.223610778f1d536eefeb1bdfc88c0eca25b2dfdd84ae13d11742ae79f4925d33
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+zsh.057868ea48812b41739c94bc6a0f8da6ed951681a62ea6ce2d4a23a783d06ce9
+#+pthbs-banginstall.84944d58ad6aae47612623ded72158b3d3e274ff012dd88db303686b6f364365
+#+execline.a4658f442ed6e60530cde701afc6e777f6909679fc1e8fc9492a58cd56761c77
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+ccx-utils.7bcd7c863a7a7f773ed98939d9a99b315d761fe4668a33929b4aec445ab84549
 #@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.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+nawk.333d5fb08091dff9b4012b7ff3c846c07579fe04ee66aa65eeb8dda7e9caabc0
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
 
 
@@ -61,6 +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 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.34634128d8e3c128d962de9027a8246e908c6852a54ba46075a3be0639b1d0e8
-#+gnu-make.aec55aaebe092e32a5684107e717636469632e626abd9ccde8ee014b6b9f3528
-#+busybox.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+nawk.333d5fb08091dff9b4012b7ff3c846c07579fe04ee66aa65eeb8dda7e9caabc0
+#+musl-cross-make.363da45526527aac5f37d0770fa78e454d0a7664f3c1042e9bdd14680d67b79e
+#+gnu-make.7e359c54f7829391a5095ac8c288230eb9bc5feb032b4ab41b3ae34e259a80a6
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
 
 
@@ -32,6 +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 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
 #@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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+zsh.18c555bf0c5f5c5f5b9f9b2a6c41598f3263a98486fd8dc6093cd0249d760ba2
-#+pthbs-banginstall.20e5ac5777e73f3e8d828b781725ef0817c49b2edf7ef99bd809080ff9b53e0b
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+zsh.057868ea48812b41739c94bc6a0f8da6ed951681a62ea6ce2d4a23a783d06ce9
+#+pthbs-banginstall.84944d58ad6aae47612623ded72158b3d3e274ff012dd88db303686b6f364365
 #@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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+skalibs.45b697b31beb1f3b2d4c5fd78216d30ae31190e869f7f8745980fb502302cc6c
-#+execline.e3f3b3c8842ec7bc726c55776e121afe6c3b66aab17352c7b8ce1be95cebd71b
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+skalibs.f3f639ae58dbc34c732bcd02b9791c5a3f0272c59e7605f8f16595b3116df208
+#+execline.a4658f442ed6e60530cde701afc6e777f6909679fc1e8fc9492a58cd56761c77
 #@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd
 
 
@@ -49,7 +49,7 @@ cd 'mdevd'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.45b697b31beb1f3b2d4c5fd78216d30ae31190e869f7f8745980fb502302cc6c/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.f3f639ae58dbc34c732bcd02b9791c5a3f0272c59e7605f8f16595b3116df208/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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-dosfstools.3b07d4970844246538d5c08763ec57c56f9963e44013479610d950ef0bf9be68
-#+busybox-e2fsprogs.80b6af3d856d840824891f904fe7f259dee03045475ceeb3c7dd11cd092005a2
-#+busybox-iproute2.b58f15841af75ef3102a718ea4eb6b69ddfe2eca9355d63f53d304760fa1f2ac
-#+busybox-iputils.df3c7684bc3a71f00f9333c70ccd7931253d75d6af68f3a1eb3304fc1530754a
-#+busybox-net-misc.97cee1851eb00b65d60a0322dfce0dde1758069345e20fd0943b1cf8a967230c
-#+busybox-net-tools.9dad3928df16a9c0c19380b1563419fe9013a3f2fdedbc087bf959edbdf541fa
-#+busybox-traceroute.626cc03c9309af2e6da9764486c7f37aca68655ad4028219c9046b21cdbf0ad8
-#+busybox-wget.dfecd481358e3be308cfccbae06a205c179d1454dacc17a0a19d4f341a999b0a
-#+busybox-chpst.6b228b94b35258b6925b6f4b41c08027755bfcdf097522716679359fb74268e8
-#+busybox-console.a3fae472e5eb70be7b109e6f0fdd40483fa8ba99fa065fa5d6e3566da4d1d75a
-#+busybox-getty.1e6fded52616d20dba493de51208394a8da9e3fd6f80ff58e1f9a3f9b4a74b89
-#+busybox-i2c-tools.9ea05daf881c103213d8b6287479133b4d36fe0a62149c32bb1c78a999c2fbc8
-#+busybox-linux-extra.de992405ee5deace9608fc21f8e4ca8b8330740fd6483e640effd2b32be1b81b
-#+busybox-mtd-utils.0051966b109c1cc762c62967187cadf84209f4dd63c26c615eac1f8b903d3083
-#+busybox-shadow.ec57e3f86ac3a7a6c96c2814a4eb2cf8b4322a78f4bd13d287b9da3da9a8cb93
-#+busybox-su.745ee52adbebf63523412f53f65b114c391b6a5777c0c33a941d71135a7f7228
-#+busybox-util-linux-priv.7245c21eded17e163f55ed4289c1258d807b5a661bc6a59046baf3682054c772
-#+busybox-logging.50bef788ce9cad7126b03d255879dc06cbcdc7b92e4906972c19756a0fd5742d
-#+busybox-cron.20bea026a7b215e23ab3f6cfb73cb35b1300cbe069dfbe91e8568217fe6a1506
-#+execline.e3f3b3c8842ec7bc726c55776e121afe6c3b66aab17352c7b8ce1be95cebd71b
-#+s6.dcf16e70cf77b51db10172aa0aed80cfbf707768fcea10963cbd4a73b9411c78
-#+mdev-scripts.e722f90fbb2c7ce7174be1098f50edd0e797a810015fc9e7f30c4047976c266c
-#+mdevd.5886ce29fd48c8fb9497b44633f622edfd39b0c3453ed11de8955532c2d234f0
-#+busybox.d8eb5ce5039208a2e46e2d7c3375605a9241d1bfbaa6413dbfa1757d6b64ead1-
\ No newline at end of file
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-dosfstools.46839c69e3ed18254f53762d20df008d95bdc2e819164568707f033febc08d7e
+#+busybox-e2fsprogs.9cc251ffec2f59d8fbadacc1d6291a9e4f0cb7ac714dfab2457dcb1a15d1c5c8
+#+busybox-iproute2.7cc94775547fcf5d1eb54671a34b00338908fd0d987bfc1da7d73ab3b32d7e8a
+#+busybox-iputils.13c494c9bc1958d249c4c6a6958d24ae676bb87ba1dd5997b3ae6ed4ca0662b5
+#+busybox-net-misc.36ea542042d1fba14d03a48c57752107f992c544b4e7fe3ea0ea876f470b7391
+#+busybox-net-tools.3ce4197f5d1f036f0f87ce02f1d5b82a879517c6c16ff98d880f306d43e96271
+#+busybox-traceroute.b70675fd3b29af5b2f6e93d9cac4e86364cae556b5db2575a7f531b4480efda1
+#+busybox-wget.6a661b9479402379c9d0f2e068151fc62b57d01796ee81b1e285a4519d019a9b
+#+busybox-chpst.1dade3b1fb4a2a68c148872af2318725946bfc62f7dc95843c6bcfaad9a721b0
+#+busybox-console.29378cfd34077da4fea08b7c4c6f8d153c662add36e4aace9234f3959314988f
+#+busybox-getty.357c8a64b56672ebdd2f0fd3b09e54f989768b4d60c1bdb4eedc11720d930679
+#+busybox-i2c-tools.f7a77ce59583a14c72f18ed908f33bf9cd07c0cc072149140e782341f5dfd227
+#+busybox-linux-extra.f17fb1ca015cf81185b578ffc8453ca77c01490b62e99a8849d9d67d7bd6c8f6
+#+busybox-mtd-utils.1ab41a1bfab417082471980932fab87a28275809c15e3bbf7921a4ab38b7b657
+#+busybox-shadow.38dba9565aa8305ffcc962c7422193c90996508e0d7ec0c07d8cfc47a36b8b10
+#+busybox-su.0dfdccfb99cf9aa8b2570d7742dd0aee77237d279943543f7477b8f3da240241
+#+busybox-util-linux-priv.3368741fb0581b4865974e41d562ea4b3389dac456b27080da96fb41709fcbc0
+#+busybox-logging.a68be6fb5bd8854f736c9c4b2e6e91b6356eca63cffdc9f5bbd2a250546fcc2f
+#+busybox-cron.ffddbd413744596d5110757dd1b8905cfbb6ea5785b99e8d32a5cfe64fe83bbc
+#+execline.a4658f442ed6e60530cde701afc6e777f6909679fc1e8fc9492a58cd56761c77
+#+s6.28d26067984c57e64d05677a5f2d3cd6495380a7f2e4fff7742dca8783422bd5
+#+mdev-scripts.49b608f51d4a3cf1aa593f2389a85bfc7ba80a7773fe8eea18ea4c7634674e3d
+#+mdevd.d19703e5d9576aea60311315656583a6e86e4fcedf5a594816015b3f0a463eed
+#+busybox.034c9dc6ca5c574a2bc23d2370bcdefe252032a40f13180a25480972badbc091+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/mlog b/variants/ccx-x86_64/mlog
@@ -1,42 +1,44 @@
 #!/usr/bin/env pthbs-build
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
 #@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 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.34634128d8e3c128d962de9027a8246e908c6852a54ba46075a3be0639b1d0e8
-#+gnu-make.aec55aaebe092e32a5684107e717636469632e626abd9ccde8ee014b6b9f3528
-#+busybox.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+m4.e492b2846bbfb7a5a69e55d67054a6298da3ad7444fdacffd97a048480717b02
-#+nawk.333d5fb08091dff9b4012b7ff3c846c07579fe04ee66aa65eeb8dda7e9caabc0
-#+gmp.bd669d14733b4fb2ab75a685bbebbc7a00b698a3b5dbe0e1800587836d4cd2ed
-#+mpfr.1f13a620c4d8fc4a29662577cfd890fa81748d3204b3d5b8ededc1e5309e0c77
+#+musl-cross-make.363da45526527aac5f37d0770fa78e454d0a7664f3c1042e9bdd14680d67b79e
+#+gnu-make.7e359c54f7829391a5095ac8c288230eb9bc5feb032b4ab41b3ae34e259a80a6
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+m4.257f1534f2ce0186257279c3dbf9790f9ae6e3a48e8bc139b16aa129fbac5240
+#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
+#+gmp.9c2c1279ae83f76a4dcf001f969f900bab6306ab78c0b11ca0951929a868a2ce
+#+mpfr.ceef5ad29fb44c1fdbf10431f6146f3202985bff82e023caa3a0fa933dceec27
 #@untar:-z:sha256:ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8:.
 
 
@@ -35,6 +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 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.34634128d8e3c128d962de9027a8246e908c6852a54ba46075a3be0639b1d0e8
-#+gnu-make.aec55aaebe092e32a5684107e717636469632e626abd9ccde8ee014b6b9f3528
-#+busybox.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+m4.e492b2846bbfb7a5a69e55d67054a6298da3ad7444fdacffd97a048480717b02
-#+nawk.333d5fb08091dff9b4012b7ff3c846c07579fe04ee66aa65eeb8dda7e9caabc0
-#+gmp.bd669d14733b4fb2ab75a685bbebbc7a00b698a3b5dbe0e1800587836d4cd2ed
+#+musl-cross-make.363da45526527aac5f37d0770fa78e454d0a7664f3c1042e9bdd14680d67b79e
+#+gnu-make.7e359c54f7829391a5095ac8c288230eb9bc5feb032b4ab41b3ae34e259a80a6
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+m4.257f1534f2ce0186257279c3dbf9790f9ae6e3a48e8bc139b16aa129fbac5240
+#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
+#+gmp.9c2c1279ae83f76a4dcf001f969f900bab6306ab78c0b11ca0951929a868a2ce
 #@untar:-J:sha256:b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01:.
 
 
@@ -34,6 +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 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.34634128d8e3c128d962de9027a8246e908c6852a54ba46075a3be0639b1d0e8
-#+gnu-make.aec55aaebe092e32a5684107e717636469632e626abd9ccde8ee014b6b9f3528
-#+busybox.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+nawk.333d5fb08091dff9b4012b7ff3c846c07579fe04ee66aa65eeb8dda7e9caabc0
+#+musl-cross-make.363da45526527aac5f37d0770fa78e454d0a7664f3c1042e9bdd14680d67b79e
+#+gnu-make.7e359c54f7829391a5095ac8c288230eb9bc5feb032b4ab41b3ae34e259a80a6
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
 #@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.34634128d8e3c128d962de9027a8246e908c6852a54ba46075a3be0639b1d0e8
+mcm=/home/ccx/versions/musl-cross-make.363da45526527aac5f37d0770fa78e454d0a7664f3c1042e9bdd14680d67b79e
 
 ./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.34634128d8e3c128d962de9027a8246e908c6852a54ba46075a3be0639b1d0e8
-#+gnu-make.aec55aaebe092e32a5684107e717636469632e626abd9ccde8ee014b6b9f3528
-#+busybox.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
+#+musl-cross-make.363da45526527aac5f37d0770fa78e454d0a7664f3c1042e9bdd14680d67b79e
+#+gnu-make.7e359c54f7829391a5095ac8c288230eb9bc5feb032b4ab41b3ae34e259a80a6
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
 #@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.333d5fb08091dff9b4012b7ff3c846c07579fe04ee66aa65eeb8dda7e9caabc0
+#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
 #@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
@@ -40,7 +40,7 @@ EOF
 
 printf '%s\n' >>config.mak \
 	"bbin=$bootstrap/bin" \
-	"repro=-ffile-prefix-map=$(realpath ..)=builddir" '
+	"repro=-ffile-prefix-map=${workdir}=builddir" '
 LINUX_VER=6.15.7
 st=-static --static
 fl=-g0 -O2 ${st} ${repro}
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.84898b757dbaac4798cdf42674f90ac2c88ba1d5d44d4978267ca33cdecbedcf
-#+gnu-make.afdc243f050ed6c15aac1d4a9bfc090c15f0535514894841379b590617e28001
-#+busybox.657e98b7dd88d5f7caa5ee8303e52ad8649a9da3f5e8db31c7c20bc5d1ea90f9
-#+nawk.333d5fb08091dff9b4012b7ff3c846c07579fe04ee66aa65eeb8dda7e9caabc0
+#+musl-cross-make.e4db999a4586836d858df99d45eee1aaa59d4fed1a5fa24f0365db08cddb59de
+#+gnu-make.aa211b51bd7f8182794c40f039947bdf19ade8460ebfc071f9f33e6fb91a968e
+#+busybox.5792386228c725ccfeffe301dd3918f307e1f4d1391f7bdef45910089bdea8cc
+#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
 #@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.333d5fb08091dff9b4012b7ff3c846c07579fe04ee66aa65eeb8dda7e9caabc0
+#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
 #@sha256:0cdd76777a0dfd3dd3a63f215f030208ddb91c2361d2bcc02acec0f1c16b6a2e:musl-cross-make/sources/binutils-2.44.tar.gz
 #@sha256:a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898:musl-cross-make/sources/gmp-6.3.0.tar.xz
 #@sha256:b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01:musl-cross-make/sources/mpfr-4.2.2.tar.xz
diff --git a/variants/ccx-x86_64/musl-fts b/variants/ccx-x86_64/musl-fts
@@ -1,42 +1,44 @@
 #!/usr/bin/env pthbs-build
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
 #@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 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.333d5fb08091dff9b4012b7ff3c846c07579fe04ee66aa65eeb8dda7e9caabc0
-#+bison.80145468e33fa5be3e6d7cd01e84d6bfa13dc40149e9483157541fd762661cb7
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
+#+bison.0cc6df5b7ea8216323721f2134e6fad8adc28ca3c1801945d689b02d7b537e00
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
 #@untar:-z:sha256:e031b1e1d2b230f276f975bffb923f0ea15f798c839d15a3f26a1a39448e32d7:.
 
 
diff --git a/variants/ccx-x86_64/nawk:bootstrap b/variants/ccx-x86_64/nawk:bootstrap
@@ -11,6 +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 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
 #@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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+m4.b38ed60ffea1a09d5f57a79eab2fc576b64f38c5e871bf1395b64829322d2709
-#+netbsd-curses.4fc582669f1e5eac42515aaeb667d50a2c64a8a9dc47f51e5cb6487cceb8e01a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+m4.3e1bd43513a03b656cff43101e0084ea4d21508d79c8e1d85d711455314508c7
+#+netbsd-curses.1ba971dbc1ba9342fc5dfa9b13c37e54374f0ddb458c0aa3a152893ca3000979
 #@untar:-z:sha256:755b87aa1e25c24c4c1668de5573d7d9a327b529423ce3ad9ee753bfb2296e33:.
 
 
@@ -63,6 +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 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+ocaml.edf0818febf189032988af4412256bdc0546c7597e8791c956cafae0f631d327
-#+ocaml-findlib.8bc2afe8c8f0e4d8a87ed9b07db797fc14d5fa56a4e40d82ae2bfada0c5feed0
-#+ocamlbuild.e34f2111ddb6a94ac462582ed5aa1ed5e2170ee06b7db8fb3ceb7f41cf655e05
-#+opam.d54568e589a0e2bf082b7d216fe0baab67f80b8de2fddb47395e461a212d3ce5
-#+ocaml-topkg.4685677081a736b317aabe53c19cdbf570ed4e3a13f81a57822bad5bc4d3b555
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+ocaml.b3da28f54c7f8c17ed8383c61bdcdbc0b7787d5b8c7c4e3acde60b592b678114
+#+ocaml-findlib.21fc9f1ec0dda2eb0ef49381ec01a7010fd58b1b6c47cf87402230721e5e3a0b
+#+ocamlbuild.8f8f9beeea823113776b99eae47dfa369f743eb5cb7458917e97735393e4fc92
+#+opam.ad227c2bdbd5193a8b51621200ebf46c7e7a5d1180b5644bcfe24d9bd6baa80e
+#+ocaml-topkg.8eb9ee083a9c8e0a35ec7608c0ab44dfb274f15facdf56340259194b547fe5cd
 #@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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+ocaml.edf0818febf189032988af4412256bdc0546c7597e8791c956cafae0f631d327
-#+dune.bf2642012aa8db589a512e116496e2c6378f5309b4e933329b39f0cd258ea384
-#+ocaml_intrinsics_kernel.361fc4f9d2e09c12bbebc87eea47cdce9ed81dfe197a85347d83da9dee06e546
-#+ocaml-sexplib0.fc1865d7d7117db2d4dca3be5748768349358ade588f506be20edf6521a61c62
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+ocaml.b3da28f54c7f8c17ed8383c61bdcdbc0b7787d5b8c7c4e3acde60b592b678114
+#+dune.1276972092eb789a2300033e7213ca12a71d026666ae2b5f6a8c4ff10310d53a
+#+ocaml_intrinsics_kernel.de58aaedcb4c0b6876da919577927178a263a3b8f38370a7208198050ad1660d
+#+ocaml-sexplib0.7282b44603301326b39befd2d205faf32839848a3e64e31a76b161dbcf96db68
 #@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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+ocaml.edf0818febf189032988af4412256bdc0546c7597e8791c956cafae0f631d327
-#+ocaml-findlib.8bc2afe8c8f0e4d8a87ed9b07db797fc14d5fa56a4e40d82ae2bfada0c5feed0
-#+ocamlbuild.e34f2111ddb6a94ac462582ed5aa1ed5e2170ee06b7db8fb3ceb7f41cf655e05
-#+opam.d54568e589a0e2bf082b7d216fe0baab67f80b8de2fddb47395e461a212d3ce5
-#+ocaml-topkg.4685677081a736b317aabe53c19cdbf570ed4e3a13f81a57822bad5bc4d3b555
-#+ocaml-astring.a65289182740bd960e132bacb334ad7f8ccb2ea4699e738a1f417a5b58291a17
-#+ocaml-fpath.ca1f616e5031c011170d170f575d4127864c91d56e1388848c6b4a2155316044
-#+ocaml-rresult.584f1902f7cdf4659995fc6c54f3d41870df484d87072db3b039a28425eee1a8
-#+ocaml-fmt.5bc99459e1805acc48047f375b5a9f709a43f4f02ed2d78efe0dae862fb53dae
-#+ocaml-logs.2905d1e12d8e659d9da7ca33fd9f378014b486a54e804c12dd51812ad53330fb
-#+ocaml-mtime.b0c41e1e0fa1c11debb780c9a6173cf525dbf743d5013594bed2ea7222dd606a
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+ocaml.b3da28f54c7f8c17ed8383c61bdcdbc0b7787d5b8c7c4e3acde60b592b678114
+#+ocaml-findlib.21fc9f1ec0dda2eb0ef49381ec01a7010fd58b1b6c47cf87402230721e5e3a0b
+#+ocamlbuild.8f8f9beeea823113776b99eae47dfa369f743eb5cb7458917e97735393e4fc92
+#+opam.ad227c2bdbd5193a8b51621200ebf46c7e7a5d1180b5644bcfe24d9bd6baa80e
+#+ocaml-topkg.8eb9ee083a9c8e0a35ec7608c0ab44dfb274f15facdf56340259194b547fe5cd
+#+ocaml-astring.fe07551a8d760950f5178e089b8c03034b692916726d3bfabf2ae57141421663
+#+ocaml-fpath.8dd7acefe9a6a9c79122d331ee85f17f3e2675ea1fcff4d3ef2823cc47016edd
+#+ocaml-rresult.568a604d24baa3297146d0569da062213a78453bf49f427ed93c854e6a10eafa
+#+ocaml-fmt.9eee079f3d479bc6078377b5923f9f52d250c80a9e7de93b0b84bbddcd987837
+#+ocaml-logs.dc0edbec9b5c0775a0d46268785632783f7fc111b0ec77087af2cc33561ef345
+#+ocaml-mtime.f7ca333abecb29971ba469d65fe861a2bbee4d0f683c5eb53b40773b95f964cd
 #@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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+ocaml.edf0818febf189032988af4412256bdc0546c7597e8791c956cafae0f631d327
-#+ocaml-findlib.8bc2afe8c8f0e4d8a87ed9b07db797fc14d5fa56a4e40d82ae2bfada0c5feed0
-#+ocamlbuild.e34f2111ddb6a94ac462582ed5aa1ed5e2170ee06b7db8fb3ceb7f41cf655e05
-#+opam.d54568e589a0e2bf082b7d216fe0baab67f80b8de2fddb47395e461a212d3ce5
-#+ocaml-topkg.4685677081a736b317aabe53c19cdbf570ed4e3a13f81a57822bad5bc4d3b555
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+ocaml.b3da28f54c7f8c17ed8383c61bdcdbc0b7787d5b8c7c4e3acde60b592b678114
+#+ocaml-findlib.21fc9f1ec0dda2eb0ef49381ec01a7010fd58b1b6c47cf87402230721e5e3a0b
+#+ocamlbuild.8f8f9beeea823113776b99eae47dfa369f743eb5cb7458917e97735393e4fc92
+#+opam.ad227c2bdbd5193a8b51621200ebf46c7e7a5d1180b5644bcfe24d9bd6baa80e
+#+ocaml-topkg.8eb9ee083a9c8e0a35ec7608c0ab44dfb274f15facdf56340259194b547fe5cd
 #@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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+ocaml.edf0818febf189032988af4412256bdc0546c7597e8791c956cafae0f631d327
-#+dune.bf2642012aa8db589a512e116496e2c6378f5309b4e933329b39f0cd258ea384
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+ocaml.b3da28f54c7f8c17ed8383c61bdcdbc0b7787d5b8c7c4e3acde60b592b678114
+#+dune.1276972092eb789a2300033e7213ca12a71d026666ae2b5f6a8c4ff10310d53a
 #@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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+ocaml.edf0818febf189032988af4412256bdc0546c7597e8791c956cafae0f631d327
-#+dune.bf2642012aa8db589a512e116496e2c6378f5309b4e933329b39f0cd258ea384
-#+ocamlbuild.e34f2111ddb6a94ac462582ed5aa1ed5e2170ee06b7db8fb3ceb7f41cf655e05
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+ocaml.b3da28f54c7f8c17ed8383c61bdcdbc0b7787d5b8c7c4e3acde60b592b678114
+#+dune.1276972092eb789a2300033e7213ca12a71d026666ae2b5f6a8c4ff10310d53a
+#+ocamlbuild.8f8f9beeea823113776b99eae47dfa369f743eb5cb7458917e97735393e4fc92
 #@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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+m4.b38ed60ffea1a09d5f57a79eab2fc576b64f38c5e871bf1395b64829322d2709
-#+netbsd-curses.4fc582669f1e5eac42515aaeb667d50a2c64a8a9dc47f51e5cb6487cceb8e01a
-#+ocaml.edf0818febf189032988af4412256bdc0546c7597e8791c956cafae0f631d327
-#+ocamlbuild.e34f2111ddb6a94ac462582ed5aa1ed5e2170ee06b7db8fb3ceb7f41cf655e05
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+m4.3e1bd43513a03b656cff43101e0084ea4d21508d79c8e1d85d711455314508c7
+#+netbsd-curses.1ba971dbc1ba9342fc5dfa9b13c37e54374f0ddb458c0aa3a152893ca3000979
+#+ocaml.b3da28f54c7f8c17ed8383c61bdcdbc0b7787d5b8c7c4e3acde60b592b678114
+#+ocamlbuild.8f8f9beeea823113776b99eae47dfa369f743eb5cb7458917e97735393e4fc92
 #@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.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/home/ccx/versions/musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149/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.edf0818febf189032988af4412256bdc0546c7597e8791c956cafae0f631d327"
+stdlib="$pthbs_destdir/home/ccx/versions/ocaml.b3da28f54c7f8c17ed8383c61bdcdbc0b7787d5b8c7c4e3acde60b592b678114"
 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+ocaml.edf0818febf189032988af4412256bdc0546c7597e8791c956cafae0f631d327
-#+ocaml-findlib.8bc2afe8c8f0e4d8a87ed9b07db797fc14d5fa56a4e40d82ae2bfada0c5feed0
-#+ocamlbuild.e34f2111ddb6a94ac462582ed5aa1ed5e2170ee06b7db8fb3ceb7f41cf655e05
-#+opam.d54568e589a0e2bf082b7d216fe0baab67f80b8de2fddb47395e461a212d3ce5
-#+ocaml-topkg.4685677081a736b317aabe53c19cdbf570ed4e3a13f81a57822bad5bc4d3b555
-#+ocaml-cmdliner.5349c6969fa8b1558488c62a583dfa9b1a3dceec4664dadfe3af249b06132e26
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+ocaml.b3da28f54c7f8c17ed8383c61bdcdbc0b7787d5b8c7c4e3acde60b592b678114
+#+ocaml-findlib.21fc9f1ec0dda2eb0ef49381ec01a7010fd58b1b6c47cf87402230721e5e3a0b
+#+ocamlbuild.8f8f9beeea823113776b99eae47dfa369f743eb5cb7458917e97735393e4fc92
+#+opam.ad227c2bdbd5193a8b51621200ebf46c7e7a5d1180b5644bcfe24d9bd6baa80e
+#+ocaml-topkg.8eb9ee083a9c8e0a35ec7608c0ab44dfb274f15facdf56340259194b547fe5cd
+#+ocaml-cmdliner.3399571658a6954c06dc1683b8c0fb6a39809353a2058d22e3147f3602353688
 #@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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+ocaml.edf0818febf189032988af4412256bdc0546c7597e8791c956cafae0f631d327
-#+ocaml-findlib.8bc2afe8c8f0e4d8a87ed9b07db797fc14d5fa56a4e40d82ae2bfada0c5feed0
-#+ocamlbuild.e34f2111ddb6a94ac462582ed5aa1ed5e2170ee06b7db8fb3ceb7f41cf655e05
-#+opam.d54568e589a0e2bf082b7d216fe0baab67f80b8de2fddb47395e461a212d3ce5
-#+ocaml-topkg.4685677081a736b317aabe53c19cdbf570ed4e3a13f81a57822bad5bc4d3b555
-#+ocaml-astring.a65289182740bd960e132bacb334ad7f8ccb2ea4699e738a1f417a5b58291a17
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+ocaml.b3da28f54c7f8c17ed8383c61bdcdbc0b7787d5b8c7c4e3acde60b592b678114
+#+ocaml-findlib.21fc9f1ec0dda2eb0ef49381ec01a7010fd58b1b6c47cf87402230721e5e3a0b
+#+ocamlbuild.8f8f9beeea823113776b99eae47dfa369f743eb5cb7458917e97735393e4fc92
+#+opam.ad227c2bdbd5193a8b51621200ebf46c7e7a5d1180b5644bcfe24d9bd6baa80e
+#+ocaml-topkg.8eb9ee083a9c8e0a35ec7608c0ab44dfb274f15facdf56340259194b547fe5cd
+#+ocaml-astring.fe07551a8d760950f5178e089b8c03034b692916726d3bfabf2ae57141421663
 #@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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+ocaml.edf0818febf189032988af4412256bdc0546c7597e8791c956cafae0f631d327
-#+ocaml-findlib.8bc2afe8c8f0e4d8a87ed9b07db797fc14d5fa56a4e40d82ae2bfada0c5feed0
-#+ocamlbuild.e34f2111ddb6a94ac462582ed5aa1ed5e2170ee06b7db8fb3ceb7f41cf655e05
-#+opam.d54568e589a0e2bf082b7d216fe0baab67f80b8de2fddb47395e461a212d3ce5
-#+ocaml-topkg.4685677081a736b317aabe53c19cdbf570ed4e3a13f81a57822bad5bc4d3b555
-#+ocaml-mtime.b0c41e1e0fa1c11debb780c9a6173cf525dbf743d5013594bed2ea7222dd606a
-#+ocaml-cmdliner.5349c6969fa8b1558488c62a583dfa9b1a3dceec4664dadfe3af249b06132e26
-#+ocaml-fmt.5bc99459e1805acc48047f375b5a9f709a43f4f02ed2d78efe0dae862fb53dae
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+ocaml.b3da28f54c7f8c17ed8383c61bdcdbc0b7787d5b8c7c4e3acde60b592b678114
+#+ocaml-findlib.21fc9f1ec0dda2eb0ef49381ec01a7010fd58b1b6c47cf87402230721e5e3a0b
+#+ocamlbuild.8f8f9beeea823113776b99eae47dfa369f743eb5cb7458917e97735393e4fc92
+#+opam.ad227c2bdbd5193a8b51621200ebf46c7e7a5d1180b5644bcfe24d9bd6baa80e
+#+ocaml-topkg.8eb9ee083a9c8e0a35ec7608c0ab44dfb274f15facdf56340259194b547fe5cd
+#+ocaml-mtime.f7ca333abecb29971ba469d65fe861a2bbee4d0f683c5eb53b40773b95f964cd
+#+ocaml-cmdliner.3399571658a6954c06dc1683b8c0fb6a39809353a2058d22e3147f3602353688
+#+ocaml-fmt.9eee079f3d479bc6078377b5923f9f52d250c80a9e7de93b0b84bbddcd987837
 #@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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+ocaml.edf0818febf189032988af4412256bdc0546c7597e8791c956cafae0f631d327
-#+dune.bf2642012aa8db589a512e116496e2c6378f5309b4e933329b39f0cd258ea384
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+ocaml.b3da28f54c7f8c17ed8383c61bdcdbc0b7787d5b8c7c4e3acde60b592b678114
+#+dune.1276972092eb789a2300033e7213ca12a71d026666ae2b5f6a8c4ff10310d53a
 #@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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+ocaml.edf0818febf189032988af4412256bdc0546c7597e8791c956cafae0f631d327
-#+ocaml-findlib.8bc2afe8c8f0e4d8a87ed9b07db797fc14d5fa56a4e40d82ae2bfada0c5feed0
-#+ocamlbuild.e34f2111ddb6a94ac462582ed5aa1ed5e2170ee06b7db8fb3ceb7f41cf655e05
-#+opam.d54568e589a0e2bf082b7d216fe0baab67f80b8de2fddb47395e461a212d3ce5
-#+ocaml-topkg.4685677081a736b317aabe53c19cdbf570ed4e3a13f81a57822bad5bc4d3b555
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+ocaml.b3da28f54c7f8c17ed8383c61bdcdbc0b7787d5b8c7c4e3acde60b592b678114
+#+ocaml-findlib.21fc9f1ec0dda2eb0ef49381ec01a7010fd58b1b6c47cf87402230721e5e3a0b
+#+ocamlbuild.8f8f9beeea823113776b99eae47dfa369f743eb5cb7458917e97735393e4fc92
+#+opam.ad227c2bdbd5193a8b51621200ebf46c7e7a5d1180b5644bcfe24d9bd6baa80e
+#+ocaml-topkg.8eb9ee083a9c8e0a35ec7608c0ab44dfb274f15facdf56340259194b547fe5cd
 #@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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+ocaml.edf0818febf189032988af4412256bdc0546c7597e8791c956cafae0f631d327
-#+dune.bf2642012aa8db589a512e116496e2c6378f5309b4e933329b39f0cd258ea384
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+ocaml.b3da28f54c7f8c17ed8383c61bdcdbc0b7787d5b8c7c4e3acde60b592b678114
+#+dune.1276972092eb789a2300033e7213ca12a71d026666ae2b5f6a8c4ff10310d53a
 #@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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+ocaml.edf0818febf189032988af4412256bdc0546c7597e8791c956cafae0f631d327
-#+dune.bf2642012aa8db589a512e116496e2c6378f5309b4e933329b39f0cd258ea384
-#+ocaml-compiler-libs.77741fd8921fa3118b0e9f1b75a16a1d1ccd8f1e3678eb48424b0795dd6916e6
-#+ocaml-cppo.54a47e8c42cd7b286cc57a998d0937317a57cb569895e1fc55d734965a72bafd
-#+ocaml-findlib.8bc2afe8c8f0e4d8a87ed9b07db797fc14d5fa56a4e40d82ae2bfada0c5feed0
-#+ocaml-ppx_derivers.112bd2ec0e3b1f2ea55338b6b30f41e1bea78565048a25403ace44a3e742f58e
-#+ocaml-ppxlib.200354bae327ecfef7fead521c6f911e58bceb02dc982a05e2fbfc5086bcbd7c
-#+ocaml-sexplib0.fc1865d7d7117db2d4dca3be5748768349358ade588f506be20edf6521a61c62
-#+ocaml-stdlib-shims.33a6e99f40154f93f90de7503fc9652552cc2a106474bc8df703204275a90fec
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+ocaml.b3da28f54c7f8c17ed8383c61bdcdbc0b7787d5b8c7c4e3acde60b592b678114
+#+dune.1276972092eb789a2300033e7213ca12a71d026666ae2b5f6a8c4ff10310d53a
+#+ocaml-compiler-libs.5312b5287ae78bd84c241c933eff0ab74a4f161003d41e8f9af94103ab996636
+#+ocaml-cppo.b429df3f0af988f0de42b583e74dc04c531313524f4ad6e06140fb4aa6d5000e
+#+ocaml-findlib.21fc9f1ec0dda2eb0ef49381ec01a7010fd58b1b6c47cf87402230721e5e3a0b
+#+ocaml-ppx_derivers.749c575d0dd9ef6faf79e0f81ac6fbcd971179888fc9fc50a45557af617ff2ce
+#+ocaml-ppxlib.336341f67799efd434004743591d6611517a08148f82972541ebf856d3962b1c
+#+ocaml-sexplib0.7282b44603301326b39befd2d205faf32839848a3e64e31a76b161dbcf96db68
+#+ocaml-stdlib-shims.bce0bbf6fdcf4dd077019d6fe1ffcae24a9bf98d142699b876ea900c4be76df1
 #@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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+ocaml.edf0818febf189032988af4412256bdc0546c7597e8791c956cafae0f631d327
-#+dune.bf2642012aa8db589a512e116496e2c6378f5309b4e933329b39f0cd258ea384
-#+ocaml-compiler-libs.77741fd8921fa3118b0e9f1b75a16a1d1ccd8f1e3678eb48424b0795dd6916e6
-#+ocaml-ppx_derivers.112bd2ec0e3b1f2ea55338b6b30f41e1bea78565048a25403ace44a3e742f58e
-#+ocaml-sexplib0.fc1865d7d7117db2d4dca3be5748768349358ade588f506be20edf6521a61c62
-#+ocaml-stdlib-shims.33a6e99f40154f93f90de7503fc9652552cc2a106474bc8df703204275a90fec
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+ocaml.b3da28f54c7f8c17ed8383c61bdcdbc0b7787d5b8c7c4e3acde60b592b678114
+#+dune.1276972092eb789a2300033e7213ca12a71d026666ae2b5f6a8c4ff10310d53a
+#+ocaml-compiler-libs.5312b5287ae78bd84c241c933eff0ab74a4f161003d41e8f9af94103ab996636
+#+ocaml-ppx_derivers.749c575d0dd9ef6faf79e0f81ac6fbcd971179888fc9fc50a45557af617ff2ce
+#+ocaml-sexplib0.7282b44603301326b39befd2d205faf32839848a3e64e31a76b161dbcf96db68
+#+ocaml-stdlib-shims.bce0bbf6fdcf4dd077019d6fe1ffcae24a9bf98d142699b876ea900c4be76df1
 #@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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+ocaml.edf0818febf189032988af4412256bdc0546c7597e8791c956cafae0f631d327
-#+ocaml-findlib.8bc2afe8c8f0e4d8a87ed9b07db797fc14d5fa56a4e40d82ae2bfada0c5feed0
-#+ocamlbuild.e34f2111ddb6a94ac462582ed5aa1ed5e2170ee06b7db8fb3ceb7f41cf655e05
-#+opam.d54568e589a0e2bf082b7d216fe0baab67f80b8de2fddb47395e461a212d3ce5
-#+ocaml-topkg.4685677081a736b317aabe53c19cdbf570ed4e3a13f81a57822bad5bc4d3b555
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+ocaml.b3da28f54c7f8c17ed8383c61bdcdbc0b7787d5b8c7c4e3acde60b592b678114
+#+ocaml-findlib.21fc9f1ec0dda2eb0ef49381ec01a7010fd58b1b6c47cf87402230721e5e3a0b
+#+ocamlbuild.8f8f9beeea823113776b99eae47dfa369f743eb5cb7458917e97735393e4fc92
+#+opam.ad227c2bdbd5193a8b51621200ebf46c7e7a5d1180b5644bcfe24d9bd6baa80e
+#+ocaml-topkg.8eb9ee083a9c8e0a35ec7608c0ab44dfb274f15facdf56340259194b547fe5cd
 #@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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+ocaml.edf0818febf189032988af4412256bdc0546c7597e8791c956cafae0f631d327
-#+dune.bf2642012aa8db589a512e116496e2c6378f5309b4e933329b39f0cd258ea384
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+ocaml.b3da28f54c7f8c17ed8383c61bdcdbc0b7787d5b8c7c4e3acde60b592b678114
+#+dune.1276972092eb789a2300033e7213ca12a71d026666ae2b5f6a8c4ff10310d53a
 #@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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+ocaml.edf0818febf189032988af4412256bdc0546c7597e8791c956cafae0f631d327
-#+dune.bf2642012aa8db589a512e116496e2c6378f5309b4e933329b39f0cd258ea384
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+ocaml.b3da28f54c7f8c17ed8383c61bdcdbc0b7787d5b8c7c4e3acde60b592b678114
+#+dune.1276972092eb789a2300033e7213ca12a71d026666ae2b5f6a8c4ff10310d53a
 #@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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+ocaml.edf0818febf189032988af4412256bdc0546c7597e8791c956cafae0f631d327
-#+ocaml-findlib.8bc2afe8c8f0e4d8a87ed9b07db797fc14d5fa56a4e40d82ae2bfada0c5feed0
-#+ocamlbuild.e34f2111ddb6a94ac462582ed5aa1ed5e2170ee06b7db8fb3ceb7f41cf655e05
-#+opam.d54568e589a0e2bf082b7d216fe0baab67f80b8de2fddb47395e461a212d3ce5
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+ocaml.b3da28f54c7f8c17ed8383c61bdcdbc0b7787d5b8c7c4e3acde60b592b678114
+#+ocaml-findlib.21fc9f1ec0dda2eb0ef49381ec01a7010fd58b1b6c47cf87402230721e5e3a0b
+#+ocamlbuild.8f8f9beeea823113776b99eae47dfa369f743eb5cb7458917e97735393e4fc92
+#+opam.ad227c2bdbd5193a8b51621200ebf46c7e7a5d1180b5644bcfe24d9bd6baa80e
 #@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.edf0818febf189032988af4412256bdc0546c7597e8791c956cafae0f631d327
-#+dune.bf2642012aa8db589a512e116496e2c6378f5309b4e933329b39f0cd258ea384
-#+ocamlbuild.e34f2111ddb6a94ac462582ed5aa1ed5e2170ee06b7db8fb3ceb7f41cf655e05
-#+ocaml-base.9a37d7e9b7432c7a73ef89ab45db02badbc3f6677f9f8822656085bba9f7d2c2
-#+opam.d54568e589a0e2bf082b7d216fe0baab67f80b8de2fddb47395e461a212d3ce5
-#+ocaml-bos.f4379d6f2e650b4e0dad08fe3becf962ec8287d5b4a20935d8baf115d9271cf1
-#+ocaml-lun.5cdcebd220e9f25df147eb7f0b8cbd9c826bddf4a1593a78116067914ef48d35
-#+ocaml-ppx_deriving.552e698cc6d98d7c4f5f114e57fdd1b62b3453e6d569834c033d45637030c0ec-
\ No newline at end of file
+#+ocaml.b3da28f54c7f8c17ed8383c61bdcdbc0b7787d5b8c7c4e3acde60b592b678114
+#+dune.1276972092eb789a2300033e7213ca12a71d026666ae2b5f6a8c4ff10310d53a
+#+ocamlbuild.8f8f9beeea823113776b99eae47dfa369f743eb5cb7458917e97735393e4fc92
+#+ocaml-base.e0ada6117295d55b9d01856617ab091ab484ee971b8f75c2316f0341a92ffdbd
+#+opam.ad227c2bdbd5193a8b51621200ebf46c7e7a5d1180b5644bcfe24d9bd6baa80e
+#+ocaml-bos.2352792706fa9387267c38ba4ae8bef6c3f8a5c1b2ac94dd92149d4c6f173e9e
+#+ocaml-lun.c13862ab541feb872ec996ceda67d7ce761929bd678b314add756101615866e5
+#+ocaml-ppx_deriving.c6b82a77599967eba8ab9991dc54128a21bf3615e6865fe8838978e6cee2cc89+
\ 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+m4.b38ed60ffea1a09d5f57a79eab2fc576b64f38c5e871bf1395b64829322d2709
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+m4.3e1bd43513a03b656cff43101e0084ea4d21508d79c8e1d85d711455314508c7
 #@untar:-J:sha256:dfaa8a2e11c799bc1765d8bef44911406ee5f4803027190382a939f88c912266:.
 
 
@@ -62,6 +62,8 @@ autotools_config_static() {
 }
 
 build_env_dynamic() {
+	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library.so"
 	export CPATH="$pthbs_build_environment/include"
 	export LDFLAGS="-L$pthbs_build_environment/library.so $LDFLAGS"
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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+ocaml.edf0818febf189032988af4412256bdc0546c7597e8791c956cafae0f631d327
-#+dune.bf2642012aa8db589a512e116496e2c6378f5309b4e933329b39f0cd258ea384
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+ocaml.b3da28f54c7f8c17ed8383c61bdcdbc0b7787d5b8c7c4e3acde60b592b678114
+#+dune.1276972092eb789a2300033e7213ca12a71d026666ae2b5f6a8c4ff10310d53a
 #@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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+m4.b38ed60ffea1a09d5f57a79eab2fc576b64f38c5e871bf1395b64829322d2709
-#+ocaml.edf0818febf189032988af4412256bdc0546c7597e8791c956cafae0f631d327
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+m4.3e1bd43513a03b656cff43101e0084ea4d21508d79c8e1d85d711455314508c7
+#+ocaml.b3da28f54c7f8c17ed8383c61bdcdbc0b7787d5b8c7c4e3acde60b592b678114
 #@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.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/home/ccx/versions/musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149/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.edf0818febf189032988af4412256bdc0546c7597e8791c956cafae0f631d327"
+stdlib="$pthbs_destdir/home/ccx/versions/ocaml.b3da28f54c7f8c17ed8383c61bdcdbc0b7787d5b8c7c4e3acde60b592b678114"
 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.657e98b7dd88d5f7caa5ee8303e52ad8649a9da3f5e8db31c7c20bc5d1ea90f9
-#+nawk.333d5fb08091dff9b4012b7ff3c846c07579fe04ee66aa65eeb8dda7e9caabc0
-#+gnu-make.afdc243f050ed6c15aac1d4a9bfc090c15f0535514894841379b590617e28001
-#+musl-cross-make.84898b757dbaac4798cdf42674f90ac2c88ba1d5d44d4978267ca33cdecbedcf-
\ No newline at end of file
+#+busybox.5792386228c725ccfeffe301dd3918f307e1f4d1391f7bdef45910089bdea8cc
+#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
+#+gnu-make.aa211b51bd7f8182794c40f039947bdf19ade8460ebfc071f9f33e6fb91a968e
+#+musl-cross-make.e4db999a4586836d858df99d45eee1aaa59d4fed1a5fa24f0365db08cddb59de+
\ 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.73ec27e1b55df8f7cd25d2de5d1a41bfdfaf0a0d27dabc32e5a1d777da12595a
-#+busybox.54e5503cc5495c21685dc145a40a4dbd7452cc1ab0a18f63858a39e8685f0dab
-#+gnu-make.7be9d404428782be735fcae1e848eb5fc745e20e1ac57fca24372a859fe32c5d-
\ No newline at end of file
+#+musl-cross-make.3e9a10d515ab8608f8eda7125d1b223da285a62e85a87a56be316a539821605c
+#+busybox.aa9767ee3b751bbe864b5e7561e05d696c689c67851f439d0594c5a84a3fa04d
+#+gnu-make.17a9ee4284ea9561b349a5033e0c41ca0ef75338bc6ba876e521916ba2bf9ab0+
\ 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+diffutils.9a051c85d5055f122a096dc443299e065345d6ac521c1654667ad8e88393e87d
-#+patch.ae7492228d69152bfaa0183750edd3cc0a74226ff2436a39e1718547035eab5d
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+getconf.2f4aec5ba1bcd9c7c43ac44c812101e52b43aeb6e2de56e53dce416d561c6839
-#+ocaml.edf0818febf189032988af4412256bdc0546c7597e8791c956cafae0f631d327
-#+dune.bf2642012aa8db589a512e116496e2c6378f5309b4e933329b39f0cd258ea384
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+diffutils.a671ca2f3d74e5d715dad78029e6ca657c8f17d474bf6e225e13606d6be43f36
+#+patch.5557660270847d7de668356fc2dea208575218d87f439624d6b1db9030e60dac
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+getconf.0a89b938b9483544f9b179a389b8c6ed5576b9be225ebca673ce541c9a81c9a6
+#+ocaml.b3da28f54c7f8c17ed8383c61bdcdbc0b7787d5b8c7c4e3acde60b592b678114
+#+dune.1276972092eb789a2300033e7213ca12a71d026666ae2b5f6a8c4ff10310d53a
 #@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.bf2642012aa8db589a512e116496e2c6378f5309b4e933329b39f0cd258ea384/command/dune' \
+	--with-dune='/home/ccx/versions/dune.1276972092eb789a2300033e7213ca12a71d026666ae2b5f6a8c4ff10310d53a/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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+m4.b38ed60ffea1a09d5f57a79eab2fc576b64f38c5e871bf1395b64829322d2709
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+m4.3e1bd43513a03b656cff43101e0084ea4d21508d79c8e1d85d711455314508c7
 #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:.
 
 
@@ -62,6 +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 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+m4.b38ed60ffea1a09d5f57a79eab2fc576b64f38c5e871bf1395b64829322d2709
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+m4.3e1bd43513a03b656cff43101e0084ea4d21508d79c8e1d85d711455314508c7
 #@untar:-J:sha256:3a224f2accf091b77a5781316e27b9ee3ba82c083cc2e539e08940b68a44fec5:.
 
 
@@ -62,6 +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 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+pkgconf.eb9e04db85b047f6849d7bb051903c1143a9523118c150aa8417523ff8f0139e
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+pkgconf.1b3be78e191647da30359f6418521cd978abb6de4acf949277ab50a233f5d3a3
 
 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+m4.b38ed60ffea1a09d5f57a79eab2fc576b64f38c5e871bf1395b64829322d2709
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+m4.3e1bd43513a03b656cff43101e0084ea4d21508d79c8e1d85d711455314508c7
 #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:.
 
 
@@ -62,6 +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 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+zsh.18c555bf0c5f5c5f5b9f9b2a6c41598f3263a98486fd8dc6093cd0249d760ba2
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+zsh.057868ea48812b41739c94bc6a0f8da6ed951681a62ea6ce2d4a23a783d06ce9
 #@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.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+nawk.333d5fb08091dff9b4012b7ff3c846c07579fe04ee66aa65eeb8dda7e9caabc0
-#+execline.14a92c31eab7c6f2f8a4c38520320d7449f1e7492d354189f6efccef4924b2de
-#+lnstools.c663d862af9c519f99f56c7aa62382f969c4294be699c3fd37427ba1c485db78
-#+sandbox_rootfs.73130bdf1b60ccd2b22a344ce10e798726505c1356e25f93a8b25b2e657eee81
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
+#+execline.cbf9c232c7f3e5a5b6a68fbe18cc1beb6452c83e515e2e91df042944a339cbdf
+#+lnstools.f132160c3efd13a64962d15ad1f2a141fb3c5a50d955bd0628eac625790f57c0
+#+sandbox_rootfs.2f08d3b90fb804646d814810a5dbdb3b6e2f882b2ca7ba8f177e554d01ea270d
 #@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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+m4.b38ed60ffea1a09d5f57a79eab2fc576b64f38c5e871bf1395b64829322d2709
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+popt.8e8cc18b7a3dcd5824f939c1e0f63e3dae56b96b5a644b0f729ffa56aeef7365
-#+libressl.f56a6b4d6e3a363e5166c16cd200ac8827222ca834d3a0f101d2abeaf653548f
-#+zstd.b9ffad24deb43d62222ff3e100c4059c2e695157111c958628cee0ef931c1791
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+m4.3e1bd43513a03b656cff43101e0084ea4d21508d79c8e1d85d711455314508c7
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+popt.e7b511b788c0885b1117ceb88cd1c552537ebbb074a4dddaeebc4566e87bc070
+#+libressl.0a80f4ef368cf90a5fed4e1b2e9e327b6e2335d9bb1e56bdc4d242ec89c5ea18
+#+zstd.710b62ae5807615b4b2b81554d87f293ef95fe4842858d0a22121bef6d29ce14
 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:.
 
 
@@ -65,6 +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 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+skalibs.45b697b31beb1f3b2d4c5fd78216d30ae31190e869f7f8745980fb502302cc6c
-#+execline.e3f3b3c8842ec7bc726c55776e121afe6c3b66aab17352c7b8ce1be95cebd71b
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+skalibs.f3f639ae58dbc34c732bcd02b9791c5a3f0272c59e7605f8f16595b3116df208
+#+execline.a4658f442ed6e60530cde701afc6e777f6909679fc1e8fc9492a58cd56761c77
 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6
 
 
@@ -49,7 +49,7 @@ cd 's6'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.45b697b31beb1f3b2d4c5fd78216d30ae31190e869f7f8745980fb502302cc6c/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.f3f639ae58dbc34c732bcd02b9791c5a3f0272c59e7605f8f16595b3116df208/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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+skalibs.45b697b31beb1f3b2d4c5fd78216d30ae31190e869f7f8745980fb502302cc6c
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+skalibs.f3f639ae58dbc34c732bcd02b9791c5a3f0272c59e7605f8f16595b3116df208
 #@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.45b697b31beb1f3b2d4c5fd78216d30ae31190e869f7f8745980fb502302cc6c/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.f3f639ae58dbc34c732bcd02b9791c5a3f0272c59e7605f8f16595b3116df208/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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+skalibs.45b697b31beb1f3b2d4c5fd78216d30ae31190e869f7f8745980fb502302cc6c
-#+execline.e3f3b3c8842ec7bc726c55776e121afe6c3b66aab17352c7b8ce1be95cebd71b
-#+s6.dcf16e70cf77b51db10172aa0aed80cfbf707768fcea10963cbd4a73b9411c78
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+skalibs.f3f639ae58dbc34c732bcd02b9791c5a3f0272c59e7605f8f16595b3116df208
+#+execline.a4658f442ed6e60530cde701afc6e777f6909679fc1e8fc9492a58cd56761c77
+#+s6.28d26067984c57e64d05677a5f2d3cd6495380a7f2e4fff7742dca8783422bd5
 #@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.45b697b31beb1f3b2d4c5fd78216d30ae31190e869f7f8745980fb502302cc6c/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.f3f639ae58dbc34c732bcd02b9791c5a3f0272c59e7605f8f16595b3116df208/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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+skalibs.45b697b31beb1f3b2d4c5fd78216d30ae31190e869f7f8745980fb502302cc6c
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+skalibs.f3f639ae58dbc34c732bcd02b9791c5a3f0272c59e7605f8f16595b3116df208
 #@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.45b697b31beb1f3b2d4c5fd78216d30ae31190e869f7f8745980fb502302cc6c/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.f3f639ae58dbc34c732bcd02b9791c5a3f0272c59e7605f8f16595b3116df208/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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+skalibs.45b697b31beb1f3b2d4c5fd78216d30ae31190e869f7f8745980fb502302cc6c
-#+execline.e3f3b3c8842ec7bc726c55776e121afe6c3b66aab17352c7b8ce1be95cebd71b
-#+s6.dcf16e70cf77b51db10172aa0aed80cfbf707768fcea10963cbd4a73b9411c78
-#+s6-dns.2c9c57069c68e67152ee8aa539e23ec614615843e1aaf4dec9997c46674b88f8
-#+libressl.f56a6b4d6e3a363e5166c16cd200ac8827222ca834d3a0f101d2abeaf653548f
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+skalibs.f3f639ae58dbc34c732bcd02b9791c5a3f0272c59e7605f8f16595b3116df208
+#+execline.a4658f442ed6e60530cde701afc6e777f6909679fc1e8fc9492a58cd56761c77
+#+s6.28d26067984c57e64d05677a5f2d3cd6495380a7f2e4fff7742dca8783422bd5
+#+s6-dns.8340e17f59b32fcd4fdaea3519f76a82941c1b4c4423093abd371edd41ec900e
+#+libressl.0a80f4ef368cf90a5fed4e1b2e9e327b6e2335d9bb1e56bdc4d242ec89c5ea18
 #@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.45b697b31beb1f3b2d4c5fd78216d30ae31190e869f7f8745980fb502302cc6c/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.f3f639ae58dbc34c732bcd02b9791c5a3f0272c59e7605f8f16595b3116df208/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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+skalibs.45b697b31beb1f3b2d4c5fd78216d30ae31190e869f7f8745980fb502302cc6c
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+skalibs.f3f639ae58dbc34c732bcd02b9791c5a3f0272c59e7605f8f16595b3116df208
 #@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.45b697b31beb1f3b2d4c5fd78216d30ae31190e869f7f8745980fb502302cc6c/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.f3f639ae58dbc34c732bcd02b9791c5a3f0272c59e7605f8f16595b3116df208/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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+skalibs.45b697b31beb1f3b2d4c5fd78216d30ae31190e869f7f8745980fb502302cc6c
-#+execline.e3f3b3c8842ec7bc726c55776e121afe6c3b66aab17352c7b8ce1be95cebd71b
-#+s6.dcf16e70cf77b51db10172aa0aed80cfbf707768fcea10963cbd4a73b9411c78
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+skalibs.f3f639ae58dbc34c732bcd02b9791c5a3f0272c59e7605f8f16595b3116df208
+#+execline.a4658f442ed6e60530cde701afc6e777f6909679fc1e8fc9492a58cd56761c77
+#+s6.28d26067984c57e64d05677a5f2d3cd6495380a7f2e4fff7742dca8783422bd5
 #@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.45b697b31beb1f3b2d4c5fd78216d30ae31190e869f7f8745980fb502302cc6c/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.f3f639ae58dbc34c732bcd02b9791c5a3f0272c59e7605f8f16595b3116df208/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,15 +1,17 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.34634128d8e3c128d962de9027a8246e908c6852a54ba46075a3be0639b1d0e8
-#+gnu-make.aec55aaebe092e32a5684107e717636469632e626abd9ccde8ee014b6b9f3528
-#+busybox.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+nawk.333d5fb08091dff9b4012b7ff3c846c07579fe04ee66aa65eeb8dda7e9caabc0
-#+skalibs.7ee254b44f67ed6ef6e4fad472aff982a905fd63ff567efd26ff5d255f659136
+#+musl-cross-make.363da45526527aac5f37d0770fa78e454d0a7664f3c1042e9bdd14680d67b79e
+#+gnu-make.7e359c54f7829391a5095ac8c288230eb9bc5feb032b4ab41b3ae34e259a80a6
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
+#+skalibs.9188c60dffffbd4cd629bbf304e048c78abe8ebcf25765ac3a0ab39e3e2e314a
 #@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 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.c663d862af9c519f99f56c7aa62382f969c4294be699c3fd37427ba1c485db78
-#+sandbox_rootfs.73130bdf1b60ccd2b22a344ce10e798726505c1356e25f93a8b25b2e657eee81
-#+pthbs-sandbox-rootns.159c1051ba84d27a851179fef6a7cba48bcccf5426062232157d3ef5b8e94ea2-
\ No newline at end of file
+#+lnstools.f132160c3efd13a64962d15ad1f2a141fb3c5a50d955bd0628eac625790f57c0
+#+sandbox_rootfs.2f08d3b90fb804646d814810a5dbdb3b6e2f882b2ca7ba8f177e554d01ea270d
+#+pthbs-sandbox-rootns.f20b628296395fefcbbdf1fe641f49eb601fcf4e4208aa70878cff549392c6dc+
\ 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
 #@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.34634128d8e3c128d962de9027a8246e908c6852a54ba46075a3be0639b1d0e8
-#+gnu-make.aec55aaebe092e32a5684107e717636469632e626abd9ccde8ee014b6b9f3528
-#+busybox.0aeea107d76f4df7007d104626bbb07da670985d513e765bc97e57225d31bf12
-#+nawk.333d5fb08091dff9b4012b7ff3c846c07579fe04ee66aa65eeb8dda7e9caabc0
+#+musl-cross-make.363da45526527aac5f37d0770fa78e454d0a7664f3c1042e9bdd14680d67b79e
+#+gnu-make.7e359c54f7829391a5095ac8c288230eb9bc5feb032b4ab41b3ae34e259a80a6
+#+busybox.0d6795109d4b6e0b286055fe018b03d248445148e6a5052e62818d5e36a8995a
+#+nawk.985d93b803dd55ddf76d03843ecaf8d06da92cea6399c50cfa2bbf5603fbc326
 #@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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+zsh.18c555bf0c5f5c5f5b9f9b2a6c41598f3263a98486fd8dc6093cd0249d760ba2
-#+pthbs-banginstall.20e5ac5777e73f3e8d828b781725ef0817c49b2edf7ef99bd809080ff9b53e0b
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+zsh.057868ea48812b41739c94bc6a0f8da6ed951681a62ea6ce2d4a23a783d06ce9
+#+pthbs-banginstall.84944d58ad6aae47612623ded72158b3d3e274ff012dd88db303686b6f364365
 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep
 
 
diff --git a/variants/ccx-x86_64/squashfs-tools b/variants/ccx-x86_64/squashfs-tools
@@ -1,45 +1,47 @@
 #!/usr/bin/env pthbs-build
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+attr.81af2bf47c2f3e0210393797dcb650715b895606edd5c5459302bb3a2f25d6bc
-#+zstd.b9ffad24deb43d62222ff3e100c4059c2e695157111c958628cee0ef931c1791
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+attr.2df22b2cac52a4665962b98f71cddea066dc7a4ec934136be10321d5ec08f5ad
+#+zstd.710b62ae5807615b4b2b81554d87f293ef95fe4842858d0a22121bef6d29ce14
 #@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 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+m4.b38ed60ffea1a09d5f57a79eab2fc576b64f38c5e871bf1395b64829322d2709
-#+patch.ae7492228d69152bfaa0183750edd3cc0a74226ff2436a39e1718547035eab5d
-#+libunwind.3b6bf3c50db3b509c676257bbb975b3b01528b8562dd6ecba95925f1b52693a5
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+m4.3e1bd43513a03b656cff43101e0084ea4d21508d79c8e1d85d711455314508c7
+#+patch.5557660270847d7de668356fc2dea208575218d87f439624d6b1db9030e60dac
+#+libunwind.71c395c46fb8d6b9e1c5f67c8a5e58471a99571b55dc674751662d594b9e9ac6
 #@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch
 #@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:.
 
@@ -65,6 +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 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-dosfstools.3b07d4970844246538d5c08763ec57c56f9963e44013479610d950ef0bf9be68
-#+busybox-e2fsprogs.80b6af3d856d840824891f904fe7f259dee03045475ceeb3c7dd11cd092005a2
-#+busybox-iproute2.b58f15841af75ef3102a718ea4eb6b69ddfe2eca9355d63f53d304760fa1f2ac
-#+busybox-iputils.df3c7684bc3a71f00f9333c70ccd7931253d75d6af68f3a1eb3304fc1530754a
-#+busybox-net-misc.97cee1851eb00b65d60a0322dfce0dde1758069345e20fd0943b1cf8a967230c
-#+busybox-net-tools.9dad3928df16a9c0c19380b1563419fe9013a3f2fdedbc087bf959edbdf541fa
-#+busybox-traceroute.626cc03c9309af2e6da9764486c7f37aca68655ad4028219c9046b21cdbf0ad8
-#+busybox-wget.dfecd481358e3be308cfccbae06a205c179d1454dacc17a0a19d4f341a999b0a
-#+busybox-chpst.6b228b94b35258b6925b6f4b41c08027755bfcdf097522716679359fb74268e8
-#+busybox-console.a3fae472e5eb70be7b109e6f0fdd40483fa8ba99fa065fa5d6e3566da4d1d75a
-#+busybox-getty.1e6fded52616d20dba493de51208394a8da9e3fd6f80ff58e1f9a3f9b4a74b89
-#+busybox-i2c-tools.9ea05daf881c103213d8b6287479133b4d36fe0a62149c32bb1c78a999c2fbc8
-#+busybox-linux-extra.de992405ee5deace9608fc21f8e4ca8b8330740fd6483e640effd2b32be1b81b
-#+busybox-mtd-utils.0051966b109c1cc762c62967187cadf84209f4dd63c26c615eac1f8b903d3083
-#+busybox-shadow.ec57e3f86ac3a7a6c96c2814a4eb2cf8b4322a78f4bd13d287b9da3da9a8cb93
-#+busybox-su.745ee52adbebf63523412f53f65b114c391b6a5777c0c33a941d71135a7f7228
-#+busybox-util-linux-priv.7245c21eded17e163f55ed4289c1258d807b5a661bc6a59046baf3682054c772
-#+busybox-logging.50bef788ce9cad7126b03d255879dc06cbcdc7b92e4906972c19756a0fd5742d
-#+busybox-cron.20bea026a7b215e23ab3f6cfb73cb35b1300cbe069dfbe91e8568217fe6a1506
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+diffutils.9a051c85d5055f122a096dc443299e065345d6ac521c1654667ad8e88393e87d
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+aat.f1628e530f77a2be903a4a8aea880dd36e9777ef0e20e64b84b8bd741d9060dd
-#+fileset.6772eb473f298d0cbf0a4c5671642a1932c2ad43ca6186ffccdbe0cc34adb46f
-#+rsync.2936e4f725a9c6ba9ed8006b0959baa0f6bda147dfdd52946fe341a87690b80a
-#+execline.e3f3b3c8842ec7bc726c55776e121afe6c3b66aab17352c7b8ce1be95cebd71b
-#+kbd.e3e5092968c5aa22f36443ad943c8efc1e10c0b19b6761c8ca742deaaafe57e6
-#+mdevd.5886ce29fd48c8fb9497b44633f622edfd39b0c3453ed11de8955532c2d234f0
-#+s6-linux-utils.3bcc200e3a3d2528850945dd701c1fe216d990ff91c9b8e1177370c7b2d8f205
-#+s6-rc.36e7e7fa55107955082a5e57cffe64f396d7ef042821bf94b02af4cf68063d06
-#+s6.dcf16e70cf77b51db10172aa0aed80cfbf707768fcea10963cbd4a73b9411c78
-#+zsh.18c555bf0c5f5c5f5b9f9b2a6c41598f3263a98486fd8dc6093cd0249d760ba2
-#+libcgroup.4a579694772f2c620b2c5cb78c827176ce5994a562a4a06747423cd6c90055dd
-#+system-config-scripts.6bf2b4e3206d88ef797d8ee71c71d7734908a496c819c481eafe1b87c41bd98a
-#+logincaps.73371e6ba6f984777f9f20bf08e20a72fc3c1b43b6de06e60181bfc300b499c0
-#+busybox.d8eb5ce5039208a2e46e2d7c3375605a9241d1bfbaa6413dbfa1757d6b64ead1
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-dosfstools.46839c69e3ed18254f53762d20df008d95bdc2e819164568707f033febc08d7e
+#+busybox-e2fsprogs.9cc251ffec2f59d8fbadacc1d6291a9e4f0cb7ac714dfab2457dcb1a15d1c5c8
+#+busybox-iproute2.7cc94775547fcf5d1eb54671a34b00338908fd0d987bfc1da7d73ab3b32d7e8a
+#+busybox-iputils.13c494c9bc1958d249c4c6a6958d24ae676bb87ba1dd5997b3ae6ed4ca0662b5
+#+busybox-net-misc.36ea542042d1fba14d03a48c57752107f992c544b4e7fe3ea0ea876f470b7391
+#+busybox-net-tools.3ce4197f5d1f036f0f87ce02f1d5b82a879517c6c16ff98d880f306d43e96271
+#+busybox-traceroute.b70675fd3b29af5b2f6e93d9cac4e86364cae556b5db2575a7f531b4480efda1
+#+busybox-wget.6a661b9479402379c9d0f2e068151fc62b57d01796ee81b1e285a4519d019a9b
+#+busybox-chpst.1dade3b1fb4a2a68c148872af2318725946bfc62f7dc95843c6bcfaad9a721b0
+#+busybox-console.29378cfd34077da4fea08b7c4c6f8d153c662add36e4aace9234f3959314988f
+#+busybox-getty.357c8a64b56672ebdd2f0fd3b09e54f989768b4d60c1bdb4eedc11720d930679
+#+busybox-i2c-tools.f7a77ce59583a14c72f18ed908f33bf9cd07c0cc072149140e782341f5dfd227
+#+busybox-linux-extra.f17fb1ca015cf81185b578ffc8453ca77c01490b62e99a8849d9d67d7bd6c8f6
+#+busybox-mtd-utils.1ab41a1bfab417082471980932fab87a28275809c15e3bbf7921a4ab38b7b657
+#+busybox-shadow.38dba9565aa8305ffcc962c7422193c90996508e0d7ec0c07d8cfc47a36b8b10
+#+busybox-su.0dfdccfb99cf9aa8b2570d7742dd0aee77237d279943543f7477b8f3da240241
+#+busybox-util-linux-priv.3368741fb0581b4865974e41d562ea4b3389dac456b27080da96fb41709fcbc0
+#+busybox-logging.a68be6fb5bd8854f736c9c4b2e6e91b6356eca63cffdc9f5bbd2a250546fcc2f
+#+busybox-cron.ffddbd413744596d5110757dd1b8905cfbb6ea5785b99e8d32a5cfe64fe83bbc
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+diffutils.a671ca2f3d74e5d715dad78029e6ca657c8f17d474bf6e225e13606d6be43f36
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+aat.f7b6f292d5b40d77e3a9d893c0914890ae6dc41930a3f3f0ac3dfa7391e495c5
+#+fileset.47a7c317cc93cf99b6bef5dd5fb07bf2f593f547d94b078492ee9c2dd55557c3
+#+rsync.c61887c79312743c999cf09585fb922f3e31f66599ac42dd470a95451c0b888b
+#+execline.a4658f442ed6e60530cde701afc6e777f6909679fc1e8fc9492a58cd56761c77
+#+kbd.e6e24a66dfc146ba300e63900187861a99571bf25ccafd1bfb0be5b1ba2860e1
+#+mdevd.d19703e5d9576aea60311315656583a6e86e4fcedf5a594816015b3f0a463eed
+#+s6-linux-utils.8c2d2b9e83da7a4de0f7e54a5d8be6c65ef00709cc724e74a95bd144b7f4aff4
+#+s6-rc.cb5266e9ae6b3074c676e249fdd444e8e670527d767aa923b1a6b9b85295de49
+#+s6.28d26067984c57e64d05677a5f2d3cd6495380a7f2e4fff7742dca8783422bd5
+#+zsh.057868ea48812b41739c94bc6a0f8da6ed951681a62ea6ce2d4a23a783d06ce9
+#+libcgroup.1365604612481e8bd9fd5dd9b6b423de242772add3474224cae1e988f7623c18
+#+system-config-scripts.01d50d4de1c706be7ebd2eda1471d33bd04f79e0444ad2a0231c1b0c98c33ac1
+#+logincaps.378e1c1f8512bbb9142d43e974e3af5a87f327c54d2365654b38dd96b25d5a6e
+#+busybox.034c9dc6ca5c574a2bc23d2370bcdefe252032a40f13180a25480972badbc091
 #@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.5f0fc45f0ab67b362677f4f3cd94c802e3e8064c61b6e34b004f30bef6704293' \
-	'pthbs_path_mdevd=/home/ccx/versions/env.51b5ff7823d976a4244de98bb38cefe5194079332a28245d475d016a5ee165e5' \
+	'pthbs_path_containers=/home/ccx/versions/env.2e73b4be5427ce79ec3904bda4daf825e46147d7dfe7883141219eebc82d9fae' \
+	'pthbs_path_mdevd=/home/ccx/versions/env.2f7ba0a3fd35502b3c2d7d3b585dffa54a99b659ccdf62c5d725d7ad8ddaf196' \
 	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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-dosfstools.3b07d4970844246538d5c08763ec57c56f9963e44013479610d950ef0bf9be68
-#+busybox-e2fsprogs.80b6af3d856d840824891f904fe7f259dee03045475ceeb3c7dd11cd092005a2
-#+busybox-iproute2.b58f15841af75ef3102a718ea4eb6b69ddfe2eca9355d63f53d304760fa1f2ac
-#+busybox-iputils.df3c7684bc3a71f00f9333c70ccd7931253d75d6af68f3a1eb3304fc1530754a
-#+busybox-net-misc.97cee1851eb00b65d60a0322dfce0dde1758069345e20fd0943b1cf8a967230c
-#+busybox-net-tools.9dad3928df16a9c0c19380b1563419fe9013a3f2fdedbc087bf959edbdf541fa
-#+busybox-traceroute.626cc03c9309af2e6da9764486c7f37aca68655ad4028219c9046b21cdbf0ad8
-#+busybox-wget.dfecd481358e3be308cfccbae06a205c179d1454dacc17a0a19d4f341a999b0a
-#+busybox-chpst.6b228b94b35258b6925b6f4b41c08027755bfcdf097522716679359fb74268e8
-#+busybox-console.a3fae472e5eb70be7b109e6f0fdd40483fa8ba99fa065fa5d6e3566da4d1d75a
-#+busybox-getty.1e6fded52616d20dba493de51208394a8da9e3fd6f80ff58e1f9a3f9b4a74b89
-#+busybox-i2c-tools.9ea05daf881c103213d8b6287479133b4d36fe0a62149c32bb1c78a999c2fbc8
-#+busybox-linux-extra.de992405ee5deace9608fc21f8e4ca8b8330740fd6483e640effd2b32be1b81b
-#+busybox-mtd-utils.0051966b109c1cc762c62967187cadf84209f4dd63c26c615eac1f8b903d3083
-#+busybox-shadow.ec57e3f86ac3a7a6c96c2814a4eb2cf8b4322a78f4bd13d287b9da3da9a8cb93
-#+busybox-su.745ee52adbebf63523412f53f65b114c391b6a5777c0c33a941d71135a7f7228
-#+busybox-util-linux-priv.7245c21eded17e163f55ed4289c1258d807b5a661bc6a59046baf3682054c772
-#+busybox-logging.50bef788ce9cad7126b03d255879dc06cbcdc7b92e4906972c19756a0fd5742d
-#+busybox-cron.20bea026a7b215e23ab3f6cfb73cb35b1300cbe069dfbe91e8568217fe6a1506
-#+s6.dcf16e70cf77b51db10172aa0aed80cfbf707768fcea10963cbd4a73b9411c78
-#+s6-rc.36e7e7fa55107955082a5e57cffe64f396d7ef042821bf94b02af4cf68063d06
-#+s6-portable-utils.3e2dcf3b39963cb5dbff840ff5d5e0acf125d1c1550f1c637cd26fe111e750dd
-#+s6-linux-init.4537486c25ddb8f4bb3cfd409a475df6bf30edae1f2b5a00d2d4dcfed49274eb
-#+execline.e3f3b3c8842ec7bc726c55776e121afe6c3b66aab17352c7b8ce1be95cebd71b
-#+system-config-rc.862354e99f92c0e96dfc7a7dde02e91fb7394a862cb10afc7aa6100a0bab3a9d
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-dosfstools.46839c69e3ed18254f53762d20df008d95bdc2e819164568707f033febc08d7e
+#+busybox-e2fsprogs.9cc251ffec2f59d8fbadacc1d6291a9e4f0cb7ac714dfab2457dcb1a15d1c5c8
+#+busybox-iproute2.7cc94775547fcf5d1eb54671a34b00338908fd0d987bfc1da7d73ab3b32d7e8a
+#+busybox-iputils.13c494c9bc1958d249c4c6a6958d24ae676bb87ba1dd5997b3ae6ed4ca0662b5
+#+busybox-net-misc.36ea542042d1fba14d03a48c57752107f992c544b4e7fe3ea0ea876f470b7391
+#+busybox-net-tools.3ce4197f5d1f036f0f87ce02f1d5b82a879517c6c16ff98d880f306d43e96271
+#+busybox-traceroute.b70675fd3b29af5b2f6e93d9cac4e86364cae556b5db2575a7f531b4480efda1
+#+busybox-wget.6a661b9479402379c9d0f2e068151fc62b57d01796ee81b1e285a4519d019a9b
+#+busybox-chpst.1dade3b1fb4a2a68c148872af2318725946bfc62f7dc95843c6bcfaad9a721b0
+#+busybox-console.29378cfd34077da4fea08b7c4c6f8d153c662add36e4aace9234f3959314988f
+#+busybox-getty.357c8a64b56672ebdd2f0fd3b09e54f989768b4d60c1bdb4eedc11720d930679
+#+busybox-i2c-tools.f7a77ce59583a14c72f18ed908f33bf9cd07c0cc072149140e782341f5dfd227
+#+busybox-linux-extra.f17fb1ca015cf81185b578ffc8453ca77c01490b62e99a8849d9d67d7bd6c8f6
+#+busybox-mtd-utils.1ab41a1bfab417082471980932fab87a28275809c15e3bbf7921a4ab38b7b657
+#+busybox-shadow.38dba9565aa8305ffcc962c7422193c90996508e0d7ec0c07d8cfc47a36b8b10
+#+busybox-su.0dfdccfb99cf9aa8b2570d7742dd0aee77237d279943543f7477b8f3da240241
+#+busybox-util-linux-priv.3368741fb0581b4865974e41d562ea4b3389dac456b27080da96fb41709fcbc0
+#+busybox-logging.a68be6fb5bd8854f736c9c4b2e6e91b6356eca63cffdc9f5bbd2a250546fcc2f
+#+busybox-cron.ffddbd413744596d5110757dd1b8905cfbb6ea5785b99e8d32a5cfe64fe83bbc
+#+s6.28d26067984c57e64d05677a5f2d3cd6495380a7f2e4fff7742dca8783422bd5
+#+s6-rc.cb5266e9ae6b3074c676e249fdd444e8e670527d767aa923b1a6b9b85295de49
+#+s6-portable-utils.e62c4a43c1e0ebcf451fc05403bcd830bab11159f86101f9531a710e94566f0c
+#+s6-linux-init.f2f00c9179408c2e7e8e53c924bd747c3203ad875603e54602f9b828163bd758
+#+execline.a4658f442ed6e60530cde701afc6e777f6909679fc1e8fc9492a58cd56761c77
+#+system-config-rc.9fbfb22d37c92da66361c7d86fcea8249d6dc7c4751c380dc204a5d2950263d4
 
 
 # - build script start -
@@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-s6rcdb=/home/ccx/versions/system-config-rc.862354e99f92c0e96dfc7a7dde02e91fb7394a862cb10afc7aa6100a0bab3a9d/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.9fbfb22d37c92da66361c7d86fcea8249d6dc7c4751c380dc204a5d2950263d4/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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+s6-rc.36e7e7fa55107955082a5e57cffe64f396d7ef042821bf94b02af4cf68063d06
-#+fileset.6772eb473f298d0cbf0a4c5671642a1932c2ad43ca6186ffccdbe0cc34adb46f
-#+system-config.3b09019bbf3e5e953077e5399f57b1378605d38e04f98deeac2e058939445214
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+s6-rc.cb5266e9ae6b3074c676e249fdd444e8e670527d767aa923b1a6b9b85295de49
+#+fileset.47a7c317cc93cf99b6bef5dd5fb07bf2f593f547d94b078492ee9c2dd55557c3
+#+system-config.2579874deaa452053dfb7d7d9c96642071ebc5a3018ec525ba989265bfb091fc
 
 
 # - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-src=/home/ccx/versions/system-config.3b09019bbf3e5e953077e5399f57b1378605d38e04f98deeac2e058939445214/config/s6-rc-source
+src=/home/ccx/versions/system-config.2579874deaa452053dfb7d7d9c96642071ebc5a3018ec525ba989265bfb091fc/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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+zsh.18c555bf0c5f5c5f5b9f9b2a6c41598f3263a98486fd8dc6093cd0249d760ba2
-#+pthbs-banginstall.20e5ac5777e73f3e8d828b781725ef0817c49b2edf7ef99bd809080ff9b53e0b
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+zsh.057868ea48812b41739c94bc6a0f8da6ed951681a62ea6ce2d4a23a783d06ce9
+#+pthbs-banginstall.84944d58ad6aae47612623ded72158b3d3e274ff012dd88db303686b6f364365
 #@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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+zsh.18c555bf0c5f5c5f5b9f9b2a6c41598f3263a98486fd8dc6093cd0249d760ba2
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+zsh.057868ea48812b41739c94bc6a0f8da6ed951681a62ea6ce2d4a23a783d06ce9
 #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh
 
 
diff --git a/variants/ccx-x86_64/tinyssh b/variants/ccx-x86_64/tinyssh
@@ -1,43 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
 #@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 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.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100-
\ No newline at end of file
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b+
\ 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+execline.e3f3b3c8842ec7bc726c55776e121afe6c3b66aab17352c7b8ce1be95cebd71b
-#+pthbs-banginstall.20e5ac5777e73f3e8d828b781725ef0817c49b2edf7ef99bd809080ff9b53e0b
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+execline.a4658f442ed6e60530cde701afc6e777f6909679fc1e8fc9492a58cd56761c77
+#+pthbs-banginstall.84944d58ad6aae47612623ded72158b3d3e274ff012dd88db303686b6f364365
 #@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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-dosfstools.3b07d4970844246538d5c08763ec57c56f9963e44013479610d950ef0bf9be68
-#+busybox-e2fsprogs.80b6af3d856d840824891f904fe7f259dee03045475ceeb3c7dd11cd092005a2
-#+busybox-iproute2.b58f15841af75ef3102a718ea4eb6b69ddfe2eca9355d63f53d304760fa1f2ac
-#+busybox-iputils.df3c7684bc3a71f00f9333c70ccd7931253d75d6af68f3a1eb3304fc1530754a
-#+busybox-net-misc.97cee1851eb00b65d60a0322dfce0dde1758069345e20fd0943b1cf8a967230c
-#+busybox-net-tools.9dad3928df16a9c0c19380b1563419fe9013a3f2fdedbc087bf959edbdf541fa
-#+busybox-traceroute.626cc03c9309af2e6da9764486c7f37aca68655ad4028219c9046b21cdbf0ad8
-#+busybox-wget.dfecd481358e3be308cfccbae06a205c179d1454dacc17a0a19d4f341a999b0a
-#+busybox-chpst.6b228b94b35258b6925b6f4b41c08027755bfcdf097522716679359fb74268e8
-#+busybox-console.a3fae472e5eb70be7b109e6f0fdd40483fa8ba99fa065fa5d6e3566da4d1d75a
-#+busybox-getty.1e6fded52616d20dba493de51208394a8da9e3fd6f80ff58e1f9a3f9b4a74b89
-#+busybox-i2c-tools.9ea05daf881c103213d8b6287479133b4d36fe0a62149c32bb1c78a999c2fbc8
-#+busybox-linux-extra.de992405ee5deace9608fc21f8e4ca8b8330740fd6483e640effd2b32be1b81b
-#+busybox-mtd-utils.0051966b109c1cc762c62967187cadf84209f4dd63c26c615eac1f8b903d3083
-#+busybox-shadow.ec57e3f86ac3a7a6c96c2814a4eb2cf8b4322a78f4bd13d287b9da3da9a8cb93
-#+busybox-su.745ee52adbebf63523412f53f65b114c391b6a5777c0c33a941d71135a7f7228
-#+busybox-util-linux-priv.7245c21eded17e163f55ed4289c1258d807b5a661bc6a59046baf3682054c772
-#+busybox-logging.50bef788ce9cad7126b03d255879dc06cbcdc7b92e4906972c19756a0fd5742d
-#+busybox-cron.20bea026a7b215e23ab3f6cfb73cb35b1300cbe069dfbe91e8568217fe6a1506
-#+attr.81af2bf47c2f3e0210393797dcb650715b895606edd5c5459302bb3a2f25d6bc
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+diffutils.9a051c85d5055f122a096dc443299e065345d6ac521c1654667ad8e88393e87d
-#+patch.ae7492228d69152bfaa0183750edd3cc0a74226ff2436a39e1718547035eab5d
-#+flex.37e656a6152b2bf1f6ad605702ab066d52d2fad0ef579ea8f1ed41921045bb8d
-#+bison.80145468e33fa5be3e6d7cd01e84d6bfa13dc40149e9483157541fd762661cb7
-#+rsync.2936e4f725a9c6ba9ed8006b0959baa0f6bda147dfdd52946fe341a87690b80a
-#+execline.e3f3b3c8842ec7bc726c55776e121afe6c3b66aab17352c7b8ce1be95cebd71b
-#+s6.dcf16e70cf77b51db10172aa0aed80cfbf707768fcea10963cbd4a73b9411c78
-#+s6-rc.36e7e7fa55107955082a5e57cffe64f396d7ef042821bf94b02af4cf68063d06
-#+s6-portable-utils.3e2dcf3b39963cb5dbff840ff5d5e0acf125d1c1550f1c637cd26fe111e750dd
-#+s6-linux-utils.3bcc200e3a3d2528850945dd701c1fe216d990ff91c9b8e1177370c7b2d8f205
-#+s6-linux-init.4537486c25ddb8f4bb3cfd409a475df6bf30edae1f2b5a00d2d4dcfed49274eb
-#+mdevd.5886ce29fd48c8fb9497b44633f622edfd39b0c3453ed11de8955532c2d234f0
-#+s6-dns.2c9c57069c68e67152ee8aa539e23ec614615843e1aaf4dec9997c46674b88f8
-#+libressl.f56a6b4d6e3a363e5166c16cd200ac8827222ca834d3a0f101d2abeaf653548f
-#+s6-networking.24e57be8aeb7258c82deb050ca3d460716bb94532b9c4d4d7a0e52beabccef8e
-#+zsh.18c555bf0c5f5c5f5b9f9b2a6c41598f3263a98486fd8dc6093cd0249d760ba2
-#+pthbs-banginstall.20e5ac5777e73f3e8d828b781725ef0817c49b2edf7ef99bd809080ff9b53e0b
-#+aat.f1628e530f77a2be903a4a8aea880dd36e9777ef0e20e64b84b8bd741d9060dd
-#+confz.0f2604cef192b063030f83a7258e0c155ac3ce0a24f63517925e17cbd9a8857f
-#+containers.cfcda35aa3579798937cbb5c73afc00b059f04f7eee3964e79db6ade43e656c4
-#+fileset.6772eb473f298d0cbf0a4c5671642a1932c2ad43ca6186ffccdbe0cc34adb46f
-#+logincaps.73371e6ba6f984777f9f20bf08e20a72fc3c1b43b6de06e60181bfc300b499c0
-#+snaprep.e12a87c6161c16a9f96027797e0a49a1b2873e861b0044ca70df530473c4bef1
-#+curl.25d0dc3ae05598ea0d8257be8d4ba675a07ab70ab7aaf1ddd63f90682e097d55
-#+git.81c93b086608ddec44a6ba01a4be86d8f183a4250eeb7f681a7ca5ebd83715df
-#+xbps.6bc66384f0fdb43736ac201b3f8a0a99e2e832984276ca3f49d5068ec655984f
-#+apk-tools.2136082d8feada0a90f89b3095bb30a9244a288d0e71f43519b1384e3e0c2271
-#+getent.a6a1998ddee47bf9905f634a5f510385de383b87362f6f7449bb83f3056fc6fc
-#+getconf.2f4aec5ba1bcd9c7c43ac44c812101e52b43aeb6e2de56e53dce416d561c6839
-#+iconv.5b018ba6f1504db7dcf4c1cd43d052c70b90221890c8244702654f3411272cdd
-#+libcap.86979187f7be609cea36203949e4d143b93c5a5b449ca19400c651ae306dde43
-#+applyuidgid-caps.78612b44171e5ff88c6a9c85ea1e2beb8e341ecb3e94e40760cfebff24820e63
-#+ccx-utils.223610778f1d536eefeb1bdfc88c0eca25b2dfdd84ae13d11742ae79f4925d33
-#+user-env.311d5c0bc0783c5bd48e0a152ad47290d008b32d148dd92246fe5835848ac968
-#+strace.b9c5c96ae73a5448c528634e00f5b25c73a80561b3af202af7b4d0d9068dc983
-#+mlog.d21750060e2285d43226bf9cf50ac4dc1df5560e10de6200f2e77a0d1c2e490b
-#+findutils.88ba358b7b2ff564664303f5e2e55ac2db9ad1a7b5f6391a705f625de23ddfb5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+nvi.6d63bd9712ca5a375b5df2aea6155d927424007776754a59eab6ef5546058133
-#+squashfs-tools.4b4ed54deb6dc113306e316a381482e0f05213b9f5b08c8ef15cb7c36597b735
-#+mandoc.75f1a31647ca0cdd0b8ccc1c3a09756db0a9523bd76ce54a114653e80137130e
-#+tinyssh.13f2e742f01ea7eb14330c28808adf48864256bbe597c072106e2e10c260cbee-
\ No newline at end of file
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-dosfstools.46839c69e3ed18254f53762d20df008d95bdc2e819164568707f033febc08d7e
+#+busybox-e2fsprogs.9cc251ffec2f59d8fbadacc1d6291a9e4f0cb7ac714dfab2457dcb1a15d1c5c8
+#+busybox-iproute2.7cc94775547fcf5d1eb54671a34b00338908fd0d987bfc1da7d73ab3b32d7e8a
+#+busybox-iputils.13c494c9bc1958d249c4c6a6958d24ae676bb87ba1dd5997b3ae6ed4ca0662b5
+#+busybox-net-misc.36ea542042d1fba14d03a48c57752107f992c544b4e7fe3ea0ea876f470b7391
+#+busybox-net-tools.3ce4197f5d1f036f0f87ce02f1d5b82a879517c6c16ff98d880f306d43e96271
+#+busybox-traceroute.b70675fd3b29af5b2f6e93d9cac4e86364cae556b5db2575a7f531b4480efda1
+#+busybox-wget.6a661b9479402379c9d0f2e068151fc62b57d01796ee81b1e285a4519d019a9b
+#+busybox-chpst.1dade3b1fb4a2a68c148872af2318725946bfc62f7dc95843c6bcfaad9a721b0
+#+busybox-console.29378cfd34077da4fea08b7c4c6f8d153c662add36e4aace9234f3959314988f
+#+busybox-getty.357c8a64b56672ebdd2f0fd3b09e54f989768b4d60c1bdb4eedc11720d930679
+#+busybox-i2c-tools.f7a77ce59583a14c72f18ed908f33bf9cd07c0cc072149140e782341f5dfd227
+#+busybox-linux-extra.f17fb1ca015cf81185b578ffc8453ca77c01490b62e99a8849d9d67d7bd6c8f6
+#+busybox-mtd-utils.1ab41a1bfab417082471980932fab87a28275809c15e3bbf7921a4ab38b7b657
+#+busybox-shadow.38dba9565aa8305ffcc962c7422193c90996508e0d7ec0c07d8cfc47a36b8b10
+#+busybox-su.0dfdccfb99cf9aa8b2570d7742dd0aee77237d279943543f7477b8f3da240241
+#+busybox-util-linux-priv.3368741fb0581b4865974e41d562ea4b3389dac456b27080da96fb41709fcbc0
+#+busybox-logging.a68be6fb5bd8854f736c9c4b2e6e91b6356eca63cffdc9f5bbd2a250546fcc2f
+#+busybox-cron.ffddbd413744596d5110757dd1b8905cfbb6ea5785b99e8d32a5cfe64fe83bbc
+#+attr.2df22b2cac52a4665962b98f71cddea066dc7a4ec934136be10321d5ec08f5ad
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+diffutils.a671ca2f3d74e5d715dad78029e6ca657c8f17d474bf6e225e13606d6be43f36
+#+patch.5557660270847d7de668356fc2dea208575218d87f439624d6b1db9030e60dac
+#+flex.876444ede8e785cda0d73fe830a2704b02a4e1d854481e59ffdffbe169a98840
+#+bison.0cc6df5b7ea8216323721f2134e6fad8adc28ca3c1801945d689b02d7b537e00
+#+rsync.c61887c79312743c999cf09585fb922f3e31f66599ac42dd470a95451c0b888b
+#+execline.a4658f442ed6e60530cde701afc6e777f6909679fc1e8fc9492a58cd56761c77
+#+s6.28d26067984c57e64d05677a5f2d3cd6495380a7f2e4fff7742dca8783422bd5
+#+s6-rc.cb5266e9ae6b3074c676e249fdd444e8e670527d767aa923b1a6b9b85295de49
+#+s6-portable-utils.e62c4a43c1e0ebcf451fc05403bcd830bab11159f86101f9531a710e94566f0c
+#+s6-linux-utils.8c2d2b9e83da7a4de0f7e54a5d8be6c65ef00709cc724e74a95bd144b7f4aff4
+#+s6-linux-init.f2f00c9179408c2e7e8e53c924bd747c3203ad875603e54602f9b828163bd758
+#+mdevd.d19703e5d9576aea60311315656583a6e86e4fcedf5a594816015b3f0a463eed
+#+s6-dns.8340e17f59b32fcd4fdaea3519f76a82941c1b4c4423093abd371edd41ec900e
+#+libressl.0a80f4ef368cf90a5fed4e1b2e9e327b6e2335d9bb1e56bdc4d242ec89c5ea18
+#+s6-networking.0cc0594fb6f6be5461a07ef92c11dc4ab9c4d971edc7801aea4814cfa5b607b5
+#+zsh.057868ea48812b41739c94bc6a0f8da6ed951681a62ea6ce2d4a23a783d06ce9
+#+pthbs-banginstall.84944d58ad6aae47612623ded72158b3d3e274ff012dd88db303686b6f364365
+#+aat.f7b6f292d5b40d77e3a9d893c0914890ae6dc41930a3f3f0ac3dfa7391e495c5
+#+confz.004baddf3bbead550e6bf3c3ec8554b37770eb722b3ffdb98cba01f188fe47f0
+#+containers.16bfebee4df34897c56a3b5fe1734038e2aa78d6d206ba83f3f5cdbe9c8fad7e
+#+fileset.47a7c317cc93cf99b6bef5dd5fb07bf2f593f547d94b078492ee9c2dd55557c3
+#+logincaps.378e1c1f8512bbb9142d43e974e3af5a87f327c54d2365654b38dd96b25d5a6e
+#+snaprep.c7291cb7a25733a426b59180c2614096ec2b4488bcc2de1500e2bcf7667fcd2e
+#+curl.1e86729c8cb8704cfe5ddb014c3a08c02bf46bf3a8bcad3ea93c2af5af2c8ab2
+#+git.557292067a3de9d03d46141247c5eb139edff95b64a331c7af813134962521f9
+#+xbps.a774d99181a683cf091488a2ac3f0cea75b65b1009aae28316cfedc31a7a4f81
+#+apk-tools.f0861208b70b58dadf90e1c8966d13f224ccf311bb2844647bfb256830431832
+#+getent.6f3385fd5170d7fd05daa1d150c87e39fc9b7cb0c9aabbdec4539b4f370eb702
+#+getconf.0a89b938b9483544f9b179a389b8c6ed5576b9be225ebca673ce541c9a81c9a6
+#+iconv.04bd7666ec0c328e901af1ed5407c67d1b7c867f4659911b95e34958ac43921d
+#+libcap.7e952925a0f701d005130f2a8cf7146e9d66249a9862aba077577177ea4caaa2
+#+applyuidgid-caps.655228402ff7064981ac0ccf2a2dd2983f20eda29e117368b86b986174b91a14
+#+ccx-utils.7bcd7c863a7a7f773ed98939d9a99b315d761fe4668a33929b4aec445ab84549
+#+user-env.9fdc47ea614a3f0f568b6875e8a3e9cc6e42d2e4c37e8b267a675a8035ea7b1b
+#+strace.70549a88be39b0f2ff6d0a73e5ccd39be37038cd0205f590e37426ba7f10316f
+#+mlog.531e39c6f3258c498ac01c8feddaed795045a21688701efba9e61fcff614b4f6
+#+findutils.2598e20961b91dafb2dc243abb65d53a9e9671391124790328fcddd9b293f19b
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+nvi.d2eadba43ef6dbce631fe680097cf2fb750f23e7f8ce355fc2162e6270aa3b16
+#+squashfs-tools.c70b7c4c810cdf57571ea0a20af0d6dbd8ee77bccc334e8f3f1f77ee9bd8b756
+#+mandoc.22a54a117a00ef0758924d066ccc4197a51d72fa207e788c9b9c783e4a6892ae
+#+tinyssh.9ee19f56ea055d37b6334e33914575a435b166e6bf612ea0094e63145017cc8d+
\ 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.d6ec83b71192b572b754ee2c9e4d4b335b0e06779ade4a2882f822f6f1320893-
\ No newline at end of file
+#+linux-qemu-guest.b390fb55ca8c468d1ec7d010f9aa7a66903ab2b72ca7c51ef0ca652957e74a23+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/xbps b/variants/ccx-x86_64/xbps
@@ -1,45 +1,47 @@
 #!/usr/bin/env pthbs-build
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+libarchive.335f687a075ee28cc31ea3910a861e1c91347c712ff4caff956a71b7fe946941
-#+libressl.f56a6b4d6e3a363e5166c16cd200ac8827222ca834d3a0f101d2abeaf653548f
-#+pkgconf-pkg-config.c1a9f7d82167c9bb3e81e02aecb1e70e008eba1baeeac105b295fe118cab1fdd
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+libarchive.2be560b716a154acdd4edab4003f07ec5893cbf73fd141b9038b5f62655bd991
+#+libressl.0a80f4ef368cf90a5fed4e1b2e9e327b6e2335d9bb1e56bdc4d242ec89c5ea18
+#+pkgconf-pkg-config.652821c31e2ebaa4f95a1a83f2dea31a62ff60bfc77590543198d2ed37115be1
 #@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 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.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+m4.b38ed60ffea1a09d5f57a79eab2fc576b64f38c5e871bf1395b64829322d2709
-#+netbsd-curses.4fc582669f1e5eac42515aaeb667d50a2c64a8a9dc47f51e5cb6487cceb8e01a
-#+libbsd.5ef8aa629ad55334898e1bf13d0fed9e8879fedd76022ebc5abc2504d74ee965
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+m4.3e1bd43513a03b656cff43101e0084ea4d21508d79c8e1d85d711455314508c7
+#+netbsd-curses.1ba971dbc1ba9342fc5dfa9b13c37e54374f0ddb458c0aa3a152893ca3000979
+#+libbsd.a946930226eab857d8674b679d99a65af72c985524eed148c98d362f9a554467
 #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config
 #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:.
 
@@ -65,6 +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 LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
diff --git a/variants/ccx-x86_64/zstd b/variants/ccx-x86_64/zstd
@@ -1,43 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.785228dc3b70f554b6f6ce5794e5983d067440c30ab929e4fbd4be141d608d8c
-#+busybox-bzip2.dd6a4dad157650f20b2548a2e58f949b7e2f013416ea91b372cae777cc61924e
-#+busybox-gzip.b67189d3cdb15b8a341bafa97ed965f17280b32f8125a7e02796db461adc3dc0
-#+busybox-lzop.63b7ce0e419c8d866dc5e5fd1c724777cb0896c2809ade8ffa74e44953c9d1b7
-#+busybox-unzip.d3a533f7e1a3e577ddd9998574d91cf63086568581713678e1d596ab5c7186f2
-#+busybox-xz.4ede8f22de9fc2998501b9ce1f90345fe55b99a94873b19da7b7d99fada7a221
-#+busybox-cpio.00ab7d578182a2c18c62dc048b6e559053974d8368312c5f652a98d2f7b26697
-#+busybox-dpkg.e98ef528a5a099dd3d7f9eb017b06d24b6f5e46aba131e30678059b0d60d1703
-#+busybox-rpm.ed60a1ca1fce971fb127c9d51709e5bc7e9b236941ed06860994452d7e551ec3
-#+busybox-tar.c4d8621eb534a8ed78b14c563dcf58a75945bbae3368453aff32ca454daf2164
-#+busybox-ed.40560a5d73f129209678bb84d5047c7b5dc9a47e6ceae467d91d18a482a758b4
-#+busybox-sed.b95d9c18581f66f2486bcda8c26a007dff4d1b0c38ff63f7e46a5937c00dc258
-#+busybox-vi.98f0652f60007927023d5a01156d7e127dac36c375f595a3ce4bd4fbdabe67d4
-#+busybox-xxd.88632cbb20f2583d7a08eacfbe44deb357424f96dc7c70a48d768bfa4c1e8cbd
-#+busybox-process-extra.c8a8ee44fc165db1b122c08ed9ca73a91ecc5f045870aababdb9d77585061b84
-#+busybox-procps.0f912e7fcbc4f8613a09a10097c94697b9ad14ec060ddfc37e9805dc1a4e06f0
-#+busybox-psmisc.6d7a284a27ba5518a0dfe35ab903740966fa52affb585720b3613acdd8bfeec7
-#+busybox-ash.c8de7f7b5e0093f06177410cbb79b56fb442e2bae113bdf66d5d83c201b0acc9
-#+busybox-bc.b082c2469dc84fb26c100687e809fbf08acf6c6eeb70b181296b12dd6d3c7863
-#+busybox-coreutils.2fd81c872033bb8b951b0fb446a9f73961a7a5a2ed8cf72882a1407932b80728
-#+busybox-coreutils-extra.59881558f6796334271143d7b29d4df437e1de4b6835c3c69b704d7ababc31bf
-#+busybox-daemontools.c6f0cc4ad3fa53366fd0f60c457bf31f1ec24fb91f78ea5187a34043eeb41a9c
-#+busybox-grep.76ecf7ff733433a1f245778607b1587a63013aecb9826569167f791c91e1f0bd
-#+busybox-misc.d74097cc93d6c6d92f8a75c2b49505b8ac39d549f807162f1b607f4bb3c6e2ba
-#+busybox-sh.dd63c8d7d290709d1837fc06ac98bba75a31065c6598f42bf1203a6af311500e
-#+busybox-util-linux-unpriv.5b692dfc8a2359b08f0743e8661036d192b5892828e55ec44bfeb6251b25a7f0
-#+busybox-findutils.38ea6a449a9d86ae896dcd2ae53113db06ad0d61fee457300ca5b22b31e60ec5
-#+nawk.21c18d1e544b51e43085ff0a0ca60c08a2ee8d70f84fb16d133f295acc4e9f9e
-#+musl.184a336c72c631fe8769e12809d6e4a90e77e8cd6006115dde0112101839683c
-#+gcc.fef54df08031c34326d3f54a13fe8dd42e1ee7e04e074ce597e35ddc7163573f
-#+binutils.89a09849f70a88bdf9af743d4cf583cf0e6619e402c0143f3a6959e2241e6100
-#+gnu-make.d453997e38601139c06350ab962c60e9ec98de903137947023296357de7aa917
-#+busybox-diffutils.165f378f7298c68c0f3fba7729281524cc0a669bddca8e5dd9b49318a9c428bc
+#+busybox.2443d83461dc837cc8b7d0eabde2f36fd6195b649e7980b9527c20207393c046
+#+busybox-bzip2.75fa0cbe9eaa1a3b476bc1de70ba2291999617b307976f0d683a42a59b0885d0
+#+busybox-gzip.d6a787ca28ca7fe5ddd6b615c8169e737bd048b34f0085b4de83c36e688a30d4
+#+busybox-lzop.e5976d9f3fe6a14589746ce4e4fa098ff91f9661e44216290aa4e51215225291
+#+busybox-unzip.833a5a36a08d1ac5cf289077618161ba5d3bad917aa6c5a8c50f5eb183e52441
+#+busybox-xz.2e55db716003636978a0b2dd7e980dd82f4ce2af27928df59692be90ca3df270
+#+busybox-cpio.eb21ad9f933affe4f5704a842955651a7429dd531bbaf02541d03307d2cd134b
+#+busybox-dpkg.6d4c9a530b8de2771b6c15741578d45049ff25472f060472eeff005a92f37f1d
+#+busybox-rpm.59bab343cd7c44a3cb4f199f67813395cce58dabdd0edb9a67f09f8b7e554106
+#+busybox-tar.2edc693f9abd7271464c0853c3f546d5380728fbaffda9b22f9a0ca851f5260a
+#+busybox-ed.2a6439d6ada8d457d5134ab5bae36cefba755cde82fb089618aa388946d2a99a
+#+busybox-sed.e1ecde06ae9d5231a6a0ae83c435c016f8c01578ae47e06610acef34865fe869
+#+busybox-vi.53c634e8dfe1e9a119a3e65f515131de2b8ac389e27ca012056d9bf298c860d2
+#+busybox-xxd.2a5272e10923481aef5240d3a7a006897ece5f2e1e903af97d87ccf83959ff34
+#+busybox-process-extra.b5a6f3de342d39d2228be90f10aa68ce1343f445501164e7a3350227ae82ce10
+#+busybox-procps.735455d1c196a21a88b87a09db7d8a43e6436ccdcdf600da89c657f1dbb678e3
+#+busybox-psmisc.dd81ca549bb918e11b7bf8be136b66925ed30bb935bde8f5429c89af7574668d
+#+busybox-ash.620db3128a9346891c4aae1c8da848b373eda19418a568dda38cfdc6848199ca
+#+busybox-bc.6ea318189c080e89f1641031a69bac4faf3a2a79e671022540b89d6d8d8ccc75
+#+busybox-coreutils.b93d422789ed1235c97bcc359b704cba2579da1bda99b75b0aceed626651db7a
+#+busybox-coreutils-extra.ebf66e72231ac21a5766f1cc2676aa4d19493e65128f86e7265e10317846e775
+#+busybox-daemontools.7b92efdf577d43c492c706394ba522265bda76272f8d60532fe9a3708daa60d0
+#+busybox-grep.338590c7be74cbce47729923162f62a7c632f06e642ae9329cb1e8978ad3b6c5
+#+busybox-misc.3be561525d6462652081e5457ea8164ed316ec3056d7f8ccddb5cf2d8ecd8f75
+#+busybox-sh.0d4fd6e5189f9f56c916c082bd385734b6260ad091818d10ad76874dbe2f8677
+#+busybox-util-linux-unpriv.631e32a280c3e1323f21b6af7136c9447047a688fc2cebfca3b0ad9f7577508d
+#+busybox-findutils.1063bad0b293392c52cc3145f622be9000a8f73bc977eb4702d29a941791d949
+#+nawk.72d498c15598f075030507adacbdc66918fff4c121faff179c780d52db129dc1
+#+musl.1325201a71bfc7ab620af283601c973ecb403af238b240e972bb98ff9986d149
+#+gcc.09803b5936e34187420e3d317aec9a01d65c0b9fef5cc9c46c0fb5f2be054055
+#+binutils.216e3e4ea201e4c8b67f27ede8565667bf13c8dfcd486470f5ca3f011f82642b
+#+gnu-make.5d372738b5c2b4a5bd9481b48492c2dd7f501a219d8b687a2fe1849123788c98
+#+busybox-diffutils.00b4d8eea88f89eff3965a44601bc2406f1ad3f08ae4e4fdc550ca0984368da9
 #@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 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+zsh.bbc357369ae4f659065c55ed3ac39451b86f5839d668754ceb3805778fc91e74
-#+pthbs-banginstall.c189916ff1f12273d0a1266d3fac34e0af97ff0d693699d9c0bb1512a16927b1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+zsh.4bf497739c038075b843f732c942e800d8ff041388a1b0067e30424151a75d43
+#+pthbs-banginstall.fec12edeb78561ceba0c01ed76d793f0d620a45568dbb3313d2736e8daa72a2d
 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat
 
 
diff --git a/variants/root-x86_64/abduco b/variants/root-x86_64/abduco
@@ -1,43 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
 #@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 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
 #@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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+patch.8ecd35c8173bdc0a067515adae38f35d656ffc0aecae9e7634d7c797b51bd359
-#+libressl.1160d6705d54f6ef8f01613c3804e3d4a9b84b68d442dabb6a57b9ab9493b1a0
-#+zstd.cc3f5edef31c6a46908776241cf758e7da0da3f0d000247c604503e6d70b9155
-#+pkgconf-pkg-config.bab78c97363f15ff8964b4c3cf45f71e665e04a69facdb5f1e9b0ae98167206c
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+patch.dfa91c3dd07b78021e22e13d945a6aa1fd86784d9d0b855afc8456d641aa8c50
+#+libressl.4c07ed10608c48646995dddd52870e657b74a37293a8dd18688ca39426891278
+#+zstd.75e990bd5ec6647d85ecca05168e6e341a03fa480ac946706f9672d736e81ed2
+#+pkgconf-pkg-config.ba0e5c0fa191afa584afe826220475d25200c5b386643d65dae9842bfb2b3b39
 #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch
 #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools
 
@@ -43,6 +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 LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
diff --git a/variants/root-x86_64/applyuidgid-caps b/variants/root-x86_64/applyuidgid-caps
@@ -1,43 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+skalibs.900bf97ed0bb3435e1622df6adf4f44f80115c1e23ea11e8092c552bd6b1281d
-#+libcap.eee6868b84367e062137d11074c7ad81ee9389f153052251b36c7540027cd5f7
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+skalibs.0e6b83bcfbb25f62f3d946b29832e33ffa741a2ca2c9204054415825cb83b818
+#+libcap.4544ffcd5c8b495efc0bc03a21d673703ce18f02f308e25f60d894ee98bf6184
 #@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 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+m4.c660fe061f5ffaa82c00841257aa109e14b27d12b024a373f278586d85a3c3f0
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+m4.32beafc54cc9ced1138e0231fe717528810de9b8f82012b5a85d017156360f50
 #@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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+m4.c660fe061f5ffaa82c00841257aa109e14b27d12b024a373f278586d85a3c3f0
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+m4.32beafc54cc9ced1138e0231fe717528810de9b8f82012b5a85d017156360f50
 #@untar:-z:sha256:39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87:.
 
 
@@ -62,6 +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 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.1119895caf0f7c5d85499c45406512e9aa0c65a699ac92c1987b1516fd1fd36a
-#+gnu-make.e044ce7efc50d676acfa33d9f88492e463d180c9c43980ac457c52b657adff1e
-#+busybox.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+m4.1158dda7627d39512987976250569864e402008d64ca7980c813e7c9c8adb989
-#+nawk.4a7a477f8033ac5184eadcb0a979ad77a7a0de107a68d0b908b938fa068ce99c
+#+musl-cross-make.67f6cca83cd1328965f86c3a5118eec66e0e5e5f7b577a7e1f150cbec97eaec5
+#+gnu-make.ad3d1831fa514024b57b39b7ce0bacb146c0e7aac745293082d78b231ca7a77c
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+m4.ae5126985c3b3598426b0403578bcbff4e51271e1c97b95c991387a367d8089e
+#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
 #@sha256:a119e7e50cae23feaad160a533d69a90073a519521924da56abc74724cec65c6:merged.patch
 #@untar:-z:sha256:0cdd76777a0dfd3dd3a63f215f030208ddb91c2361d2bcc02acec0f1c16b6a2e:.
 
@@ -34,6 +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 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.4a7a477f8033ac5184eadcb0a979ad77a7a0de107a68d0b908b938fa068ce99c
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+m4.c660fe061f5ffaa82c00841257aa109e14b27d12b024a373f278586d85a3c3f0
-#+flex.ebac7441650ba2f6fbc069f26b8b80e31515b61b6b62c79b0a2eabbf4b8f209a
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+m4.32beafc54cc9ced1138e0231fe717528810de9b8f82012b5a85d017156360f50
+#+flex.27df5386adc46073659b232a29920f24dd7b450848d7f0084fd3895c9bedc888
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 
@@ -64,6 +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 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+gnu-make.e044ce7efc50d676acfa33d9f88492e463d180c9c43980ac457c52b657adff1e
-#+musl-cross-make.1119895caf0f7c5d85499c45406512e9aa0c65a699ac92c1987b1516fd1fd36a-
\ No newline at end of file
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+gnu-make.ad3d1831fa514024b57b39b7ce0bacb146c0e7aac745293082d78b231ca7a77c
+#+musl-cross-make.67f6cca83cd1328965f86c3a5118eec66e0e5e5f7b577a7e1f150cbec97eaec5+
\ 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.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.e044ce7efc50d676acfa33d9f88492e463d180c9c43980ac457c52b657adff1e
-#+busybox.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.ad3d1831fa514024b57b39b7ce0bacb146c0e7aac745293082d78b231ca7a77c
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
 #@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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
 
 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.1119895caf0f7c5d85499c45406512e9aa0c65a699ac92c1987b1516fd1fd36a
-#+gnu-make.e044ce7efc50d676acfa33d9f88492e463d180c9c43980ac457c52b657adff1e
-#+nawk.4a7a477f8033ac5184eadcb0a979ad77a7a0de107a68d0b908b938fa068ce99c
+#+musl-cross-make.67f6cca83cd1328965f86c3a5118eec66e0e5e5f7b577a7e1f150cbec97eaec5
+#+gnu-make.ad3d1831fa514024b57b39b7ce0bacb146c0e7aac745293082d78b231ca7a77c
+#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
 #@git:8d7ae80eda7e08ee361f8793683ae58216caf720:busybox
 #@sha256:13ed92216aef70e6fc431b2e66a9b20a71b5f4b69a3d7a84acbc4d1210d6ea6a:busybox/.config
 
 PATH="$pthbs_build_environment/command:$PATH"
-mcm=/versions/musl-cross-make.1119895caf0f7c5d85499c45406512e9aa0c65a699ac92c1987b1516fd1fd36a
-make=/versions/gnu-make.e044ce7efc50d676acfa33d9f88492e463d180c9c43980ac457c52b657adff1e
+mcm=/versions/musl-cross-make.67f6cca83cd1328965f86c3a5118eec66e0e5e5f7b577a7e1f150cbec97eaec5
+make=/versions/gnu-make.ad3d1831fa514024b57b39b7ce0bacb146c0e7aac745293082d78b231ca7a77c
 
 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.22dd20ebd78629f930fa77f0b84cd2a6f1074fd3bee821c312d62fa0bdf4d727
-#+gnu-make.5e01c40980ebfe83f86512d009a83fd736367c62e9a4c8df78d14736916aa127
-#+busybox.bf48392e909160d6d7ba31d35efa7a4ca37f96c06818d77ca13b132906694102
-#+nawk.4a7a477f8033ac5184eadcb0a979ad77a7a0de107a68d0b908b938fa068ce99c
+#+musl-cross-make.c2fb2e2455bfe14d4a02160674f83b5bb7b7a7b45aa37fb736efc2335ef029ae
+#+gnu-make.aefac1011f80fc35ae17a394eab3fddadeda6b788a6a49889efbe78d7365eb91
+#+busybox.bb6f1d57e91d00ac686a3dc3897152433b98f066ee9e6ae95d7d35863496ffac
+#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
 #@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.be8fec74aa225dcef7a624b170ff9e6a4270ced2c2b7ae30fb2bf114bbdd8bc9
-#+gnu-make.5e01c40980ebfe83f86512d009a83fd736367c62e9a4c8df78d14736916aa127
+#+musl-cross-make.0db83a03695adab20fbf668e85604a1b9d6ffbcff71618bafc909c053f801192
+#+gnu-make.aefac1011f80fc35ae17a394eab3fddadeda6b788a6a49889efbe78d7365eb91
 #@git:8d7ae80eda7e08ee361f8793683ae58216caf720:busybox
 #@sha256:13ed92216aef70e6fc431b2e66a9b20a71b5f4b69a3d7a84acbc4d1210d6ea6a:busybox/.config
 
-mcm=/versions/musl-cross-make.be8fec74aa225dcef7a624b170ff9e6a4270ced2c2b7ae30fb2bf114bbdd8bc9
-make=/versions/gnu-make.5e01c40980ebfe83f86512d009a83fd736367c62e9a4c8df78d14736916aa127
+mcm=/versions/musl-cross-make.0db83a03695adab20fbf668e85604a1b9d6ffbcff71618bafc909c053f801192
+make=/versions/gnu-make.aefac1011f80fc35ae17a394eab3fddadeda6b788a6a49889efbe78d7365eb91
 
 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+certdata2pem.7ae018568eef638428fe32946caecf0ce4e552369d3863220e9264f92242a954
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+certdata2pem.f57a0e15c5895e73757f61eb1d3b3df25eb82cd3c43b31c9efb4f40914c9354d
 #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:.
 
 
diff --git a/variants/root-x86_64/ccx-utils b/variants/root-x86_64/ccx-utils
@@ -1,44 +1,46 @@
 #!/usr/bin/env pthbs-build
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+skalibs.900bf97ed0bb3435e1622df6adf4f44f80115c1e23ea11e8092c552bd6b1281d
-#+s6.3efe528f392680722d59c9a7e78e44c99b7db6c9953ed337ae707dc2b5409677
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+skalibs.0e6b83bcfbb25f62f3d946b29832e33ffa741a2ca2c9204054415825cb83b818
+#+s6.284f89c0874e44f0e6fd9cf713c7af02a5c9aba553ec8691c4d47737e6afec56
 #@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 LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
diff --git a/variants/root-x86_64/certdata2pem b/variants/root-x86_64/certdata2pem
@@ -1,41 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
 #@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 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+zsh.bbc357369ae4f659065c55ed3ac39451b86f5839d668754ceb3805778fc91e74
-#+pthbs-banginstall.c189916ff1f12273d0a1266d3fac34e0af97ff0d693699d9c0bb1512a16927b1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+zsh.4bf497739c038075b843f732c942e800d8ff041388a1b0067e30424151a75d43
+#+pthbs-banginstall.fec12edeb78561ceba0c01ed76d793f0d620a45568dbb3313d2736e8daa72a2d
 #@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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-dosfstools.7c611daabb32afbdd073f954f8452aac5e54970370193db6c51fb6f22ca97585
-#+busybox-e2fsprogs.76cddd6409207b0da11916e85eb5a1f7d029b8910e4580b3142b9fec86c74e7a
-#+busybox-iproute2.550b1c0b492f6ba3079051dd8c864e6c1987db23a83b1603c92d0daf1aeb1169
-#+busybox-iputils.0c781d5f8e55b226f36faf725c63046d535aa3b5b3147246f945cb5f29d146f6
-#+busybox-net-misc.16ac87d6bd8fb8e96f2c7ab49bf5654add9f351b48e77fc8cfb7c85b30922ab6
-#+busybox-net-tools.ab3b95cfc6a5aecb4a23b8f2c3cdf6584471dae401a4ce4b57c0ef334a61c9bb
-#+busybox-traceroute.b978b5ee6505c9a5bd6ec712d672e4a4eac89b21d5213164195ef2c9bf521a9d
-#+busybox-wget.24e89fb2370069f68b500132f69b0bae90363bcecdafd2d1cbcc2cb1652073b5
-#+busybox-chpst.61db7ce002b28620e7e6d0bd51f6bcde2675dbfdaf49982e06c07dbe3018af16
-#+busybox-console.a3d57663741aa7028d30047a2396c2ad6ad2c003b41b4357f9dfb6c035ef9646
-#+busybox-getty.9f6b5c60b4a9decd14d5777be64cf5f1d6946631a7e04f46a91f06fe025a5919
-#+busybox-i2c-tools.58825d225b209cd8fe4f229c1864cbf2e3ff30f29f609b395b5ffc097e785771
-#+busybox-linux-extra.98459353c6ab525961c7588de45567be666c48c9d932de10f6a8022e99a00ba9
-#+busybox-mtd-utils.22f7846f09c5bc11cbe5f27d7da5a9aa324093bc1672fa6aca4e808b9e7c3aaf
-#+busybox-shadow.9529d2b1e4cc9a461453f69a216cae8209adb3590ccb9b1db18618cff132be21
-#+busybox-su.3e33932c67c686be1b67c732fd5f4f014b358c4bfa2d5ec22eae36b67d082dfd
-#+busybox-util-linux-priv.7614e93850020009da0961f788adf1472d528791aaaa03127e6bd5d9ed342f07
-#+busybox-logging.e2674933c594ea48ff61038d33e77960c4376bc82c6dda556b2ebde3ffb5d93f
-#+busybox-cron.8c51a9cf25f2143a6ba8e29cc0a87d27e35894d23bfa1c92bb62d542e66b37ca
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+busybox-login.0ab8447fd6ea524bff26844f945b8a4cd305219760ca04486b4742cc43f34661
-#+execline.d18b68e013041d932cb6e25de18722c8b10a31f7bd3c89700e31272053e61759
-#+s6.3efe528f392680722d59c9a7e78e44c99b7db6c9953ed337ae707dc2b5409677
-#+ccx-utils.73c3f29a27c203b6b799edb9ee6ea58d1eb28efbf2a27534a96c11744a6979b4
-#+applyuidgid-caps.98fab9f6ba041a60882702e5556e160675cb16c705381b464d0bb97072dedcd5
-#+easyseccomp.a24ebd44f84b96d9fa0460fde8053dd15dafeb38b976b255ce9006ee31717fee
-#+mlog.952ce119097c43d9692e19cb05d3647890906a97462781ee4e7caba47a3b04ba
-#+abduco.64dc3896b06b3cebbf53aee578a4ca6dc06fcf9a227535fd70b808843f32446d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-dosfstools.e7a348e1d775913157f2fbf4d93241e63ea7cefc121771913d844e2e4a092556
+#+busybox-e2fsprogs.54785935d38485569d8cac755f946bde6bcea3c7a72dcceac84ea7fa7db314bc
+#+busybox-iproute2.75cdc7a50d36c594b4fdd9a8510548d224a1ec000f6965d2cf425464bdc13c55
+#+busybox-iputils.2cb817ed1dcaecec1127ff946bfaadb4c95620c76b476e2a6673494f962bef11
+#+busybox-net-misc.89144737562a757e2fb36baf148dc3c96ecb1505b739c04295ca742598817129
+#+busybox-net-tools.6745ec247e5bc21969c4599bfc115c1506c195b5ded1f4dc9e732b4dfe22ec59
+#+busybox-traceroute.4332cedee870c7ab2c27ea1c843baa7a5bc0419814680acda808668705644cd0
+#+busybox-wget.f5e9d254b2bb4300696e8af1d79bb40ee2f694c9ea5a5f155fbd74bfd3cd811b
+#+busybox-chpst.0b63627b038eb832ec7b82e768ff0deec3fb0c125d171edaa778839f9b83fd39
+#+busybox-console.d8457654ab5d0fe25ea4608aaf59610bf261c022c981d461063008284b7a5c51
+#+busybox-getty.079429247cf7e523b1cb79c5115fb5a78b31a2d5e423304965c224bb080681fb
+#+busybox-i2c-tools.bf5627624846ef390ac82e2c72ce15f1f7a72deb310aa1c950f7f0aacf45bcf3
+#+busybox-linux-extra.a039d9086d0faf44545424a9cc3c065aa2553f9796939203eda5c57c3399a273
+#+busybox-mtd-utils.9cdeb6c42a5ec10a0dd05ca09c889cf00a1e2d2cd5fd52fe7252e0623d9a2819
+#+busybox-shadow.a0dd3a9b5ec86db2d7f77bbe59eef8b838eb6315d34607751430d3a005adcb04
+#+busybox-su.d9e7dc0128758cacdc7eaa4b58bc7bf17410b5902a6f94227c807b71711e4439
+#+busybox-util-linux-priv.966960c5d6e6c476b9332c3886e675aef21bf985af73481beaad0aea2b3ebe22
+#+busybox-logging.ef04b463b75789424e27e56c3f85fea03184848916d81bbaa63ee8f0ccf0d0c2
+#+busybox-cron.1a836b227ba8b7021d5357bf5f7feb482ebdeeeb3c547571522286843551c43e
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+busybox-login.e1006b60c58ca0c1bf9b04f1c536d8d7ecbb2ec7216ce20c283b212b8e6fd720
+#+execline.5423f4b96a1f5f845f44c8ff25fe5f99e7e2ea9bdda045e39b2428e6e47cc71e
+#+s6.284f89c0874e44f0e6fd9cf713c7af02a5c9aba553ec8691c4d47737e6afec56
+#+ccx-utils.663d23cb13bca584f07de1ca7a62476936fc9c9488584481f01e5fcb745e3ae0
+#+applyuidgid-caps.67645bda9b5a8a04777db0f9c33b53d9675547f16bb02bd58b7fce2668a1dd84
+#+easyseccomp.4c2a8af77b269fd01ceb456a484a133058a00d20cd8640d5fdcb85dfc0212bc7
+#+mlog.2f8b887191a2ddfcc6779a440fa9291fb73dae820381f54feff420c833b3209a
+#+abduco.ee661415b25250491b2134b542f38ee7f67bdee9c453d17665680eacfdfcbb32
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
 #@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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+zsh.bbc357369ae4f659065c55ed3ac39451b86f5839d668754ceb3805778fc91e74
-#+pthbs-banginstall.c189916ff1f12273d0a1266d3fac34e0af97ff0d693699d9c0bb1512a16927b1
-#+execline.d18b68e013041d932cb6e25de18722c8b10a31f7bd3c89700e31272053e61759
-#+alpine-keys.76bb8697baa713842c2c475cc1dcf08ae7be945dd0b58b2a315ed22d87a188ba
-#+apk-tools.ffa5b4e49404faf9de4bddff8997ef4b6c2873549de493a61b07ad13b5595888
-#+xbps.876c7b5e27a6f0d8d357abb2c998cb5f31e47370e7a44efad38f82d2c2161505
-#+container-bin-image.7e6b853f9b20f58b7c9affaccf9080bfbf9dfb1826f8a907684f8e7a46d5b57a
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+zsh.4bf497739c038075b843f732c942e800d8ff041388a1b0067e30424151a75d43
+#+pthbs-banginstall.fec12edeb78561ceba0c01ed76d793f0d620a45568dbb3313d2736e8daa72a2d
+#+execline.5423f4b96a1f5f845f44c8ff25fe5f99e7e2ea9bdda045e39b2428e6e47cc71e
+#+alpine-keys.19633767592efc37d710b07f6ac677c9852847e6ae0e4b5b9f77344b73a1df3e
+#+apk-tools.3c09d674cbce2c1b606a9dd33943fa6e95fdcbfa4c23d1b1ffaffd4dc4e5b254
+#+xbps.3b3cc8ce83fa6268b15138517cf581b49c07e1bd49691f3faba2aa2778e0eb2f
+#+container-bin-image.1ee863af33a3b4f4f2a30d3391a09c60c7ba3e1dc9092f6023d50a91cc3a5dd3
 #@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.ffa5b4e49404faf9de4bddff8997ef4b6c2873549de493a61b07ad13b5595888/command/apk.static' "${dest}/deps/command/"
-ln -sf '/versions/xbps.876c7b5e27a6f0d8d357abb2c998cb5f31e47370e7a44efad38f82d2c2161505/command/xbps-install.static' "${dest}/deps/command/"
+ln -sf '/versions/apk-tools.3c09d674cbce2c1b606a9dd33943fa6e95fdcbfa4c23d1b1ffaffd4dc4e5b254/command/apk.static' "${dest}/deps/command/"
+ln -sf '/versions/xbps.3b3cc8ce83fa6268b15138517cf581b49c07e1bd49691f3faba2aa2778e0eb2f/command/xbps-install.static' "${dest}/deps/command/"
 
-for f in '/versions/alpine-keys.76bb8697baa713842c2c475cc1dcf08ae7be945dd0b58b2a315ed22d87a188ba'/keys/alpine/*/*; do
+for f in '/versions/alpine-keys.19633767592efc37d710b07f6ac677c9852847e6ae0e4b5b9f77344b73a1df3e'/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.76bb8697baa713842c2c475cc1dcf08ae7be945dd0b58b2a
 done
  
 mkdir -p "${dest}/deps/keys/void"
-for f in '/versions/xbps.876c7b5e27a6f0d8d357abb2c998cb5f31e47370e7a44efad38f82d2c2161505'/keys/void/*; do
+for f in '/versions/xbps.3b3cc8ce83fa6268b15138517cf581b49c07e1bd49691f3faba2aa2778e0eb2f'/keys/void/*; do
 	ln -sf "$f" "${dest}/deps/keys/void/"
 done
 
-test -d '/versions/container-bin-image.7e6b853f9b20f58b7c9affaccf9080bfbf9dfb1826f8a907684f8e7a46d5b57a/container-bin-image'
-test -f '/versions/container-bin-image.7e6b853f9b20f58b7c9affaccf9080bfbf9dfb1826f8a907684f8e7a46d5b57a/container-bin-image/if'
-ln -sf '/versions/container-bin-image.7e6b853f9b20f58b7c9affaccf9080bfbf9dfb1826f8a907684f8e7a46d5b57a/container-bin-image' "${dest}/deps/"
+test -d '/versions/container-bin-image.1ee863af33a3b4f4f2a30d3391a09c60c7ba3e1dc9092f6023d50a91cc3a5dd3/container-bin-image'
+test -f '/versions/container-bin-image.1ee863af33a3b4f4f2a30d3391a09c60c7ba3e1dc9092f6023d50a91cc3a5dd3/container-bin-image/if'
+ln -sf '/versions/container-bin-image.1ee863af33a3b4f4f2a30d3391a09c60c7ba3e1dc9092f6023d50a91cc3a5dd3/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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-dosfstools.7c611daabb32afbdd073f954f8452aac5e54970370193db6c51fb6f22ca97585
-#+busybox-e2fsprogs.76cddd6409207b0da11916e85eb5a1f7d029b8910e4580b3142b9fec86c74e7a
-#+busybox-iproute2.550b1c0b492f6ba3079051dd8c864e6c1987db23a83b1603c92d0daf1aeb1169
-#+busybox-iputils.0c781d5f8e55b226f36faf725c63046d535aa3b5b3147246f945cb5f29d146f6
-#+busybox-net-misc.16ac87d6bd8fb8e96f2c7ab49bf5654add9f351b48e77fc8cfb7c85b30922ab6
-#+busybox-net-tools.ab3b95cfc6a5aecb4a23b8f2c3cdf6584471dae401a4ce4b57c0ef334a61c9bb
-#+busybox-traceroute.b978b5ee6505c9a5bd6ec712d672e4a4eac89b21d5213164195ef2c9bf521a9d
-#+busybox-wget.24e89fb2370069f68b500132f69b0bae90363bcecdafd2d1cbcc2cb1652073b5
-#+busybox-chpst.61db7ce002b28620e7e6d0bd51f6bcde2675dbfdaf49982e06c07dbe3018af16
-#+busybox-console.a3d57663741aa7028d30047a2396c2ad6ad2c003b41b4357f9dfb6c035ef9646
-#+busybox-getty.9f6b5c60b4a9decd14d5777be64cf5f1d6946631a7e04f46a91f06fe025a5919
-#+busybox-i2c-tools.58825d225b209cd8fe4f229c1864cbf2e3ff30f29f609b395b5ffc097e785771
-#+busybox-linux-extra.98459353c6ab525961c7588de45567be666c48c9d932de10f6a8022e99a00ba9
-#+busybox-mtd-utils.22f7846f09c5bc11cbe5f27d7da5a9aa324093bc1672fa6aca4e808b9e7c3aaf
-#+busybox-shadow.9529d2b1e4cc9a461453f69a216cae8209adb3590ccb9b1db18618cff132be21
-#+busybox-su.3e33932c67c686be1b67c732fd5f4f014b358c4bfa2d5ec22eae36b67d082dfd
-#+busybox-util-linux-priv.7614e93850020009da0961f788adf1472d528791aaaa03127e6bd5d9ed342f07
-#+busybox-logging.e2674933c594ea48ff61038d33e77960c4376bc82c6dda556b2ebde3ffb5d93f
-#+busybox-cron.8c51a9cf25f2143a6ba8e29cc0a87d27e35894d23bfa1c92bb62d542e66b37ca
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+execline.d18b68e013041d932cb6e25de18722c8b10a31f7bd3c89700e31272053e61759
-#+s6.3efe528f392680722d59c9a7e78e44c99b7db6c9953ed337ae707dc2b5409677
-#+s6-portable-utils.0c9fbc4557db5dd840e61da0970484b593c0346552f029ce9ca05deb86473c9e
-#+s6-linux-utils.1247b500ae6b7400f33e9749a9568e0db697e1f77ec4073b393b81a170874bbc
-#+zsh.bbc357369ae4f659065c55ed3ac39451b86f5839d668754ceb3805778fc91e74
-#+confz.f983e6a43ab4d396e298b8bbfe9bf9a5a2c68e543ba1a4b8bda980fe35981b2d
-#+containers.b9a857041e070bf5b7c3387c1196f27bac103b72571f90c0cc8e2aae28c1f186
-#+xbps.876c7b5e27a6f0d8d357abb2c998cb5f31e47370e7a44efad38f82d2c2161505
-#+zstd.cc3f5edef31c6a46908776241cf758e7da0da3f0d000247c604503e6d70b9155
-#+apk-tools.ffa5b4e49404faf9de4bddff8997ef4b6c2873549de493a61b07ad13b5595888
-#+alpine-keys.76bb8697baa713842c2c475cc1dcf08ae7be945dd0b58b2a315ed22d87a188ba
-#+getent.33ac0bec77db0587d48488ae661dce7aee49e856388d7b4597563b3317ebf592
-#+fileset.5873f643ff0e490a13bba171abdab4bb16b1e40045acdc8118131a54aed97fe0
-#+ccx-utils.73c3f29a27c203b6b799edb9ee6ea58d1eb28efbf2a27534a96c11744a6979b4
-#+easyseccomp.a24ebd44f84b96d9fa0460fde8053dd15dafeb38b976b255ce9006ee31717fee
-#+findutils.fa4fdb063bc00c370ae025837a6b2cd41b38a425022c653533f15483e9f7f101
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010-
\ No newline at end of file
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-dosfstools.e7a348e1d775913157f2fbf4d93241e63ea7cefc121771913d844e2e4a092556
+#+busybox-e2fsprogs.54785935d38485569d8cac755f946bde6bcea3c7a72dcceac84ea7fa7db314bc
+#+busybox-iproute2.75cdc7a50d36c594b4fdd9a8510548d224a1ec000f6965d2cf425464bdc13c55
+#+busybox-iputils.2cb817ed1dcaecec1127ff946bfaadb4c95620c76b476e2a6673494f962bef11
+#+busybox-net-misc.89144737562a757e2fb36baf148dc3c96ecb1505b739c04295ca742598817129
+#+busybox-net-tools.6745ec247e5bc21969c4599bfc115c1506c195b5ded1f4dc9e732b4dfe22ec59
+#+busybox-traceroute.4332cedee870c7ab2c27ea1c843baa7a5bc0419814680acda808668705644cd0
+#+busybox-wget.f5e9d254b2bb4300696e8af1d79bb40ee2f694c9ea5a5f155fbd74bfd3cd811b
+#+busybox-chpst.0b63627b038eb832ec7b82e768ff0deec3fb0c125d171edaa778839f9b83fd39
+#+busybox-console.d8457654ab5d0fe25ea4608aaf59610bf261c022c981d461063008284b7a5c51
+#+busybox-getty.079429247cf7e523b1cb79c5115fb5a78b31a2d5e423304965c224bb080681fb
+#+busybox-i2c-tools.bf5627624846ef390ac82e2c72ce15f1f7a72deb310aa1c950f7f0aacf45bcf3
+#+busybox-linux-extra.a039d9086d0faf44545424a9cc3c065aa2553f9796939203eda5c57c3399a273
+#+busybox-mtd-utils.9cdeb6c42a5ec10a0dd05ca09c889cf00a1e2d2cd5fd52fe7252e0623d9a2819
+#+busybox-shadow.a0dd3a9b5ec86db2d7f77bbe59eef8b838eb6315d34607751430d3a005adcb04
+#+busybox-su.d9e7dc0128758cacdc7eaa4b58bc7bf17410b5902a6f94227c807b71711e4439
+#+busybox-util-linux-priv.966960c5d6e6c476b9332c3886e675aef21bf985af73481beaad0aea2b3ebe22
+#+busybox-logging.ef04b463b75789424e27e56c3f85fea03184848916d81bbaa63ee8f0ccf0d0c2
+#+busybox-cron.1a836b227ba8b7021d5357bf5f7feb482ebdeeeb3c547571522286843551c43e
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+execline.5423f4b96a1f5f845f44c8ff25fe5f99e7e2ea9bdda045e39b2428e6e47cc71e
+#+s6.284f89c0874e44f0e6fd9cf713c7af02a5c9aba553ec8691c4d47737e6afec56
+#+s6-portable-utils.95211b25d94b4c8840eb1105bbdd9783dc8ba8950f1939339e920543038c5edd
+#+s6-linux-utils.b898195ac86e82b037ba8c638be5aeaac6fd531bbe5ae0918bddd078766aeeed
+#+zsh.4bf497739c038075b843f732c942e800d8ff041388a1b0067e30424151a75d43
+#+confz.6e66d378495133195a0854e25aafa195522161f65cbb15262687ea3c7bb6f84f
+#+containers.1c1cbd056de1268a6b13d12911db6bb3b9a8dcfe491338ff7be2f9f812ac4d3e
+#+xbps.3b3cc8ce83fa6268b15138517cf581b49c07e1bd49691f3faba2aa2778e0eb2f
+#+zstd.75e990bd5ec6647d85ecca05168e6e341a03fa480ac946706f9672d736e81ed2
+#+apk-tools.3c09d674cbce2c1b606a9dd33943fa6e95fdcbfa4c23d1b1ffaffd4dc4e5b254
+#+alpine-keys.19633767592efc37d710b07f6ac677c9852847e6ae0e4b5b9f77344b73a1df3e
+#+getent.71a6190244cf9b96b0bb2a865c6ed63fb4a32cc26240fe467e355f2b741ef04f
+#+fileset.6e2b09e8969275f4cb1073ecfad577671fc7a8ffcfc5caa959b16242744efde0
+#+ccx-utils.663d23cb13bca584f07de1ca7a62476936fc9c9488584481f01e5fcb745e3ae0
+#+easyseccomp.4c2a8af77b269fd01ceb456a484a133058a00d20cd8640d5fdcb85dfc0212bc7
+#+findutils.3e90c5c2e3b384bbd0e63963a328f6fb9ddc7e80e35eff39a6a46e7c31a6994d
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a+
\ 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+m4.c660fe061f5ffaa82c00841257aa109e14b27d12b024a373f278586d85a3c3f0
-#+libressl.1160d6705d54f6ef8f01613c3804e3d4a9b84b68d442dabb6a57b9ab9493b1a0
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+m4.32beafc54cc9ced1138e0231fe717528810de9b8f82012b5a85d017156360f50
+#+libressl.4c07ed10608c48646995dddd52870e657b74a37293a8dd18688ca39426891278
 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:.
 
 
@@ -63,6 +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 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-dosfstools.7c611daabb32afbdd073f954f8452aac5e54970370193db6c51fb6f22ca97585
-#+busybox-e2fsprogs.76cddd6409207b0da11916e85eb5a1f7d029b8910e4580b3142b9fec86c74e7a
-#+busybox-iproute2.550b1c0b492f6ba3079051dd8c864e6c1987db23a83b1603c92d0daf1aeb1169
-#+busybox-iputils.0c781d5f8e55b226f36faf725c63046d535aa3b5b3147246f945cb5f29d146f6
-#+busybox-net-misc.16ac87d6bd8fb8e96f2c7ab49bf5654add9f351b48e77fc8cfb7c85b30922ab6
-#+busybox-net-tools.ab3b95cfc6a5aecb4a23b8f2c3cdf6584471dae401a4ce4b57c0ef334a61c9bb
-#+busybox-traceroute.b978b5ee6505c9a5bd6ec712d672e4a4eac89b21d5213164195ef2c9bf521a9d
-#+busybox-wget.24e89fb2370069f68b500132f69b0bae90363bcecdafd2d1cbcc2cb1652073b5
-#+busybox-chpst.61db7ce002b28620e7e6d0bd51f6bcde2675dbfdaf49982e06c07dbe3018af16
-#+busybox-console.a3d57663741aa7028d30047a2396c2ad6ad2c003b41b4357f9dfb6c035ef9646
-#+busybox-getty.9f6b5c60b4a9decd14d5777be64cf5f1d6946631a7e04f46a91f06fe025a5919
-#+busybox-i2c-tools.58825d225b209cd8fe4f229c1864cbf2e3ff30f29f609b395b5ffc097e785771
-#+busybox-linux-extra.98459353c6ab525961c7588de45567be666c48c9d932de10f6a8022e99a00ba9
-#+busybox-mtd-utils.22f7846f09c5bc11cbe5f27d7da5a9aa324093bc1672fa6aca4e808b9e7c3aaf
-#+busybox-shadow.9529d2b1e4cc9a461453f69a216cae8209adb3590ccb9b1db18618cff132be21
-#+busybox-su.3e33932c67c686be1b67c732fd5f4f014b358c4bfa2d5ec22eae36b67d082dfd
-#+busybox-util-linux-priv.7614e93850020009da0961f788adf1472d528791aaaa03127e6bd5d9ed342f07
-#+busybox-logging.e2674933c594ea48ff61038d33e77960c4376bc82c6dda556b2ebde3ffb5d93f
-#+busybox-cron.8c51a9cf25f2143a6ba8e29cc0a87d27e35894d23bfa1c92bb62d542e66b37ca
-#+attr.1539e5500c32c3f9d8e1e525f99a4ad0ca275f560ad6ce1c48a6d685aa6acf20
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+diffutils.608190128e833539a8c8da2e5a5cd5f302f67eead904d4d274af3ac3829fe9d9
-#+patch.8ecd35c8173bdc0a067515adae38f35d656ffc0aecae9e7634d7c797b51bd359
-#+flex.ebac7441650ba2f6fbc069f26b8b80e31515b61b6b62c79b0a2eabbf4b8f209a
-#+bison.3520cac13850cd73976f33a87d1db03834b887567c51442dc21f39d0e6996348
-#+rsync.bd2da93ab3ce897d92956840e5d73284912811c66bf3d4ab45a0ab69df749722
-#+execline.d18b68e013041d932cb6e25de18722c8b10a31f7bd3c89700e31272053e61759
-#+s6.3efe528f392680722d59c9a7e78e44c99b7db6c9953ed337ae707dc2b5409677
-#+s6-rc.f594b1fb5401ca006c4a7d68fe80de235f2770d48f9d9bd4ee50b93d0a0b19bf
-#+s6-portable-utils.0c9fbc4557db5dd840e61da0970484b593c0346552f029ce9ca05deb86473c9e
-#+s6-linux-utils.1247b500ae6b7400f33e9749a9568e0db697e1f77ec4073b393b81a170874bbc
-#+s6-linux-init.9c390b905f844c09ec2069462db04728d2b079b11a6adf07accee62f49000db3
-#+mdevd.756436e8f4dc95004d8ae3bd663d025655105ec086991242e89532eb2f3afb94
-#+s6-dns.3752bc9635dd91f8236def4f8124b1664f384b247d77d89b1a8f379de1459487
-#+libressl.1160d6705d54f6ef8f01613c3804e3d4a9b84b68d442dabb6a57b9ab9493b1a0
-#+s6-networking.61710ab5b9eb44351d637ba8490ad586e5311d3cd20171d3ce645bd1186af120
-#+zsh.bbc357369ae4f659065c55ed3ac39451b86f5839d668754ceb3805778fc91e74
-#+pthbs-banginstall.c189916ff1f12273d0a1266d3fac34e0af97ff0d693699d9c0bb1512a16927b1
-#+aat.36995ba96c9e753f09fbf5a362195eda2a5cee7ee4af8f02096590780f8ca5ca
-#+confz.f983e6a43ab4d396e298b8bbfe9bf9a5a2c68e543ba1a4b8bda980fe35981b2d
-#+containers.b9a857041e070bf5b7c3387c1196f27bac103b72571f90c0cc8e2aae28c1f186
-#+fileset.5873f643ff0e490a13bba171abdab4bb16b1e40045acdc8118131a54aed97fe0
-#+logincaps.663a2628a025c0920f408f7da988deb30f3dd64b9982ee3586407d25e53bab77
-#+snaprep.467b3ed10c8c7f1c0052ce054f9ad560b5e21867a04a8785263f84fe240b3a3c
-#+curl.ee692cec0552af873f5df64a39bb6f05f53f4933821abc6b7d3a832ecffecc53
-#+git.6be07435aa1a3cd7d3d092a45c271db2d06ed3ada9b23f1907f35c6675d989a6
-#+xbps.876c7b5e27a6f0d8d357abb2c998cb5f31e47370e7a44efad38f82d2c2161505
-#+apk-tools.ffa5b4e49404faf9de4bddff8997ef4b6c2873549de493a61b07ad13b5595888
-#+getent.33ac0bec77db0587d48488ae661dce7aee49e856388d7b4597563b3317ebf592
-#+getconf.7aaac14fe02860179a1eb4b700e3ae34b8b41553e9ef16f0876ef3383e569508
-#+iconv.a196681a9aedad6c533d8e680ed195519dc8ab6a9468bc63c9982d41ce2d36ea
-#+libcap.eee6868b84367e062137d11074c7ad81ee9389f153052251b36c7540027cd5f7
-#+applyuidgid-caps.98fab9f6ba041a60882702e5556e160675cb16c705381b464d0bb97072dedcd5
-#+ccx-utils.73c3f29a27c203b6b799edb9ee6ea58d1eb28efbf2a27534a96c11744a6979b4
-#+user-env.ff0031dd31e15dbdc2701242ee2e10afc93c53fa617dd115df44d4db2af70d6a
-#+strace.5d73813fdf3e4c1568e910ed6e5f7bf9df2c368254670cc6bff042351dc2cf60
-#+mlog.952ce119097c43d9692e19cb05d3647890906a97462781ee4e7caba47a3b04ba
-#+findutils.fa4fdb063bc00c370ae025837a6b2cd41b38a425022c653533f15483e9f7f101
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+nvi.7d7fdc65fa1fa436cedd5c2b9ddd2f80fe318ded80202266201a1f1523de2bb2
-#+squashfs-tools.f520976aa74b3c92198f514001fe48fe1c50d6697206e45bf47ede975638d9e1
-#+mandoc.4e4665e1e6f2cddda49a42f2a30d2f9f178730c6e6500ba7ca4f0399e28fcd2e
-#+tinyssh.a4cac4580ad7804683f85b9969a627a6e5e1aebf577ee973b378139fc30ca571
-#+system-config.b2fccf53aebc868bd358c2aa2038f4d7e5b3339f456e4118c45e6f6d62f1a0a6
-#+system-config-rc.776569c0ed06a5f65690c8eb0b00444dcc70c450f097a36e2d240a7dea85fd51
-#+system-config-scripts.8ddc5cee092890691bce7c6078a7314f26f2bb53bfc6d9eac0778822451a2288
-#+system-config-init.b557ab83597fd05b7cd0484b453e95b0fff8347837296be61300dfa8a77e4c41
-#+system-config-zsh.e09eb3cbeea83637e7ab0de3c9ef989490f9375279089caf4e43e9c8693d0f36
-#+busybox-modutils.094d5f1da7f936f10ff3c428c21924e2e3878548f98a043fd32e88f6ba1d4843-
\ No newline at end of file
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-dosfstools.e7a348e1d775913157f2fbf4d93241e63ea7cefc121771913d844e2e4a092556
+#+busybox-e2fsprogs.54785935d38485569d8cac755f946bde6bcea3c7a72dcceac84ea7fa7db314bc
+#+busybox-iproute2.75cdc7a50d36c594b4fdd9a8510548d224a1ec000f6965d2cf425464bdc13c55
+#+busybox-iputils.2cb817ed1dcaecec1127ff946bfaadb4c95620c76b476e2a6673494f962bef11
+#+busybox-net-misc.89144737562a757e2fb36baf148dc3c96ecb1505b739c04295ca742598817129
+#+busybox-net-tools.6745ec247e5bc21969c4599bfc115c1506c195b5ded1f4dc9e732b4dfe22ec59
+#+busybox-traceroute.4332cedee870c7ab2c27ea1c843baa7a5bc0419814680acda808668705644cd0
+#+busybox-wget.f5e9d254b2bb4300696e8af1d79bb40ee2f694c9ea5a5f155fbd74bfd3cd811b
+#+busybox-chpst.0b63627b038eb832ec7b82e768ff0deec3fb0c125d171edaa778839f9b83fd39
+#+busybox-console.d8457654ab5d0fe25ea4608aaf59610bf261c022c981d461063008284b7a5c51
+#+busybox-getty.079429247cf7e523b1cb79c5115fb5a78b31a2d5e423304965c224bb080681fb
+#+busybox-i2c-tools.bf5627624846ef390ac82e2c72ce15f1f7a72deb310aa1c950f7f0aacf45bcf3
+#+busybox-linux-extra.a039d9086d0faf44545424a9cc3c065aa2553f9796939203eda5c57c3399a273
+#+busybox-mtd-utils.9cdeb6c42a5ec10a0dd05ca09c889cf00a1e2d2cd5fd52fe7252e0623d9a2819
+#+busybox-shadow.a0dd3a9b5ec86db2d7f77bbe59eef8b838eb6315d34607751430d3a005adcb04
+#+busybox-su.d9e7dc0128758cacdc7eaa4b58bc7bf17410b5902a6f94227c807b71711e4439
+#+busybox-util-linux-priv.966960c5d6e6c476b9332c3886e675aef21bf985af73481beaad0aea2b3ebe22
+#+busybox-logging.ef04b463b75789424e27e56c3f85fea03184848916d81bbaa63ee8f0ccf0d0c2
+#+busybox-cron.1a836b227ba8b7021d5357bf5f7feb482ebdeeeb3c547571522286843551c43e
+#+attr.960060714c2b576113a7b2fb291c644d332b13710f9d67b15d2c2ff3f3b0f895
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+diffutils.7dd07321d0d6c3161b299ec616be1ce88a7dbecc58d3f90b043ac1f4c4378245
+#+patch.dfa91c3dd07b78021e22e13d945a6aa1fd86784d9d0b855afc8456d641aa8c50
+#+flex.27df5386adc46073659b232a29920f24dd7b450848d7f0084fd3895c9bedc888
+#+bison.bb1d7092815d00a3a31a39fedb8e418bc35f9fb41c49a9ede292c2c9b277a585
+#+rsync.9d640e8227288087bb1b174674f7a18ef6ba5cb7d6e6eacc562e5206aeb217d2
+#+execline.5423f4b96a1f5f845f44c8ff25fe5f99e7e2ea9bdda045e39b2428e6e47cc71e
+#+s6.284f89c0874e44f0e6fd9cf713c7af02a5c9aba553ec8691c4d47737e6afec56
+#+s6-rc.6ce4ee8b461f57ac4bb2f71a8b0a3a2911765786a7a950fb0abb70df61fd7441
+#+s6-portable-utils.95211b25d94b4c8840eb1105bbdd9783dc8ba8950f1939339e920543038c5edd
+#+s6-linux-utils.b898195ac86e82b037ba8c638be5aeaac6fd531bbe5ae0918bddd078766aeeed
+#+s6-linux-init.68f1249b659fd4f5523a8b73aca043bb966f5ba14b254e201e5d0a06c2c5968c
+#+mdevd.4b6b20892f0779e8fc38dae3203697a51cac09450abfce754059324b3b1ef383
+#+s6-dns.dc5af061895d362c4a6b0884cb7b3cdb4ea53b0ecc444097089bcf5407ec0b1c
+#+libressl.4c07ed10608c48646995dddd52870e657b74a37293a8dd18688ca39426891278
+#+s6-networking.9b8207fe5fc4118c60c259a7623fa688b559acdb8afa09dc9ae593bd669df444
+#+zsh.4bf497739c038075b843f732c942e800d8ff041388a1b0067e30424151a75d43
+#+pthbs-banginstall.fec12edeb78561ceba0c01ed76d793f0d620a45568dbb3313d2736e8daa72a2d
+#+aat.389a312fee2930ac879920ac125a7375f93f06846ae4026bd2c9ef6e79d65b9e
+#+confz.6e66d378495133195a0854e25aafa195522161f65cbb15262687ea3c7bb6f84f
+#+containers.1c1cbd056de1268a6b13d12911db6bb3b9a8dcfe491338ff7be2f9f812ac4d3e
+#+fileset.6e2b09e8969275f4cb1073ecfad577671fc7a8ffcfc5caa959b16242744efde0
+#+logincaps.ba9976b6226f9d2a15928fb3043c12a9b0ed43d5717e41d6b8ce758d0b54709c
+#+snaprep.1be9e39ff5198a2a7655a96a24dc8ff29babc93f014f61f58e140da960c5f274
+#+curl.638391f857d6278428f738a4de9e70bd3ed30e6b32ddb60f271d271559caffee
+#+git.58fe478690051ff28001856ddf5d82ef61ecd1ca2ce3089ee643263165f8d24d
+#+xbps.3b3cc8ce83fa6268b15138517cf581b49c07e1bd49691f3faba2aa2778e0eb2f
+#+apk-tools.3c09d674cbce2c1b606a9dd33943fa6e95fdcbfa4c23d1b1ffaffd4dc4e5b254
+#+getent.71a6190244cf9b96b0bb2a865c6ed63fb4a32cc26240fe467e355f2b741ef04f
+#+getconf.d791d172ecee20ddbb3cc4b0963cfb2bf82a25a7e472a922704705741a802674
+#+iconv.5ec3bbaf79ddf8a8693f4c5b5e97a0c96765442d772b0a9a77eab46af2c25db9
+#+libcap.4544ffcd5c8b495efc0bc03a21d673703ce18f02f308e25f60d894ee98bf6184
+#+applyuidgid-caps.67645bda9b5a8a04777db0f9c33b53d9675547f16bb02bd58b7fce2668a1dd84
+#+ccx-utils.663d23cb13bca584f07de1ca7a62476936fc9c9488584481f01e5fcb745e3ae0
+#+user-env.dd1ed5feb00faaaa39db1c15ff9247147459b89fd52226ec15bf5e04af928dcd
+#+strace.23997b0cf19f9c50cf7bf3b0089bd846f314f71a20973c97af163af409690f04
+#+mlog.2f8b887191a2ddfcc6779a440fa9291fb73dae820381f54feff420c833b3209a
+#+findutils.3e90c5c2e3b384bbd0e63963a328f6fb9ddc7e80e35eff39a6a46e7c31a6994d
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+nvi.c40f8b5e31333c456b9a941082139553e9518eec30e3b397edebb6956ec3f6bf
+#+squashfs-tools.aa8f3a9f3e28a8061b64daa894147016aac48c316b15e1a9d329bb1b2f500797
+#+mandoc.baf4ded296034f5deb8e6c3cac67cfae5b38e195a69880eaa8eefc3115234d5d
+#+tinyssh.46dae95f43a55a628214fa4ab14b8676fe093dafb91b560bc985fc11146fe1d4
+#+system-config.816a468cb8c2d61b5f7bb91a55e33cc811d0583a19b5afa091e345e4b094e975
+#+system-config-rc.8ebd28410a86204db4b5e5822e06fa7f4b8a48896475529cac12b508f528917a
+#+system-config-scripts.37221caf1fae9d28e9520289d239fe19e0e667d9d1ce57cf5ef253e8ccdd25fe
+#+system-config-init.e6b3c71c34246993d33111f708716eca8aac4c4f0eb643d712af36b12d8b6b01
+#+system-config-zsh.f862b6f9f7310a8c9d7a3f5998b37d45ffbcc48b2d918101e16a7800647d58b3
+#+busybox-modutils.a7ccd47b15206710f62d0260414c7c5544be8a0d892a171e6ccdc30140e2d62a+
\ 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+m4.c660fe061f5ffaa82c00841257aa109e14b27d12b024a373f278586d85a3c3f0
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+m4.32beafc54cc9ced1138e0231fe717528810de9b8f82012b5a85d017156360f50
 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:.
 
 
@@ -62,6 +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 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+ocaml.52d709f5b257879c00056a3b5eca16eaaa9c3e9205d53e9357782a277d6d6e8f
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+ocaml.765783460feb43427c9fc4a458686d36fe651946d726b6efc9f0baa1a7033b6d
 #@untar:-z:sha256:579c738f8ca191ba0a9b22dbe78f1377542442c9827cf4939f8964f09f9edb28:.
 
 
@@ -51,7 +51,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/versions/musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/versions/musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e/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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+m4.c660fe061f5ffaa82c00841257aa109e14b27d12b024a373f278586d85a3c3f0
-#+patch.8ecd35c8173bdc0a067515adae38f35d656ffc0aecae9e7634d7c797b51bd359
-#+flex.ebac7441650ba2f6fbc069f26b8b80e31515b61b6b62c79b0a2eabbf4b8f209a
-#+bison.3520cac13850cd73976f33a87d1db03834b887567c51442dc21f39d0e6996348
-#+libseccomp.f3c1c38c2dad65c7b7a16638a00106dc672535dbb1a2c873301f99bfc1725ff1
-#+error-standalone.dd04e405eb9bc8ff757ae8c54c6dedd94e8b6a7d13d351e32eed66f36ae434fb
-#+argp-standalone.e03827b8929f9481ee9bc1b8856f8ad47ccb69c32aac0ada7952d6f147c19054
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+m4.32beafc54cc9ced1138e0231fe717528810de9b8f82012b5a85d017156360f50
+#+patch.dfa91c3dd07b78021e22e13d945a6aa1fd86784d9d0b855afc8456d641aa8c50
+#+flex.27df5386adc46073659b232a29920f24dd7b450848d7f0084fd3895c9bedc888
+#+bison.bb1d7092815d00a3a31a39fedb8e418bc35f9fb41c49a9ede292c2c9b277a585
+#+libseccomp.0a0b47540bb882b8b68e7f0a527675c36647812fcc0e1a7cdca4dfb56864cbf6
+#+error-standalone.4bab2b0bc6cfc8881187c3d22a1a153c7018b23824731ccc13c7905ee2e3c7d5
+#+argp-standalone.215ceb8b9d28f744fafb2b40b7c054e5a8b5ff992d3785b2f50bc6deb070a608
 #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp
 #@sha256:eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10:easyseccomp_fix_includes.patch
 #@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
@@ -70,6 +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 LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
diff --git a/variants/root-x86_64/error-standalone b/variants/root-x86_64/error-standalone
@@ -1,43 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
 #@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 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+skalibs.900bf97ed0bb3435e1622df6adf4f44f80115c1e23ea11e8092c552bd6b1281d
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+skalibs.0e6b83bcfbb25f62f3d946b29832e33ffa741a2ca2c9204054415825cb83b818
 #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline
 
 
@@ -48,7 +48,7 @@ cd 'execline'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.900bf97ed0bb3435e1622df6adf4f44f80115c1e23ea11e8092c552bd6b1281d/sysdeps' \
+	--with-sysdeps='/versions/skalibs.0e6b83bcfbb25f62f3d946b29832e33ffa741a2ca2c9204054415825cb83b818/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.1119895caf0f7c5d85499c45406512e9aa0c65a699ac92c1987b1516fd1fd36a
-#+gnu-make.e044ce7efc50d676acfa33d9f88492e463d180c9c43980ac457c52b657adff1e
-#+busybox.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+nawk.4a7a477f8033ac5184eadcb0a979ad77a7a0de107a68d0b908b938fa068ce99c
-#+skalibs.9a35d999e5f56395cd53afd4678f7b457a7b8b772f94fc771376827c600d7b5d
+#+musl-cross-make.67f6cca83cd1328965f86c3a5118eec66e0e5e5f7b577a7e1f150cbec97eaec5
+#+gnu-make.ad3d1831fa514024b57b39b7ce0bacb146c0e7aac745293082d78b231ca7a77c
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
+#+skalibs.2b9b4395dfacc6f5747f8164c91d7338f347ceaf36c23311064b294b04a3ad84
 #@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.9a35d999e5f56395cd53afd4678f7b457a7b8b772f94fc771376827c600d7b5d/sysdeps' \
+	--with-sysdeps='/versions/skalibs.2b9b4395dfacc6f5747f8164c91d7338f347ceaf36c23311064b294b04a3ad84/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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+zsh.bbc357369ae4f659065c55ed3ac39451b86f5839d668754ceb3805778fc91e74
-#+pthbs-banginstall.c189916ff1f12273d0a1266d3fac34e0af97ff0d693699d9c0bb1512a16927b1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+zsh.4bf497739c038075b843f732c942e800d8ff041388a1b0067e30424151a75d43
+#+pthbs-banginstall.fec12edeb78561ceba0c01ed76d793f0d620a45568dbb3313d2736e8daa72a2d
 #@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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+m4.c660fe061f5ffaa82c00841257aa109e14b27d12b024a373f278586d85a3c3f0
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+m4.32beafc54cc9ced1138e0231fe717528810de9b8f82012b5a85d017156360f50
 #@untar:-J:sha256:1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5:.
 
 
@@ -62,6 +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 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.4a7a477f8033ac5184eadcb0a979ad77a7a0de107a68d0b908b938fa068ce99c
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+m4.c660fe061f5ffaa82c00841257aa109e14b27d12b024a373f278586d85a3c3f0
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+m4.32beafc54cc9ced1138e0231fe717528810de9b8f82012b5a85d017156360f50
 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
 
 
@@ -62,6 +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 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.1119895caf0f7c5d85499c45406512e9aa0c65a699ac92c1987b1516fd1fd36a
-#+gnu-make.e044ce7efc50d676acfa33d9f88492e463d180c9c43980ac457c52b657adff1e
-#+busybox.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+nawk.4a7a477f8033ac5184eadcb0a979ad77a7a0de107a68d0b908b938fa068ce99c
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gmp.b77bae8c4a3b3d1bc50d5c887cf3b357a484b50bb554a4c5d5e712479509c036
-#+mpc.298086c4e510c18a49b4eb23a89f862fa9a8cedd93ac8ba6ffe532f6a78617d1
-#+mpfr.7369386b300a968a0d30e796a2970eea85cd4f63e70c53f58a4169d69de8b4e1
+#+musl-cross-make.67f6cca83cd1328965f86c3a5118eec66e0e5e5f7b577a7e1f150cbec97eaec5
+#+gnu-make.ad3d1831fa514024b57b39b7ce0bacb146c0e7aac745293082d78b231ca7a77c
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gmp.5faaaedff9a84d2243d44b3d0b664c82362102baa3869a6800d69bbc5fde6458
+#+mpc.fa54f0a5ac1d1e15de6fc7ff3c3b2466ccfd7210b0fccf542893af688c86e189
+#+mpfr.663e7a8a93aa27bcd777d05b591b022b2119fc797894d59dc825e1670332822e
 #@sha256:62eb68290502d54b16457509aa0c3995a84116408e6b593d676b9f4c03b6b160:merged.patch
 #@untar:-J:sha256:e0dc77297625631ac8e50fa92fffefe899a4eb702592da5c32ef04e2293aca3a:.
 
@@ -15,6 +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 LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
@@ -45,14 +47,14 @@ patch -p1 <../merged.patch
 export TZ=UTC
 export SOURCE_DATE_EPOCH=1748000928
 
-mcm=/versions/musl-cross-make.1119895caf0f7c5d85499c45406512e9aa0c65a699ac92c1987b1516fd1fd36a
+mcm=/versions/musl-cross-make.67f6cca83cd1328965f86c3a5118eec66e0e5e5f7b577a7e1f150cbec97eaec5
 mcm_bin=$mcm/bin/x86_64-linux-musl
-musl=/versions/musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
+musl=/versions/musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
 build_env_static
 
-sysroot="$(realpath ..)/sysroot"
-objdir="$(realpath ..)/objdir"
-installdir="$(realpath ..)/install"
+sysroot="${workdir}/sysroot"
+objdir="${workdir}/objdir"
+installdir="${workdir}/install"
 src="$(realpath .)"
 
 with_make_vars() {
diff --git a/variants/root-x86_64/getconf b/variants/root-x86_64/getconf
@@ -1,41 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
 #@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 LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
diff --git a/variants/root-x86_64/getent b/variants/root-x86_64/getent
@@ -1,41 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
 #@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 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+m4.c660fe061f5ffaa82c00841257aa109e14b27d12b024a373f278586d85a3c3f0
-#+libressl.1160d6705d54f6ef8f01613c3804e3d4a9b84b68d442dabb6a57b9ab9493b1a0
-#+curl.ee692cec0552af873f5df64a39bb6f05f53f4933821abc6b7d3a832ecffecc53
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+m4.32beafc54cc9ced1138e0231fe717528810de9b8f82012b5a85d017156360f50
+#+libressl.4c07ed10608c48646995dddd52870e657b74a37293a8dd18688ca39426891278
+#+curl.638391f857d6278428f738a4de9e70bd3ed30e6b32ddb60f271d271559caffee
 #@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.1119895caf0f7c5d85499c45406512e9aa0c65a699ac92c1987b1516fd1fd36a
-#+gnu-make.e044ce7efc50d676acfa33d9f88492e463d180c9c43980ac457c52b657adff1e
-#+busybox.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+m4.1158dda7627d39512987976250569864e402008d64ca7980c813e7c9c8adb989
-#+nawk.4a7a477f8033ac5184eadcb0a979ad77a7a0de107a68d0b908b938fa068ce99c
+#+musl-cross-make.67f6cca83cd1328965f86c3a5118eec66e0e5e5f7b577a7e1f150cbec97eaec5
+#+gnu-make.ad3d1831fa514024b57b39b7ce0bacb146c0e7aac745293082d78b231ca7a77c
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+m4.ae5126985c3b3598426b0403578bcbff4e51271e1c97b95c991387a367d8089e
+#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
 #@untar:-J:sha256:a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898:.
 
 
@@ -33,6 +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 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.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.e044ce7efc50d676acfa33d9f88492e463d180c9c43980ac457c52b657adff1e
-#+busybox.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+nawk.4a7a477f8033ac5184eadcb0a979ad77a7a0de107a68d0b908b938fa068ce99c
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.ad3d1831fa514024b57b39b7ce0bacb146c0e7aac745293082d78b231ca7a77c
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -34,6 +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 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.1119895caf0f7c5d85499c45406512e9aa0c65a699ac92c1987b1516fd1fd36a
-#+nawk.4a7a477f8033ac5184eadcb0a979ad77a7a0de107a68d0b908b938fa068ce99c
+#+musl-cross-make.67f6cca83cd1328965f86c3a5118eec66e0e5e5f7b577a7e1f150cbec97eaec5
+#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -37,7 +37,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'make-4.4.1'
 
 
-mcm=/versions/musl-cross-make.1119895caf0f7c5d85499c45406512e9aa0c65a699ac92c1987b1516fd1fd36a
+mcm=/versions/musl-cross-make.67f6cca83cd1328965f86c3a5118eec66e0e5e5f7b577a7e1f150cbec97eaec5
 
 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.22dd20ebd78629f930fa77f0b84cd2a6f1074fd3bee821c312d62fa0bdf4d727
-#+gnu-make.5e01c40980ebfe83f86512d009a83fd736367c62e9a4c8df78d14736916aa127
-#+busybox.bf48392e909160d6d7ba31d35efa7a4ca37f96c06818d77ca13b132906694102
-#+nawk.4a7a477f8033ac5184eadcb0a979ad77a7a0de107a68d0b908b938fa068ce99c
+#+musl-cross-make.c2fb2e2455bfe14d4a02160674f83b5bb7b7a7b45aa37fb736efc2335ef029ae
+#+gnu-make.aefac1011f80fc35ae17a394eab3fddadeda6b788a6a49889efbe78d7365eb91
+#+busybox.bb6f1d57e91d00ac686a3dc3897152433b98f066ee9e6ae95d7d35863496ffac
+#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
 #@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.be8fec74aa225dcef7a624b170ff9e6a4270ced2c2b7ae30fb2bf114bbdd8bc9
+#+musl-cross-make.0db83a03695adab20fbf668e85604a1b9d6ffbcff71618bafc909c053f801192
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -30,7 +30,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'make-4.4.1'
 
 
-mcm=/versions/musl-cross-make.be8fec74aa225dcef7a624b170ff9e6a4270ced2c2b7ae30fb2bf114bbdd8bc9
+mcm=/versions/musl-cross-make.0db83a03695adab20fbf668e85604a1b9d6ffbcff71618bafc909c053f801192
 
 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+m4.c660fe061f5ffaa82c00841257aa109e14b27d12b024a373f278586d85a3c3f0
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+m4.32beafc54cc9ced1138e0231fe717528810de9b8f82012b5a85d017156360f50
 #@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:.
 
 
@@ -62,6 +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 LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
diff --git a/variants/root-x86_64/iconv b/variants/root-x86_64/iconv
@@ -1,41 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
 #@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 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+m4.c660fe061f5ffaa82c00841257aa109e14b27d12b024a373f278586d85a3c3f0
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+m4.32beafc54cc9ced1138e0231fe717528810de9b8f82012b5a85d017156360f50
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 
@@ -63,6 +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 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+m4.c660fe061f5ffaa82c00841257aa109e14b27d12b024a373f278586d85a3c3f0
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+m4.32beafc54cc9ced1138e0231fe717528810de9b8f82012b5a85d017156360f50
 #@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:.
 
 
@@ -62,6 +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 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+m4.c660fe061f5ffaa82c00841257aa109e14b27d12b024a373f278586d85a3c3f0
-#+libmd.31fa7b69270dc6135000dd4f61ac8096fb119e01184c77486b54780ba274898a
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+m4.32beafc54cc9ced1138e0231fe717528810de9b8f82012b5a85d017156360f50
+#+libmd.2aa805ea4981ead719f1bb0fb2fafc6a98c04459858bcbd2678cce7390ae34d5
 #@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:.
 
 
@@ -63,6 +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 LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
diff --git a/variants/root-x86_64/libcap b/variants/root-x86_64/libcap
@@ -1,44 +1,46 @@
 #!/usr/bin/env pthbs-build
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+pkgconf-pkg-config.bab78c97363f15ff8964b4c3cf45f71e665e04a69facdb5f1e9b0ae98167206c
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+pkgconf-pkg-config.ba0e5c0fa191afa584afe826220475d25200c5b386643d65dae9842bfb2b3b39
 #@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 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.1119895caf0f7c5d85499c45406512e9aa0c65a699ac92c1987b1516fd1fd36a
-#+gnu-make.e044ce7efc50d676acfa33d9f88492e463d180c9c43980ac457c52b657adff1e
-#+busybox.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+nawk.4a7a477f8033ac5184eadcb0a979ad77a7a0de107a68d0b908b938fa068ce99c
+#+musl-cross-make.67f6cca83cd1328965f86c3a5118eec66e0e5e5f7b577a7e1f150cbec97eaec5
+#+gnu-make.ad3d1831fa514024b57b39b7ce0bacb146c0e7aac745293082d78b231ca7a77c
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
 #@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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+m4.c660fe061f5ffaa82c00841257aa109e14b27d12b024a373f278586d85a3c3f0
-#+flex.ebac7441650ba2f6fbc069f26b8b80e31515b61b6b62c79b0a2eabbf4b8f209a
-#+bison.3520cac13850cd73976f33a87d1db03834b887567c51442dc21f39d0e6996348
-#+musl-fts.1d83b1920c1507a81b7d910a539523834013e20c7c9205631159b577bddd02c5
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+m4.32beafc54cc9ced1138e0231fe717528810de9b8f82012b5a85d017156360f50
+#+flex.27df5386adc46073659b232a29920f24dd7b450848d7f0084fd3895c9bedc888
+#+bison.bb1d7092815d00a3a31a39fedb8e418bc35f9fb41c49a9ede292c2c9b277a585
+#+musl-fts.3eb69c534fa8728270579ecd1bef95e35633497101e4f3d9457d6643f1eeee01
 #@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:.
 
 
@@ -65,6 +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 LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
diff --git a/variants/root-x86_64/libelf b/variants/root-x86_64/libelf
@@ -1,44 +1,46 @@
 #!/usr/bin/env pthbs-build
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+zstd.cc3f5edef31c6a46908776241cf758e7da0da3f0d000247c604503e6d70b9155
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+zstd.75e990bd5ec6647d85ecca05168e6e341a03fa480ac946706f9672d736e81ed2
 #@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 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+m4.c660fe061f5ffaa82c00841257aa109e14b27d12b024a373f278586d85a3c3f0
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+m4.32beafc54cc9ced1138e0231fe717528810de9b8f82012b5a85d017156360f50
 #@untar:-J:sha256:1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332:.
 
 
@@ -62,6 +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 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+m4.c660fe061f5ffaa82c00841257aa109e14b27d12b024a373f278586d85a3c3f0
-#+ca-certificates-wip-donotuse.841626898031a2fd23c74e016338ccf5f6ca57583656882b6ddcc9a86c0c4eac
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+m4.32beafc54cc9ced1138e0231fe717528810de9b8f82012b5a85d017156360f50
+#+ca-certificates-wip-donotuse.d6564766f5df6566c63b044fbc21ebabe69bdb87c3c7b9d04d22ecae761f28dd
 #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c
 #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:.
 
@@ -64,6 +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 LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
@@ -101,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.841626898031a2fd23c74e016338ccf5f6ca57583656882b6ddcc9a86c0c4eac/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
+cp -vs '/versions/ca-certificates-wip-donotuse.d6564766f5df6566c63b044fbc21ebabe69bdb87c3c7b9d04d22ecae761f28dd/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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+m4.c660fe061f5ffaa82c00841257aa109e14b27d12b024a373f278586d85a3c3f0
-#+pkgconf-pkg-config.bab78c97363f15ff8964b4c3cf45f71e665e04a69facdb5f1e9b0ae98167206c
-#+gperf.a5a905fa1aace89c373d2609469bec0a4fc1e7367c58463021dd680fbbf514d1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+m4.32beafc54cc9ced1138e0231fe717528810de9b8f82012b5a85d017156360f50
+#+pkgconf-pkg-config.ba0e5c0fa191afa584afe826220475d25200c5b386643d65dae9842bfb2b3b39
+#+gperf.4b3913e06aff5d5b61757a6ffe6f55175ec1fdfb4ca5df726372f8c788390a7e
 #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:.
 
 
@@ -64,6 +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 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+m4.c660fe061f5ffaa82c00841257aa109e14b27d12b024a373f278586d85a3c3f0
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+m4.32beafc54cc9ced1138e0231fe717528810de9b8f82012b5a85d017156360f50
 #@untar:-z:sha256:ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157:.
 
 
@@ -62,6 +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 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-modutils.094d5f1da7f936f10ff3c428c21924e2e3878548f98a043fd32e88f6ba1d4843
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+findutils.fa4fdb063bc00c370ae025837a6b2cd41b38a425022c653533f15483e9f7f101
-#+diffutils.608190128e833539a8c8da2e5a5cd5f302f67eead904d4d274af3ac3829fe9d9
-#+patch.8ecd35c8173bdc0a067515adae38f35d656ffc0aecae9e7634d7c797b51bd359
-#+flex.ebac7441650ba2f6fbc069f26b8b80e31515b61b6b62c79b0a2eabbf4b8f209a
-#+bison.3520cac13850cd73976f33a87d1db03834b887567c51442dc21f39d0e6996348
-#+rsync.bd2da93ab3ce897d92956840e5d73284912811c66bf3d4ab45a0ab69df749722
-#+zstd.cc3f5edef31c6a46908776241cf758e7da0da3f0d000247c604503e6d70b9155
-#+libelf.01263657d5bae957dd158e3390d35fecbd2bc4e3402d1d2a1bdb533b669bb030
-#+pkgconf-pkg-config.bab78c97363f15ff8964b4c3cf45f71e665e04a69facdb5f1e9b0ae98167206c
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-modutils.a7ccd47b15206710f62d0260414c7c5544be8a0d892a171e6ccdc30140e2d62a
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+findutils.3e90c5c2e3b384bbd0e63963a328f6fb9ddc7e80e35eff39a6a46e7c31a6994d
+#+diffutils.7dd07321d0d6c3161b299ec616be1ce88a7dbecc58d3f90b043ac1f4c4378245
+#+patch.dfa91c3dd07b78021e22e13d945a6aa1fd86784d9d0b855afc8456d641aa8c50
+#+flex.27df5386adc46073659b232a29920f24dd7b450848d7f0084fd3895c9bedc888
+#+bison.bb1d7092815d00a3a31a39fedb8e418bc35f9fb41c49a9ede292c2c9b277a585
+#+rsync.9d640e8227288087bb1b174674f7a18ef6ba5cb7d6e6eacc562e5206aeb217d2
+#+zstd.75e990bd5ec6647d85ecca05168e6e341a03fa480ac946706f9672d736e81ed2
+#+libelf.c64d9df0cc85d11ab1a2786fca439558ba8503ed23bf8487b87a172c1e0501a8
+#+pkgconf-pkg-config.ba0e5c0fa191afa584afe826220475d25200c5b386643d65dae9842bfb2b3b39
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
 #@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.1119895caf0f7c5d85499c45406512e9aa0c65a699ac92c1987b1516fd1fd36a
-#+gnu-make.e044ce7efc50d676acfa33d9f88492e463d180c9c43980ac457c52b657adff1e
-#+busybox.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+nawk.4a7a477f8033ac5184eadcb0a979ad77a7a0de107a68d0b908b938fa068ce99c
-#+skalibs.9a35d999e5f56395cd53afd4678f7b457a7b8b772f94fc771376827c600d7b5d
-#+execline.7dfe17f2b2f90074a6ebf6c89cdbc963b2cd66df6e49ec2fc3ddf5d11b1991ac
-#+libcap.0c7b4e6e9fe9eff3bcc35131f76eec5beb0ffd1acf5deaaec370065279495e3f
+#+musl-cross-make.67f6cca83cd1328965f86c3a5118eec66e0e5e5f7b577a7e1f150cbec97eaec5
+#+gnu-make.ad3d1831fa514024b57b39b7ce0bacb146c0e7aac745293082d78b231ca7a77c
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
+#+skalibs.2b9b4395dfacc6f5747f8164c91d7338f347ceaf36c23311064b294b04a3ad84
+#+execline.9560f42ca717c6cca0fc61ea92954420473a424a67b723ac82f09d6c1234649f
+#+libcap.bcbbce4752f73c31fd2b213bd2a0239f025903127e157e092831ae500dd41593
 #@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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+zsh.bbc357369ae4f659065c55ed3ac39451b86f5839d668754ceb3805778fc91e74
-#+pthbs-banginstall.c189916ff1f12273d0a1266d3fac34e0af97ff0d693699d9c0bb1512a16927b1
-#+execline.d18b68e013041d932cb6e25de18722c8b10a31f7bd3c89700e31272053e61759
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+ccx-utils.73c3f29a27c203b6b799edb9ee6ea58d1eb28efbf2a27534a96c11744a6979b4
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+zsh.4bf497739c038075b843f732c942e800d8ff041388a1b0067e30424151a75d43
+#+pthbs-banginstall.fec12edeb78561ceba0c01ed76d793f0d620a45568dbb3313d2736e8daa72a2d
+#+execline.5423f4b96a1f5f845f44c8ff25fe5f99e7e2ea9bdda045e39b2428e6e47cc71e
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+ccx-utils.663d23cb13bca584f07de1ca7a62476936fc9c9488584481f01e5fcb745e3ae0
 #@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.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+nawk.4a7a477f8033ac5184eadcb0a979ad77a7a0de107a68d0b908b938fa068ce99c
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
 
 
@@ -61,6 +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 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.1119895caf0f7c5d85499c45406512e9aa0c65a699ac92c1987b1516fd1fd36a
-#+gnu-make.e044ce7efc50d676acfa33d9f88492e463d180c9c43980ac457c52b657adff1e
-#+busybox.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+nawk.4a7a477f8033ac5184eadcb0a979ad77a7a0de107a68d0b908b938fa068ce99c
+#+musl-cross-make.67f6cca83cd1328965f86c3a5118eec66e0e5e5f7b577a7e1f150cbec97eaec5
+#+gnu-make.ad3d1831fa514024b57b39b7ce0bacb146c0e7aac745293082d78b231ca7a77c
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
 
 
@@ -32,6 +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 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
 #@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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+zsh.bbc357369ae4f659065c55ed3ac39451b86f5839d668754ceb3805778fc91e74
-#+pthbs-banginstall.c189916ff1f12273d0a1266d3fac34e0af97ff0d693699d9c0bb1512a16927b1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+zsh.4bf497739c038075b843f732c942e800d8ff041388a1b0067e30424151a75d43
+#+pthbs-banginstall.fec12edeb78561ceba0c01ed76d793f0d620a45568dbb3313d2736e8daa72a2d
 #@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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+skalibs.900bf97ed0bb3435e1622df6adf4f44f80115c1e23ea11e8092c552bd6b1281d
-#+execline.d18b68e013041d932cb6e25de18722c8b10a31f7bd3c89700e31272053e61759
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+skalibs.0e6b83bcfbb25f62f3d946b29832e33ffa741a2ca2c9204054415825cb83b818
+#+execline.5423f4b96a1f5f845f44c8ff25fe5f99e7e2ea9bdda045e39b2428e6e47cc71e
 #@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd
 
 
@@ -49,7 +49,7 @@ cd 'mdevd'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.900bf97ed0bb3435e1622df6adf4f44f80115c1e23ea11e8092c552bd6b1281d/sysdeps' \
+	--with-sysdeps='/versions/skalibs.0e6b83bcfbb25f62f3d946b29832e33ffa741a2ca2c9204054415825cb83b818/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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-dosfstools.7c611daabb32afbdd073f954f8452aac5e54970370193db6c51fb6f22ca97585
-#+busybox-e2fsprogs.76cddd6409207b0da11916e85eb5a1f7d029b8910e4580b3142b9fec86c74e7a
-#+busybox-iproute2.550b1c0b492f6ba3079051dd8c864e6c1987db23a83b1603c92d0daf1aeb1169
-#+busybox-iputils.0c781d5f8e55b226f36faf725c63046d535aa3b5b3147246f945cb5f29d146f6
-#+busybox-net-misc.16ac87d6bd8fb8e96f2c7ab49bf5654add9f351b48e77fc8cfb7c85b30922ab6
-#+busybox-net-tools.ab3b95cfc6a5aecb4a23b8f2c3cdf6584471dae401a4ce4b57c0ef334a61c9bb
-#+busybox-traceroute.b978b5ee6505c9a5bd6ec712d672e4a4eac89b21d5213164195ef2c9bf521a9d
-#+busybox-wget.24e89fb2370069f68b500132f69b0bae90363bcecdafd2d1cbcc2cb1652073b5
-#+busybox-chpst.61db7ce002b28620e7e6d0bd51f6bcde2675dbfdaf49982e06c07dbe3018af16
-#+busybox-console.a3d57663741aa7028d30047a2396c2ad6ad2c003b41b4357f9dfb6c035ef9646
-#+busybox-getty.9f6b5c60b4a9decd14d5777be64cf5f1d6946631a7e04f46a91f06fe025a5919
-#+busybox-i2c-tools.58825d225b209cd8fe4f229c1864cbf2e3ff30f29f609b395b5ffc097e785771
-#+busybox-linux-extra.98459353c6ab525961c7588de45567be666c48c9d932de10f6a8022e99a00ba9
-#+busybox-mtd-utils.22f7846f09c5bc11cbe5f27d7da5a9aa324093bc1672fa6aca4e808b9e7c3aaf
-#+busybox-shadow.9529d2b1e4cc9a461453f69a216cae8209adb3590ccb9b1db18618cff132be21
-#+busybox-su.3e33932c67c686be1b67c732fd5f4f014b358c4bfa2d5ec22eae36b67d082dfd
-#+busybox-util-linux-priv.7614e93850020009da0961f788adf1472d528791aaaa03127e6bd5d9ed342f07
-#+busybox-logging.e2674933c594ea48ff61038d33e77960c4376bc82c6dda556b2ebde3ffb5d93f
-#+busybox-cron.8c51a9cf25f2143a6ba8e29cc0a87d27e35894d23bfa1c92bb62d542e66b37ca
-#+execline.d18b68e013041d932cb6e25de18722c8b10a31f7bd3c89700e31272053e61759
-#+s6.3efe528f392680722d59c9a7e78e44c99b7db6c9953ed337ae707dc2b5409677
-#+mdev-scripts.506fbd9020132e7c73b742b83a53def73f1b317937a6b92031a83605cbc44fe5
-#+mdevd.756436e8f4dc95004d8ae3bd663d025655105ec086991242e89532eb2f3afb94
-#+busybox-modutils.094d5f1da7f936f10ff3c428c21924e2e3878548f98a043fd32e88f6ba1d4843-
\ No newline at end of file
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-dosfstools.e7a348e1d775913157f2fbf4d93241e63ea7cefc121771913d844e2e4a092556
+#+busybox-e2fsprogs.54785935d38485569d8cac755f946bde6bcea3c7a72dcceac84ea7fa7db314bc
+#+busybox-iproute2.75cdc7a50d36c594b4fdd9a8510548d224a1ec000f6965d2cf425464bdc13c55
+#+busybox-iputils.2cb817ed1dcaecec1127ff946bfaadb4c95620c76b476e2a6673494f962bef11
+#+busybox-net-misc.89144737562a757e2fb36baf148dc3c96ecb1505b739c04295ca742598817129
+#+busybox-net-tools.6745ec247e5bc21969c4599bfc115c1506c195b5ded1f4dc9e732b4dfe22ec59
+#+busybox-traceroute.4332cedee870c7ab2c27ea1c843baa7a5bc0419814680acda808668705644cd0
+#+busybox-wget.f5e9d254b2bb4300696e8af1d79bb40ee2f694c9ea5a5f155fbd74bfd3cd811b
+#+busybox-chpst.0b63627b038eb832ec7b82e768ff0deec3fb0c125d171edaa778839f9b83fd39
+#+busybox-console.d8457654ab5d0fe25ea4608aaf59610bf261c022c981d461063008284b7a5c51
+#+busybox-getty.079429247cf7e523b1cb79c5115fb5a78b31a2d5e423304965c224bb080681fb
+#+busybox-i2c-tools.bf5627624846ef390ac82e2c72ce15f1f7a72deb310aa1c950f7f0aacf45bcf3
+#+busybox-linux-extra.a039d9086d0faf44545424a9cc3c065aa2553f9796939203eda5c57c3399a273
+#+busybox-mtd-utils.9cdeb6c42a5ec10a0dd05ca09c889cf00a1e2d2cd5fd52fe7252e0623d9a2819
+#+busybox-shadow.a0dd3a9b5ec86db2d7f77bbe59eef8b838eb6315d34607751430d3a005adcb04
+#+busybox-su.d9e7dc0128758cacdc7eaa4b58bc7bf17410b5902a6f94227c807b71711e4439
+#+busybox-util-linux-priv.966960c5d6e6c476b9332c3886e675aef21bf985af73481beaad0aea2b3ebe22
+#+busybox-logging.ef04b463b75789424e27e56c3f85fea03184848916d81bbaa63ee8f0ccf0d0c2
+#+busybox-cron.1a836b227ba8b7021d5357bf5f7feb482ebdeeeb3c547571522286843551c43e
+#+execline.5423f4b96a1f5f845f44c8ff25fe5f99e7e2ea9bdda045e39b2428e6e47cc71e
+#+s6.284f89c0874e44f0e6fd9cf713c7af02a5c9aba553ec8691c4d47737e6afec56
+#+mdev-scripts.e4c3703e1a8b45aadc83e299afe01081b30a06143ed94392b58041902c43faac
+#+mdevd.4b6b20892f0779e8fc38dae3203697a51cac09450abfce754059324b3b1ef383
+#+busybox-modutils.a7ccd47b15206710f62d0260414c7c5544be8a0d892a171e6ccdc30140e2d62a+
\ No newline at end of file
diff --git a/variants/root-x86_64/mlog b/variants/root-x86_64/mlog
@@ -1,42 +1,44 @@
 #!/usr/bin/env pthbs-build
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
 #@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 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.1119895caf0f7c5d85499c45406512e9aa0c65a699ac92c1987b1516fd1fd36a
-#+gnu-make.e044ce7efc50d676acfa33d9f88492e463d180c9c43980ac457c52b657adff1e
-#+busybox.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+m4.1158dda7627d39512987976250569864e402008d64ca7980c813e7c9c8adb989
-#+nawk.4a7a477f8033ac5184eadcb0a979ad77a7a0de107a68d0b908b938fa068ce99c
-#+gmp.b77bae8c4a3b3d1bc50d5c887cf3b357a484b50bb554a4c5d5e712479509c036
-#+mpfr.7369386b300a968a0d30e796a2970eea85cd4f63e70c53f58a4169d69de8b4e1
+#+musl-cross-make.67f6cca83cd1328965f86c3a5118eec66e0e5e5f7b577a7e1f150cbec97eaec5
+#+gnu-make.ad3d1831fa514024b57b39b7ce0bacb146c0e7aac745293082d78b231ca7a77c
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+m4.ae5126985c3b3598426b0403578bcbff4e51271e1c97b95c991387a367d8089e
+#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
+#+gmp.5faaaedff9a84d2243d44b3d0b664c82362102baa3869a6800d69bbc5fde6458
+#+mpfr.663e7a8a93aa27bcd777d05b591b022b2119fc797894d59dc825e1670332822e
 #@untar:-z:sha256:ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8:.
 
 
@@ -35,6 +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 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.1119895caf0f7c5d85499c45406512e9aa0c65a699ac92c1987b1516fd1fd36a
-#+gnu-make.e044ce7efc50d676acfa33d9f88492e463d180c9c43980ac457c52b657adff1e
-#+busybox.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+m4.1158dda7627d39512987976250569864e402008d64ca7980c813e7c9c8adb989
-#+nawk.4a7a477f8033ac5184eadcb0a979ad77a7a0de107a68d0b908b938fa068ce99c
-#+gmp.b77bae8c4a3b3d1bc50d5c887cf3b357a484b50bb554a4c5d5e712479509c036
+#+musl-cross-make.67f6cca83cd1328965f86c3a5118eec66e0e5e5f7b577a7e1f150cbec97eaec5
+#+gnu-make.ad3d1831fa514024b57b39b7ce0bacb146c0e7aac745293082d78b231ca7a77c
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+m4.ae5126985c3b3598426b0403578bcbff4e51271e1c97b95c991387a367d8089e
+#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
+#+gmp.5faaaedff9a84d2243d44b3d0b664c82362102baa3869a6800d69bbc5fde6458
 #@untar:-J:sha256:b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01:.
 
 
@@ -34,6 +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 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.1119895caf0f7c5d85499c45406512e9aa0c65a699ac92c1987b1516fd1fd36a
-#+gnu-make.e044ce7efc50d676acfa33d9f88492e463d180c9c43980ac457c52b657adff1e
-#+busybox.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+nawk.4a7a477f8033ac5184eadcb0a979ad77a7a0de107a68d0b908b938fa068ce99c
+#+musl-cross-make.67f6cca83cd1328965f86c3a5118eec66e0e5e5f7b577a7e1f150cbec97eaec5
+#+gnu-make.ad3d1831fa514024b57b39b7ce0bacb146c0e7aac745293082d78b231ca7a77c
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
 #@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.1119895caf0f7c5d85499c45406512e9aa0c65a699ac92c1987b1516fd1fd36a
+mcm=/versions/musl-cross-make.67f6cca83cd1328965f86c3a5118eec66e0e5e5f7b577a7e1f150cbec97eaec5
 
 ./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.1119895caf0f7c5d85499c45406512e9aa0c65a699ac92c1987b1516fd1fd36a
-#+gnu-make.e044ce7efc50d676acfa33d9f88492e463d180c9c43980ac457c52b657adff1e
-#+busybox.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
+#+musl-cross-make.67f6cca83cd1328965f86c3a5118eec66e0e5e5f7b577a7e1f150cbec97eaec5
+#+gnu-make.ad3d1831fa514024b57b39b7ce0bacb146c0e7aac745293082d78b231ca7a77c
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
 #@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.4a7a477f8033ac5184eadcb0a979ad77a7a0de107a68d0b908b938fa068ce99c
+#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
 #@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
@@ -40,7 +40,7 @@ EOF
 
 printf '%s\n' >>config.mak \
 	"bbin=$bootstrap/bin" \
-	"repro=-ffile-prefix-map=$(realpath ..)=builddir" '
+	"repro=-ffile-prefix-map=${workdir}=builddir" '
 LINUX_VER=6.15.7
 st=-static --static
 fl=-g0 -O2 ${st} ${repro}
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.be8fec74aa225dcef7a624b170ff9e6a4270ced2c2b7ae30fb2bf114bbdd8bc9
-#+gnu-make.5e01c40980ebfe83f86512d009a83fd736367c62e9a4c8df78d14736916aa127
-#+busybox.bf48392e909160d6d7ba31d35efa7a4ca37f96c06818d77ca13b132906694102
-#+nawk.4a7a477f8033ac5184eadcb0a979ad77a7a0de107a68d0b908b938fa068ce99c
+#+musl-cross-make.0db83a03695adab20fbf668e85604a1b9d6ffbcff71618bafc909c053f801192
+#+gnu-make.aefac1011f80fc35ae17a394eab3fddadeda6b788a6a49889efbe78d7365eb91
+#+busybox.bb6f1d57e91d00ac686a3dc3897152433b98f066ee9e6ae95d7d35863496ffac
+#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
 #@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.4a7a477f8033ac5184eadcb0a979ad77a7a0de107a68d0b908b938fa068ce99c
+#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
 #@sha256:0cdd76777a0dfd3dd3a63f215f030208ddb91c2361d2bcc02acec0f1c16b6a2e:musl-cross-make/sources/binutils-2.44.tar.gz
 #@sha256:a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898:musl-cross-make/sources/gmp-6.3.0.tar.xz
 #@sha256:b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01:musl-cross-make/sources/mpfr-4.2.2.tar.xz
diff --git a/variants/root-x86_64/musl-fts b/variants/root-x86_64/musl-fts
@@ -1,42 +1,44 @@
 #!/usr/bin/env pthbs-build
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
 #@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 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.4a7a477f8033ac5184eadcb0a979ad77a7a0de107a68d0b908b938fa068ce99c
-#+bison.3520cac13850cd73976f33a87d1db03834b887567c51442dc21f39d0e6996348
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
+#+bison.bb1d7092815d00a3a31a39fedb8e418bc35f9fb41c49a9ede292c2c9b277a585
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
 #@untar:-z:sha256:e031b1e1d2b230f276f975bffb923f0ea15f798c839d15a3f26a1a39448e32d7:.
 
 
diff --git a/variants/root-x86_64/nawk:bootstrap b/variants/root-x86_64/nawk:bootstrap
@@ -11,6 +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 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
 #@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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+m4.c660fe061f5ffaa82c00841257aa109e14b27d12b024a373f278586d85a3c3f0
-#+netbsd-curses.73f036814cdc086750d291f9f758bd9be4fe13dad0d51e535358d080da49097b
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+m4.32beafc54cc9ced1138e0231fe717528810de9b8f82012b5a85d017156360f50
+#+netbsd-curses.2f8fd93d356fd884131ec295d27dd173c3801857bec19d790439369b23a1fb46
 #@untar:-z:sha256:755b87aa1e25c24c4c1668de5573d7d9a327b529423ce3ad9ee753bfb2296e33:.
 
 
@@ -63,6 +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 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+ocaml.52d709f5b257879c00056a3b5eca16eaaa9c3e9205d53e9357782a277d6d6e8f
-#+ocaml-findlib.82ddee8fbdcb193c33e605fd84c8837ccfd9afd90af4bcd07714b106b7831460
-#+ocamlbuild.2cd001072aa16274d6daf240398398fb605248b5fc42e62562964ffbf6a7ed29
-#+opam.89b81f9b769180e588d05341b048231ae478a05be9dfde61625a82488d9c4d22
-#+ocaml-topkg.3264d1d875fd56e13e2013fa905574597dad9d0a4e7df8e395134ab0923e2b4e
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+ocaml.765783460feb43427c9fc4a458686d36fe651946d726b6efc9f0baa1a7033b6d
+#+ocaml-findlib.0bad441ffa343cea9a7df6fb1444d1f14ed27edee813e660907719308347373b
+#+ocamlbuild.3a30b6b95cf5a892d62eb90a1e1d3c9d3cd2db91dcf0b61b022495b6e78b32dc
+#+opam.547794d6591cbc1bb3289d58cba4a73d88e5ef2222718c45f27d4c7ae19d1dc4
+#+ocaml-topkg.9c18e88faafc9aee334d336a012ac0e7a36ffe98d2cb0fa4e315dfdf0ac1d1f5
 #@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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+ocaml.52d709f5b257879c00056a3b5eca16eaaa9c3e9205d53e9357782a277d6d6e8f
-#+dune.2338acbe942ff838be65806f80545d1a774b602059abaff1be32a2a1dea1b284
-#+ocaml_intrinsics_kernel.fb0911abcf5bbec179cc3dec8da407ef7af8fba581d7f5c7fb69f8e3ed2da7f5
-#+ocaml-sexplib0.2bbcfd54c9fa6ab7882b732ff92ca8022967802018006ea693294e842ac68334
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+ocaml.765783460feb43427c9fc4a458686d36fe651946d726b6efc9f0baa1a7033b6d
+#+dune.f6b01aeac35d3f0ea34a4e207f3283661f25f8450851de2e5b0627a104903c19
+#+ocaml_intrinsics_kernel.563c4f3bf1093ece9355e60996c48f643c3c8d2f2e5ab70877cb35f95fd415be
+#+ocaml-sexplib0.02467e798d62338bb03cc7ff8a67dd3b192640da8a6230ba23c40c8c35cfefa5
 #@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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+ocaml.52d709f5b257879c00056a3b5eca16eaaa9c3e9205d53e9357782a277d6d6e8f
-#+ocaml-findlib.82ddee8fbdcb193c33e605fd84c8837ccfd9afd90af4bcd07714b106b7831460
-#+ocamlbuild.2cd001072aa16274d6daf240398398fb605248b5fc42e62562964ffbf6a7ed29
-#+opam.89b81f9b769180e588d05341b048231ae478a05be9dfde61625a82488d9c4d22
-#+ocaml-topkg.3264d1d875fd56e13e2013fa905574597dad9d0a4e7df8e395134ab0923e2b4e
-#+ocaml-astring.fb23f9334b24ff1180ff0344bde3f8cb5650674193a98ab772dc98a0d4479610
-#+ocaml-fpath.cb7bbc8b63c6511809df0efefb0ee00be59e6726d10ef1eefd5c81befac90f1a
-#+ocaml-rresult.9d5b1b18f478d3dd60e62c1f31e7a4b0509517503d520e02f4b9707eba20e6f4
-#+ocaml-fmt.aded1639680676a02e0554f68428ca4a88f8b70130a2dfe067cce6d0ab048e46
-#+ocaml-logs.cd0dd950cd06100767436f18678707922845ffa0c1b7cd0fbf61cdf768508c26
-#+ocaml-mtime.59d7b3e8bc14c047b0e1ba4a5e11422a4d2095c5453dd0362f7f5351ddcad6cd
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+ocaml.765783460feb43427c9fc4a458686d36fe651946d726b6efc9f0baa1a7033b6d
+#+ocaml-findlib.0bad441ffa343cea9a7df6fb1444d1f14ed27edee813e660907719308347373b
+#+ocamlbuild.3a30b6b95cf5a892d62eb90a1e1d3c9d3cd2db91dcf0b61b022495b6e78b32dc
+#+opam.547794d6591cbc1bb3289d58cba4a73d88e5ef2222718c45f27d4c7ae19d1dc4
+#+ocaml-topkg.9c18e88faafc9aee334d336a012ac0e7a36ffe98d2cb0fa4e315dfdf0ac1d1f5
+#+ocaml-astring.7131a3914b222d803d907c31c36c7027e3044bc4cd98aa4dd9fba5cc11a7cf0b
+#+ocaml-fpath.adaf97451c1e8e1e0e737b4478ddde97adadb08021c4f8a84e59fd0646e040af
+#+ocaml-rresult.545aca730ef65fa3b8173eca9efae8222d1acc5cef604d847ebcfeea5d033d99
+#+ocaml-fmt.2937f498178e20390b0db9651bf67cd24c67e8a42ce0855c7632a8408ea2d961
+#+ocaml-logs.d6527f6d30481e50900cfd8d0851431952957b3c917d2b3c2b380d53bd403358
+#+ocaml-mtime.6edc5211c678bc77f7092b0c81e02a8f6cc0cf9da1f5e112e2bcd9358509a280
 #@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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+ocaml.52d709f5b257879c00056a3b5eca16eaaa9c3e9205d53e9357782a277d6d6e8f
-#+ocaml-findlib.82ddee8fbdcb193c33e605fd84c8837ccfd9afd90af4bcd07714b106b7831460
-#+ocamlbuild.2cd001072aa16274d6daf240398398fb605248b5fc42e62562964ffbf6a7ed29
-#+opam.89b81f9b769180e588d05341b048231ae478a05be9dfde61625a82488d9c4d22
-#+ocaml-topkg.3264d1d875fd56e13e2013fa905574597dad9d0a4e7df8e395134ab0923e2b4e
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+ocaml.765783460feb43427c9fc4a458686d36fe651946d726b6efc9f0baa1a7033b6d
+#+ocaml-findlib.0bad441ffa343cea9a7df6fb1444d1f14ed27edee813e660907719308347373b
+#+ocamlbuild.3a30b6b95cf5a892d62eb90a1e1d3c9d3cd2db91dcf0b61b022495b6e78b32dc
+#+opam.547794d6591cbc1bb3289d58cba4a73d88e5ef2222718c45f27d4c7ae19d1dc4
+#+ocaml-topkg.9c18e88faafc9aee334d336a012ac0e7a36ffe98d2cb0fa4e315dfdf0ac1d1f5
 #@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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+ocaml.52d709f5b257879c00056a3b5eca16eaaa9c3e9205d53e9357782a277d6d6e8f
-#+dune.2338acbe942ff838be65806f80545d1a774b602059abaff1be32a2a1dea1b284
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+ocaml.765783460feb43427c9fc4a458686d36fe651946d726b6efc9f0baa1a7033b6d
+#+dune.f6b01aeac35d3f0ea34a4e207f3283661f25f8450851de2e5b0627a104903c19
 #@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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+ocaml.52d709f5b257879c00056a3b5eca16eaaa9c3e9205d53e9357782a277d6d6e8f
-#+dune.2338acbe942ff838be65806f80545d1a774b602059abaff1be32a2a1dea1b284
-#+ocamlbuild.2cd001072aa16274d6daf240398398fb605248b5fc42e62562964ffbf6a7ed29
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+ocaml.765783460feb43427c9fc4a458686d36fe651946d726b6efc9f0baa1a7033b6d
+#+dune.f6b01aeac35d3f0ea34a4e207f3283661f25f8450851de2e5b0627a104903c19
+#+ocamlbuild.3a30b6b95cf5a892d62eb90a1e1d3c9d3cd2db91dcf0b61b022495b6e78b32dc
 #@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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+m4.c660fe061f5ffaa82c00841257aa109e14b27d12b024a373f278586d85a3c3f0
-#+netbsd-curses.73f036814cdc086750d291f9f758bd9be4fe13dad0d51e535358d080da49097b
-#+ocaml.52d709f5b257879c00056a3b5eca16eaaa9c3e9205d53e9357782a277d6d6e8f
-#+ocamlbuild.2cd001072aa16274d6daf240398398fb605248b5fc42e62562964ffbf6a7ed29
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+m4.32beafc54cc9ced1138e0231fe717528810de9b8f82012b5a85d017156360f50
+#+netbsd-curses.2f8fd93d356fd884131ec295d27dd173c3801857bec19d790439369b23a1fb46
+#+ocaml.765783460feb43427c9fc4a458686d36fe651946d726b6efc9f0baa1a7033b6d
+#+ocamlbuild.3a30b6b95cf5a892d62eb90a1e1d3c9d3cd2db91dcf0b61b022495b6e78b32dc
 #@untar:-z:sha256:662c910f774e9fee3a19c4e057f380581ab2fc4ee52da4761304ac9c31b8869d:.
 
 
@@ -55,7 +55,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/versions/musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/versions/musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e/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.52d709f5b257879c00056a3b5eca16eaaa9c3e9205d53e9357782a277d6d6e8f"
+stdlib="$pthbs_destdir/versions/ocaml.765783460feb43427c9fc4a458686d36fe651946d726b6efc9f0baa1a7033b6d"
 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+ocaml.52d709f5b257879c00056a3b5eca16eaaa9c3e9205d53e9357782a277d6d6e8f
-#+ocaml-findlib.82ddee8fbdcb193c33e605fd84c8837ccfd9afd90af4bcd07714b106b7831460
-#+ocamlbuild.2cd001072aa16274d6daf240398398fb605248b5fc42e62562964ffbf6a7ed29
-#+opam.89b81f9b769180e588d05341b048231ae478a05be9dfde61625a82488d9c4d22
-#+ocaml-topkg.3264d1d875fd56e13e2013fa905574597dad9d0a4e7df8e395134ab0923e2b4e
-#+ocaml-cmdliner.0a4ef1f22fc50fe4140d579f3dbeca68dd191b3665588b0ce0a762cd75ca6b43
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+ocaml.765783460feb43427c9fc4a458686d36fe651946d726b6efc9f0baa1a7033b6d
+#+ocaml-findlib.0bad441ffa343cea9a7df6fb1444d1f14ed27edee813e660907719308347373b
+#+ocamlbuild.3a30b6b95cf5a892d62eb90a1e1d3c9d3cd2db91dcf0b61b022495b6e78b32dc
+#+opam.547794d6591cbc1bb3289d58cba4a73d88e5ef2222718c45f27d4c7ae19d1dc4
+#+ocaml-topkg.9c18e88faafc9aee334d336a012ac0e7a36ffe98d2cb0fa4e315dfdf0ac1d1f5
+#+ocaml-cmdliner.f79eb52ea118826de2c86cfdb01fb99c8cbbf473c3872dba6a22a6d7abccb6f5
 #@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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+ocaml.52d709f5b257879c00056a3b5eca16eaaa9c3e9205d53e9357782a277d6d6e8f
-#+ocaml-findlib.82ddee8fbdcb193c33e605fd84c8837ccfd9afd90af4bcd07714b106b7831460
-#+ocamlbuild.2cd001072aa16274d6daf240398398fb605248b5fc42e62562964ffbf6a7ed29
-#+opam.89b81f9b769180e588d05341b048231ae478a05be9dfde61625a82488d9c4d22
-#+ocaml-topkg.3264d1d875fd56e13e2013fa905574597dad9d0a4e7df8e395134ab0923e2b4e
-#+ocaml-astring.fb23f9334b24ff1180ff0344bde3f8cb5650674193a98ab772dc98a0d4479610
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+ocaml.765783460feb43427c9fc4a458686d36fe651946d726b6efc9f0baa1a7033b6d
+#+ocaml-findlib.0bad441ffa343cea9a7df6fb1444d1f14ed27edee813e660907719308347373b
+#+ocamlbuild.3a30b6b95cf5a892d62eb90a1e1d3c9d3cd2db91dcf0b61b022495b6e78b32dc
+#+opam.547794d6591cbc1bb3289d58cba4a73d88e5ef2222718c45f27d4c7ae19d1dc4
+#+ocaml-topkg.9c18e88faafc9aee334d336a012ac0e7a36ffe98d2cb0fa4e315dfdf0ac1d1f5
+#+ocaml-astring.7131a3914b222d803d907c31c36c7027e3044bc4cd98aa4dd9fba5cc11a7cf0b
 #@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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+ocaml.52d709f5b257879c00056a3b5eca16eaaa9c3e9205d53e9357782a277d6d6e8f
-#+ocaml-findlib.82ddee8fbdcb193c33e605fd84c8837ccfd9afd90af4bcd07714b106b7831460
-#+ocamlbuild.2cd001072aa16274d6daf240398398fb605248b5fc42e62562964ffbf6a7ed29
-#+opam.89b81f9b769180e588d05341b048231ae478a05be9dfde61625a82488d9c4d22
-#+ocaml-topkg.3264d1d875fd56e13e2013fa905574597dad9d0a4e7df8e395134ab0923e2b4e
-#+ocaml-mtime.59d7b3e8bc14c047b0e1ba4a5e11422a4d2095c5453dd0362f7f5351ddcad6cd
-#+ocaml-cmdliner.0a4ef1f22fc50fe4140d579f3dbeca68dd191b3665588b0ce0a762cd75ca6b43
-#+ocaml-fmt.aded1639680676a02e0554f68428ca4a88f8b70130a2dfe067cce6d0ab048e46
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+ocaml.765783460feb43427c9fc4a458686d36fe651946d726b6efc9f0baa1a7033b6d
+#+ocaml-findlib.0bad441ffa343cea9a7df6fb1444d1f14ed27edee813e660907719308347373b
+#+ocamlbuild.3a30b6b95cf5a892d62eb90a1e1d3c9d3cd2db91dcf0b61b022495b6e78b32dc
+#+opam.547794d6591cbc1bb3289d58cba4a73d88e5ef2222718c45f27d4c7ae19d1dc4
+#+ocaml-topkg.9c18e88faafc9aee334d336a012ac0e7a36ffe98d2cb0fa4e315dfdf0ac1d1f5
+#+ocaml-mtime.6edc5211c678bc77f7092b0c81e02a8f6cc0cf9da1f5e112e2bcd9358509a280
+#+ocaml-cmdliner.f79eb52ea118826de2c86cfdb01fb99c8cbbf473c3872dba6a22a6d7abccb6f5
+#+ocaml-fmt.2937f498178e20390b0db9651bf67cd24c67e8a42ce0855c7632a8408ea2d961
 #@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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+ocaml.52d709f5b257879c00056a3b5eca16eaaa9c3e9205d53e9357782a277d6d6e8f
-#+dune.2338acbe942ff838be65806f80545d1a774b602059abaff1be32a2a1dea1b284
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+ocaml.765783460feb43427c9fc4a458686d36fe651946d726b6efc9f0baa1a7033b6d
+#+dune.f6b01aeac35d3f0ea34a4e207f3283661f25f8450851de2e5b0627a104903c19
 #@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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+ocaml.52d709f5b257879c00056a3b5eca16eaaa9c3e9205d53e9357782a277d6d6e8f
-#+ocaml-findlib.82ddee8fbdcb193c33e605fd84c8837ccfd9afd90af4bcd07714b106b7831460
-#+ocamlbuild.2cd001072aa16274d6daf240398398fb605248b5fc42e62562964ffbf6a7ed29
-#+opam.89b81f9b769180e588d05341b048231ae478a05be9dfde61625a82488d9c4d22
-#+ocaml-topkg.3264d1d875fd56e13e2013fa905574597dad9d0a4e7df8e395134ab0923e2b4e
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+ocaml.765783460feb43427c9fc4a458686d36fe651946d726b6efc9f0baa1a7033b6d
+#+ocaml-findlib.0bad441ffa343cea9a7df6fb1444d1f14ed27edee813e660907719308347373b
+#+ocamlbuild.3a30b6b95cf5a892d62eb90a1e1d3c9d3cd2db91dcf0b61b022495b6e78b32dc
+#+opam.547794d6591cbc1bb3289d58cba4a73d88e5ef2222718c45f27d4c7ae19d1dc4
+#+ocaml-topkg.9c18e88faafc9aee334d336a012ac0e7a36ffe98d2cb0fa4e315dfdf0ac1d1f5
 #@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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+ocaml.52d709f5b257879c00056a3b5eca16eaaa9c3e9205d53e9357782a277d6d6e8f
-#+dune.2338acbe942ff838be65806f80545d1a774b602059abaff1be32a2a1dea1b284
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+ocaml.765783460feb43427c9fc4a458686d36fe651946d726b6efc9f0baa1a7033b6d
+#+dune.f6b01aeac35d3f0ea34a4e207f3283661f25f8450851de2e5b0627a104903c19
 #@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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+ocaml.52d709f5b257879c00056a3b5eca16eaaa9c3e9205d53e9357782a277d6d6e8f
-#+dune.2338acbe942ff838be65806f80545d1a774b602059abaff1be32a2a1dea1b284
-#+ocaml-compiler-libs.647aeb53dd7c7dea9ae9957e25d1f6b66d0949d6c53d0705fd4fbfa4180b7199
-#+ocaml-cppo.22200520f66fa34f9703c56f25a5a8d6bf2c188b648b11764b58b59161d08518
-#+ocaml-findlib.82ddee8fbdcb193c33e605fd84c8837ccfd9afd90af4bcd07714b106b7831460
-#+ocaml-ppx_derivers.35967cf2724a07a7d28bfba5b62dfaafd004d5bb4281e8c0a5f2ab1d7a97b0b2
-#+ocaml-ppxlib.619e4b977aac8d845d4a64012a5fbde46681ce18127bd388bbe8e955d9f1b05a
-#+ocaml-sexplib0.2bbcfd54c9fa6ab7882b732ff92ca8022967802018006ea693294e842ac68334
-#+ocaml-stdlib-shims.9f96dd92b2e653d26f0e1afa4cc1c95f14d76209163b619e988eac987bd9555c
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+ocaml.765783460feb43427c9fc4a458686d36fe651946d726b6efc9f0baa1a7033b6d
+#+dune.f6b01aeac35d3f0ea34a4e207f3283661f25f8450851de2e5b0627a104903c19
+#+ocaml-compiler-libs.247f7bbbed1588f405c14684e3640291ab7e0f5aa74d101fb0775ca1767040e0
+#+ocaml-cppo.dc4536597e5be2aeef0f131a88b0219b69b1226d17a19b9072514451f8fa1535
+#+ocaml-findlib.0bad441ffa343cea9a7df6fb1444d1f14ed27edee813e660907719308347373b
+#+ocaml-ppx_derivers.f8db7b5e83548c187757a86d4ac6c4bc1d650f62fd17417e18913644583d4fac
+#+ocaml-ppxlib.76d62bd54a9676bfe7db5eacbd24212db638d2e1ac0a64da7ce5cb4253d48171
+#+ocaml-sexplib0.02467e798d62338bb03cc7ff8a67dd3b192640da8a6230ba23c40c8c35cfefa5
+#+ocaml-stdlib-shims.8f8a8cbba6feaa9100ba9d30a4ac6d761e970bf941b69af3b8c0ad1711b61ab4
 #@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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+ocaml.52d709f5b257879c00056a3b5eca16eaaa9c3e9205d53e9357782a277d6d6e8f
-#+dune.2338acbe942ff838be65806f80545d1a774b602059abaff1be32a2a1dea1b284
-#+ocaml-compiler-libs.647aeb53dd7c7dea9ae9957e25d1f6b66d0949d6c53d0705fd4fbfa4180b7199
-#+ocaml-ppx_derivers.35967cf2724a07a7d28bfba5b62dfaafd004d5bb4281e8c0a5f2ab1d7a97b0b2
-#+ocaml-sexplib0.2bbcfd54c9fa6ab7882b732ff92ca8022967802018006ea693294e842ac68334
-#+ocaml-stdlib-shims.9f96dd92b2e653d26f0e1afa4cc1c95f14d76209163b619e988eac987bd9555c
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+ocaml.765783460feb43427c9fc4a458686d36fe651946d726b6efc9f0baa1a7033b6d
+#+dune.f6b01aeac35d3f0ea34a4e207f3283661f25f8450851de2e5b0627a104903c19
+#+ocaml-compiler-libs.247f7bbbed1588f405c14684e3640291ab7e0f5aa74d101fb0775ca1767040e0
+#+ocaml-ppx_derivers.f8db7b5e83548c187757a86d4ac6c4bc1d650f62fd17417e18913644583d4fac
+#+ocaml-sexplib0.02467e798d62338bb03cc7ff8a67dd3b192640da8a6230ba23c40c8c35cfefa5
+#+ocaml-stdlib-shims.8f8a8cbba6feaa9100ba9d30a4ac6d761e970bf941b69af3b8c0ad1711b61ab4
 #@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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+ocaml.52d709f5b257879c00056a3b5eca16eaaa9c3e9205d53e9357782a277d6d6e8f
-#+ocaml-findlib.82ddee8fbdcb193c33e605fd84c8837ccfd9afd90af4bcd07714b106b7831460
-#+ocamlbuild.2cd001072aa16274d6daf240398398fb605248b5fc42e62562964ffbf6a7ed29
-#+opam.89b81f9b769180e588d05341b048231ae478a05be9dfde61625a82488d9c4d22
-#+ocaml-topkg.3264d1d875fd56e13e2013fa905574597dad9d0a4e7df8e395134ab0923e2b4e
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+ocaml.765783460feb43427c9fc4a458686d36fe651946d726b6efc9f0baa1a7033b6d
+#+ocaml-findlib.0bad441ffa343cea9a7df6fb1444d1f14ed27edee813e660907719308347373b
+#+ocamlbuild.3a30b6b95cf5a892d62eb90a1e1d3c9d3cd2db91dcf0b61b022495b6e78b32dc
+#+opam.547794d6591cbc1bb3289d58cba4a73d88e5ef2222718c45f27d4c7ae19d1dc4
+#+ocaml-topkg.9c18e88faafc9aee334d336a012ac0e7a36ffe98d2cb0fa4e315dfdf0ac1d1f5
 #@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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+ocaml.52d709f5b257879c00056a3b5eca16eaaa9c3e9205d53e9357782a277d6d6e8f
-#+dune.2338acbe942ff838be65806f80545d1a774b602059abaff1be32a2a1dea1b284
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+ocaml.765783460feb43427c9fc4a458686d36fe651946d726b6efc9f0baa1a7033b6d
+#+dune.f6b01aeac35d3f0ea34a4e207f3283661f25f8450851de2e5b0627a104903c19
 #@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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+ocaml.52d709f5b257879c00056a3b5eca16eaaa9c3e9205d53e9357782a277d6d6e8f
-#+dune.2338acbe942ff838be65806f80545d1a774b602059abaff1be32a2a1dea1b284
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+ocaml.765783460feb43427c9fc4a458686d36fe651946d726b6efc9f0baa1a7033b6d
+#+dune.f6b01aeac35d3f0ea34a4e207f3283661f25f8450851de2e5b0627a104903c19
 #@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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+ocaml.52d709f5b257879c00056a3b5eca16eaaa9c3e9205d53e9357782a277d6d6e8f
-#+ocaml-findlib.82ddee8fbdcb193c33e605fd84c8837ccfd9afd90af4bcd07714b106b7831460
-#+ocamlbuild.2cd001072aa16274d6daf240398398fb605248b5fc42e62562964ffbf6a7ed29
-#+opam.89b81f9b769180e588d05341b048231ae478a05be9dfde61625a82488d9c4d22
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+ocaml.765783460feb43427c9fc4a458686d36fe651946d726b6efc9f0baa1a7033b6d
+#+ocaml-findlib.0bad441ffa343cea9a7df6fb1444d1f14ed27edee813e660907719308347373b
+#+ocamlbuild.3a30b6b95cf5a892d62eb90a1e1d3c9d3cd2db91dcf0b61b022495b6e78b32dc
+#+opam.547794d6591cbc1bb3289d58cba4a73d88e5ef2222718c45f27d4c7ae19d1dc4
 #@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.52d709f5b257879c00056a3b5eca16eaaa9c3e9205d53e9357782a277d6d6e8f
-#+dune.2338acbe942ff838be65806f80545d1a774b602059abaff1be32a2a1dea1b284
-#+ocamlbuild.2cd001072aa16274d6daf240398398fb605248b5fc42e62562964ffbf6a7ed29
-#+ocaml-base.b9c35547547b3d514c20b3ac6b14dc1859b6ef00d4879d155117e2c5d2ac845a
-#+opam.89b81f9b769180e588d05341b048231ae478a05be9dfde61625a82488d9c4d22
-#+ocaml-bos.f34611db30ea1fd4946cfd72e493a75000bdaa9097c63562ff56466334d97313
-#+ocaml-lun.b4c0c9319bc4609353a20a5022013de854a91d2a83b4b29828be808127beb54f
-#+ocaml-ppx_deriving.4e6fe374737a27be55d9fcf0c09a8f0e1bdcb521474756962efa6c71dcda2467-
\ No newline at end of file
+#+ocaml.765783460feb43427c9fc4a458686d36fe651946d726b6efc9f0baa1a7033b6d
+#+dune.f6b01aeac35d3f0ea34a4e207f3283661f25f8450851de2e5b0627a104903c19
+#+ocamlbuild.3a30b6b95cf5a892d62eb90a1e1d3c9d3cd2db91dcf0b61b022495b6e78b32dc
+#+ocaml-base.acf101d514f3d6bbdbb8df02163b4c784b5c68fc363c2a0c42748ac29b666c71
+#+opam.547794d6591cbc1bb3289d58cba4a73d88e5ef2222718c45f27d4c7ae19d1dc4
+#+ocaml-bos.14fdeef5c67e2d0dc1f4277f97fb4cce951d9eb861695e99f71e4bb756703aae
+#+ocaml-lun.964005802fe28924ea59dbb22d3e2cef781a01bca5c6a3aa25bab9b4bf2e1e43
+#+ocaml-ppx_deriving.30cdf2574cff374879682e1b877a18e2f5a9a89aff4c230061a4eb307be85318+
\ 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+m4.c660fe061f5ffaa82c00841257aa109e14b27d12b024a373f278586d85a3c3f0
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+m4.32beafc54cc9ced1138e0231fe717528810de9b8f82012b5a85d017156360f50
 #@untar:-J:sha256:dfaa8a2e11c799bc1765d8bef44911406ee5f4803027190382a939f88c912266:.
 
 
@@ -62,6 +62,8 @@ autotools_config_static() {
 }
 
 build_env_dynamic() {
+	export CFLAGS="-ffile-prefix-map=${workdir}=builddir $CFLAGS"
+	export CXXFLAGS="-ffile-prefix-map=${workdir}=builddir $CXXFLAGS"
 	export LD_LIBRARY_PATH="$pthbs_build_environment/library.so"
 	export CPATH="$pthbs_build_environment/include"
 	export LDFLAGS="-L$pthbs_build_environment/library.so $LDFLAGS"
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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+ocaml.52d709f5b257879c00056a3b5eca16eaaa9c3e9205d53e9357782a277d6d6e8f
-#+dune.2338acbe942ff838be65806f80545d1a774b602059abaff1be32a2a1dea1b284
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+ocaml.765783460feb43427c9fc4a458686d36fe651946d726b6efc9f0baa1a7033b6d
+#+dune.f6b01aeac35d3f0ea34a4e207f3283661f25f8450851de2e5b0627a104903c19
 #@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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+m4.c660fe061f5ffaa82c00841257aa109e14b27d12b024a373f278586d85a3c3f0
-#+ocaml.52d709f5b257879c00056a3b5eca16eaaa9c3e9205d53e9357782a277d6d6e8f
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+m4.32beafc54cc9ced1138e0231fe717528810de9b8f82012b5a85d017156360f50
+#+ocaml.765783460feb43427c9fc4a458686d36fe651946d726b6efc9f0baa1a7033b6d
 #@untar:-z:sha256:2ba6857f2991b7f69368e8db818b163d31cf5a367f15f5953bf8f01a77b3d4fc:.
 
 
@@ -53,7 +53,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/versions/musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/versions/musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e/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.52d709f5b257879c00056a3b5eca16eaaa9c3e9205d53e9357782a277d6d6e8f"
+stdlib="$pthbs_destdir/versions/ocaml.765783460feb43427c9fc4a458686d36fe651946d726b6efc9f0baa1a7033b6d"
 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.bf48392e909160d6d7ba31d35efa7a4ca37f96c06818d77ca13b132906694102
-#+nawk.4a7a477f8033ac5184eadcb0a979ad77a7a0de107a68d0b908b938fa068ce99c
-#+gnu-make.5e01c40980ebfe83f86512d009a83fd736367c62e9a4c8df78d14736916aa127
-#+musl-cross-make.be8fec74aa225dcef7a624b170ff9e6a4270ced2c2b7ae30fb2bf114bbdd8bc9-
\ No newline at end of file
+#+busybox.bb6f1d57e91d00ac686a3dc3897152433b98f066ee9e6ae95d7d35863496ffac
+#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
+#+gnu-make.aefac1011f80fc35ae17a394eab3fddadeda6b788a6a49889efbe78d7365eb91
+#+musl-cross-make.0db83a03695adab20fbf668e85604a1b9d6ffbcff71618bafc909c053f801192+
\ 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.22dd20ebd78629f930fa77f0b84cd2a6f1074fd3bee821c312d62fa0bdf4d727
-#+busybox.c7afe4c63303ba86674ae713b7e4020a5897d7ed67249d5f67435313f409df01
-#+gnu-make.d9153cbbc1ba29a95a2fe8e50f2b3c0dbe130b568a51ec57fa8dc2c494f21818-
\ No newline at end of file
+#+musl-cross-make.c2fb2e2455bfe14d4a02160674f83b5bb7b7a7b45aa37fb736efc2335ef029ae
+#+busybox.dd5cf98d9494e9abc1bd344b06d4162b156b986d61a5b4718f693576ad6512f9
+#+gnu-make.42ed6990a39c70ad6ecb3ed449d55f4e7a49773e365359ef61730f1dd0a91348+
\ 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+diffutils.608190128e833539a8c8da2e5a5cd5f302f67eead904d4d274af3ac3829fe9d9
-#+patch.8ecd35c8173bdc0a067515adae38f35d656ffc0aecae9e7634d7c797b51bd359
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+getconf.7aaac14fe02860179a1eb4b700e3ae34b8b41553e9ef16f0876ef3383e569508
-#+ocaml.52d709f5b257879c00056a3b5eca16eaaa9c3e9205d53e9357782a277d6d6e8f
-#+dune.2338acbe942ff838be65806f80545d1a774b602059abaff1be32a2a1dea1b284
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+diffutils.7dd07321d0d6c3161b299ec616be1ce88a7dbecc58d3f90b043ac1f4c4378245
+#+patch.dfa91c3dd07b78021e22e13d945a6aa1fd86784d9d0b855afc8456d641aa8c50
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+getconf.d791d172ecee20ddbb3cc4b0963cfb2bf82a25a7e472a922704705741a802674
+#+ocaml.765783460feb43427c9fc4a458686d36fe651946d726b6efc9f0baa1a7033b6d
+#+dune.f6b01aeac35d3f0ea34a4e207f3283661f25f8450851de2e5b0627a104903c19
 #@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.2338acbe942ff838be65806f80545d1a774b602059abaff1be32a2a1dea1b284/command/dune' \
+	--with-dune='/versions/dune.f6b01aeac35d3f0ea34a4e207f3283661f25f8450851de2e5b0627a104903c19/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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+m4.c660fe061f5ffaa82c00841257aa109e14b27d12b024a373f278586d85a3c3f0
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+m4.32beafc54cc9ced1138e0231fe717528810de9b8f82012b5a85d017156360f50
 #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:.
 
 
@@ -62,6 +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 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+m4.c660fe061f5ffaa82c00841257aa109e14b27d12b024a373f278586d85a3c3f0
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+m4.32beafc54cc9ced1138e0231fe717528810de9b8f82012b5a85d017156360f50
 #@untar:-J:sha256:3a224f2accf091b77a5781316e27b9ee3ba82c083cc2e539e08940b68a44fec5:.
 
 
@@ -62,6 +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 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+pkgconf.840fa7d71e73e0e410113f2651e010b87d4aec352be00dce00076a25740d944b
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+pkgconf.dbf8c4692274fbfa76bd1e15227965fb27d7807a6af9919e7604b5d6ddbad18b
 
 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+m4.c660fe061f5ffaa82c00841257aa109e14b27d12b024a373f278586d85a3c3f0
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+m4.32beafc54cc9ced1138e0231fe717528810de9b8f82012b5a85d017156360f50
 #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:.
 
 
@@ -62,6 +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 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+zsh.bbc357369ae4f659065c55ed3ac39451b86f5839d668754ceb3805778fc91e74
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+zsh.4bf497739c038075b843f732c942e800d8ff041388a1b0067e30424151a75d43
 #@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.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+nawk.4a7a477f8033ac5184eadcb0a979ad77a7a0de107a68d0b908b938fa068ce99c
-#+execline.7dfe17f2b2f90074a6ebf6c89cdbc963b2cd66df6e49ec2fc3ddf5d11b1991ac
-#+lnstools.290c0fcc48064bc704ba4dbb7eccd1fcc9f0dc9b15e4412895c982f2b99a1da9
-#+sandbox_rootfs.265c7fd9a7465a84033cc8ac9be825e0aea20b383c4a28deadd6aa335c524c69
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
+#+execline.9560f42ca717c6cca0fc61ea92954420473a424a67b723ac82f09d6c1234649f
+#+lnstools.01bb72f68d76c28698632971975390ee0614f4d63e0dbdcee4a54e75e614915f
+#+sandbox_rootfs.47e79d01541d1e81ec0e459822c225b01ed16653d6370becbe7e23ca7196112d
 #@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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+m4.c660fe061f5ffaa82c00841257aa109e14b27d12b024a373f278586d85a3c3f0
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+popt.9335d0b887506736e66b7ecea2ba24e854c17f0a152da385e56dae48ce461ee8
-#+libressl.1160d6705d54f6ef8f01613c3804e3d4a9b84b68d442dabb6a57b9ab9493b1a0
-#+zstd.cc3f5edef31c6a46908776241cf758e7da0da3f0d000247c604503e6d70b9155
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+m4.32beafc54cc9ced1138e0231fe717528810de9b8f82012b5a85d017156360f50
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+popt.ac6a6cb4d2a06a02e163f311c341c5152bb9e6e4b869040a3fb9a5f740cd5db3
+#+libressl.4c07ed10608c48646995dddd52870e657b74a37293a8dd18688ca39426891278
+#+zstd.75e990bd5ec6647d85ecca05168e6e341a03fa480ac946706f9672d736e81ed2
 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:.
 
 
@@ -65,6 +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 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+skalibs.900bf97ed0bb3435e1622df6adf4f44f80115c1e23ea11e8092c552bd6b1281d
-#+execline.d18b68e013041d932cb6e25de18722c8b10a31f7bd3c89700e31272053e61759
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+skalibs.0e6b83bcfbb25f62f3d946b29832e33ffa741a2ca2c9204054415825cb83b818
+#+execline.5423f4b96a1f5f845f44c8ff25fe5f99e7e2ea9bdda045e39b2428e6e47cc71e
 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6
 
 
@@ -49,7 +49,7 @@ cd 's6'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.900bf97ed0bb3435e1622df6adf4f44f80115c1e23ea11e8092c552bd6b1281d/sysdeps' \
+	--with-sysdeps='/versions/skalibs.0e6b83bcfbb25f62f3d946b29832e33ffa741a2ca2c9204054415825cb83b818/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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+skalibs.900bf97ed0bb3435e1622df6adf4f44f80115c1e23ea11e8092c552bd6b1281d
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+skalibs.0e6b83bcfbb25f62f3d946b29832e33ffa741a2ca2c9204054415825cb83b818
 #@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns
 
 
@@ -48,7 +48,7 @@ cd 's6-dns'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.900bf97ed0bb3435e1622df6adf4f44f80115c1e23ea11e8092c552bd6b1281d/sysdeps' \
+	--with-sysdeps='/versions/skalibs.0e6b83bcfbb25f62f3d946b29832e33ffa741a2ca2c9204054415825cb83b818/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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+skalibs.900bf97ed0bb3435e1622df6adf4f44f80115c1e23ea11e8092c552bd6b1281d
-#+execline.d18b68e013041d932cb6e25de18722c8b10a31f7bd3c89700e31272053e61759
-#+s6.3efe528f392680722d59c9a7e78e44c99b7db6c9953ed337ae707dc2b5409677
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+skalibs.0e6b83bcfbb25f62f3d946b29832e33ffa741a2ca2c9204054415825cb83b818
+#+execline.5423f4b96a1f5f845f44c8ff25fe5f99e7e2ea9bdda045e39b2428e6e47cc71e
+#+s6.284f89c0874e44f0e6fd9cf713c7af02a5c9aba553ec8691c4d47737e6afec56
 #@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.900bf97ed0bb3435e1622df6adf4f44f80115c1e23ea11e8092c552bd6b1281d/sysdeps' \
+	--with-sysdeps='/versions/skalibs.0e6b83bcfbb25f62f3d946b29832e33ffa741a2ca2c9204054415825cb83b818/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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+skalibs.900bf97ed0bb3435e1622df6adf4f44f80115c1e23ea11e8092c552bd6b1281d
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+skalibs.0e6b83bcfbb25f62f3d946b29832e33ffa741a2ca2c9204054415825cb83b818
 #@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.900bf97ed0bb3435e1622df6adf4f44f80115c1e23ea11e8092c552bd6b1281d/sysdeps' \
+	--with-sysdeps='/versions/skalibs.0e6b83bcfbb25f62f3d946b29832e33ffa741a2ca2c9204054415825cb83b818/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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+skalibs.900bf97ed0bb3435e1622df6adf4f44f80115c1e23ea11e8092c552bd6b1281d
-#+execline.d18b68e013041d932cb6e25de18722c8b10a31f7bd3c89700e31272053e61759
-#+s6.3efe528f392680722d59c9a7e78e44c99b7db6c9953ed337ae707dc2b5409677
-#+s6-dns.3752bc9635dd91f8236def4f8124b1664f384b247d77d89b1a8f379de1459487
-#+libressl.1160d6705d54f6ef8f01613c3804e3d4a9b84b68d442dabb6a57b9ab9493b1a0
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+skalibs.0e6b83bcfbb25f62f3d946b29832e33ffa741a2ca2c9204054415825cb83b818
+#+execline.5423f4b96a1f5f845f44c8ff25fe5f99e7e2ea9bdda045e39b2428e6e47cc71e
+#+s6.284f89c0874e44f0e6fd9cf713c7af02a5c9aba553ec8691c4d47737e6afec56
+#+s6-dns.dc5af061895d362c4a6b0884cb7b3cdb4ea53b0ecc444097089bcf5407ec0b1c
+#+libressl.4c07ed10608c48646995dddd52870e657b74a37293a8dd18688ca39426891278
 #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking
 
 
@@ -52,7 +52,7 @@ cd 's6-networking'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.900bf97ed0bb3435e1622df6adf4f44f80115c1e23ea11e8092c552bd6b1281d/sysdeps' \
+	--with-sysdeps='/versions/skalibs.0e6b83bcfbb25f62f3d946b29832e33ffa741a2ca2c9204054415825cb83b818/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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+skalibs.900bf97ed0bb3435e1622df6adf4f44f80115c1e23ea11e8092c552bd6b1281d
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+skalibs.0e6b83bcfbb25f62f3d946b29832e33ffa741a2ca2c9204054415825cb83b818
 #@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.900bf97ed0bb3435e1622df6adf4f44f80115c1e23ea11e8092c552bd6b1281d/sysdeps' \
+	--with-sysdeps='/versions/skalibs.0e6b83bcfbb25f62f3d946b29832e33ffa741a2ca2c9204054415825cb83b818/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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+skalibs.900bf97ed0bb3435e1622df6adf4f44f80115c1e23ea11e8092c552bd6b1281d
-#+execline.d18b68e013041d932cb6e25de18722c8b10a31f7bd3c89700e31272053e61759
-#+s6.3efe528f392680722d59c9a7e78e44c99b7db6c9953ed337ae707dc2b5409677
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+skalibs.0e6b83bcfbb25f62f3d946b29832e33ffa741a2ca2c9204054415825cb83b818
+#+execline.5423f4b96a1f5f845f44c8ff25fe5f99e7e2ea9bdda045e39b2428e6e47cc71e
+#+s6.284f89c0874e44f0e6fd9cf713c7af02a5c9aba553ec8691c4d47737e6afec56
 #@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc
 
 
@@ -50,7 +50,7 @@ cd 's6-rc'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.900bf97ed0bb3435e1622df6adf4f44f80115c1e23ea11e8092c552bd6b1281d/sysdeps' \
+	--with-sysdeps='/versions/skalibs.0e6b83bcfbb25f62f3d946b29832e33ffa741a2ca2c9204054415825cb83b818/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,15 +1,17 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.1119895caf0f7c5d85499c45406512e9aa0c65a699ac92c1987b1516fd1fd36a
-#+gnu-make.e044ce7efc50d676acfa33d9f88492e463d180c9c43980ac457c52b657adff1e
-#+busybox.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+nawk.4a7a477f8033ac5184eadcb0a979ad77a7a0de107a68d0b908b938fa068ce99c
-#+skalibs.9a35d999e5f56395cd53afd4678f7b457a7b8b772f94fc771376827c600d7b5d
+#+musl-cross-make.67f6cca83cd1328965f86c3a5118eec66e0e5e5f7b577a7e1f150cbec97eaec5
+#+gnu-make.ad3d1831fa514024b57b39b7ce0bacb146c0e7aac745293082d78b231ca7a77c
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
+#+skalibs.2b9b4395dfacc6f5747f8164c91d7338f347ceaf36c23311064b294b04a3ad84
 #@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 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.290c0fcc48064bc704ba4dbb7eccd1fcc9f0dc9b15e4412895c982f2b99a1da9
-#+sandbox_rootfs.265c7fd9a7465a84033cc8ac9be825e0aea20b383c4a28deadd6aa335c524c69
-#+pthbs-sandbox-rootns.f2a9f85ab09d1f62c1512ca8014bf553fb82013070cc1a80a91b137d0ced6ee5-
\ No newline at end of file
+#+lnstools.01bb72f68d76c28698632971975390ee0614f4d63e0dbdcee4a54e75e614915f
+#+sandbox_rootfs.47e79d01541d1e81ec0e459822c225b01ed16653d6370becbe7e23ca7196112d
+#+pthbs-sandbox-rootns.ab9be51a2e0009088f9eb63c80155ccb2efe48b8c7c7e180c2433257d80b4ed6+
\ 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
 #@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.1119895caf0f7c5d85499c45406512e9aa0c65a699ac92c1987b1516fd1fd36a
-#+gnu-make.e044ce7efc50d676acfa33d9f88492e463d180c9c43980ac457c52b657adff1e
-#+busybox.1a2710ed7b0f918f37488b56408f0692c2226a2a9aa338dbee4386e1fc6e8ca6
-#+nawk.4a7a477f8033ac5184eadcb0a979ad77a7a0de107a68d0b908b938fa068ce99c
+#+musl-cross-make.67f6cca83cd1328965f86c3a5118eec66e0e5e5f7b577a7e1f150cbec97eaec5
+#+gnu-make.ad3d1831fa514024b57b39b7ce0bacb146c0e7aac745293082d78b231ca7a77c
+#+busybox.513d1404fc69e4ada4a0fa49c650b5eb628d8a0870cf4a08be4023fccae88df1
+#+nawk.1ca6fcc1188da41221a97504d179e49208ec8c0c3c48faf4f228e95f1ac1cfa6
 #@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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+zsh.bbc357369ae4f659065c55ed3ac39451b86f5839d668754ceb3805778fc91e74
-#+pthbs-banginstall.c189916ff1f12273d0a1266d3fac34e0af97ff0d693699d9c0bb1512a16927b1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+zsh.4bf497739c038075b843f732c942e800d8ff041388a1b0067e30424151a75d43
+#+pthbs-banginstall.fec12edeb78561ceba0c01ed76d793f0d620a45568dbb3313d2736e8daa72a2d
 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep
 
 
diff --git a/variants/root-x86_64/squashfs-tools b/variants/root-x86_64/squashfs-tools
@@ -1,45 +1,47 @@
 #!/usr/bin/env pthbs-build
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+attr.1539e5500c32c3f9d8e1e525f99a4ad0ca275f560ad6ce1c48a6d685aa6acf20
-#+zstd.cc3f5edef31c6a46908776241cf758e7da0da3f0d000247c604503e6d70b9155
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+attr.960060714c2b576113a7b2fb291c644d332b13710f9d67b15d2c2ff3f3b0f895
+#+zstd.75e990bd5ec6647d85ecca05168e6e341a03fa480ac946706f9672d736e81ed2
 #@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 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+m4.c660fe061f5ffaa82c00841257aa109e14b27d12b024a373f278586d85a3c3f0
-#+patch.8ecd35c8173bdc0a067515adae38f35d656ffc0aecae9e7634d7c797b51bd359
-#+libunwind.87d12a950b1927608810c31e16d2bd7e52c577ec24214e65d4bebb473cf7db10
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+m4.32beafc54cc9ced1138e0231fe717528810de9b8f82012b5a85d017156360f50
+#+patch.dfa91c3dd07b78021e22e13d945a6aa1fd86784d9d0b855afc8456d641aa8c50
+#+libunwind.13e96050469248abe90f09a7404cf4beaa4148031bcf00d86681a0f6d7132f2c
 #@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch
 #@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:.
 
@@ -65,6 +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 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-dosfstools.7c611daabb32afbdd073f954f8452aac5e54970370193db6c51fb6f22ca97585
-#+busybox-e2fsprogs.76cddd6409207b0da11916e85eb5a1f7d029b8910e4580b3142b9fec86c74e7a
-#+busybox-iproute2.550b1c0b492f6ba3079051dd8c864e6c1987db23a83b1603c92d0daf1aeb1169
-#+busybox-iputils.0c781d5f8e55b226f36faf725c63046d535aa3b5b3147246f945cb5f29d146f6
-#+busybox-net-misc.16ac87d6bd8fb8e96f2c7ab49bf5654add9f351b48e77fc8cfb7c85b30922ab6
-#+busybox-net-tools.ab3b95cfc6a5aecb4a23b8f2c3cdf6584471dae401a4ce4b57c0ef334a61c9bb
-#+busybox-traceroute.b978b5ee6505c9a5bd6ec712d672e4a4eac89b21d5213164195ef2c9bf521a9d
-#+busybox-wget.24e89fb2370069f68b500132f69b0bae90363bcecdafd2d1cbcc2cb1652073b5
-#+busybox-chpst.61db7ce002b28620e7e6d0bd51f6bcde2675dbfdaf49982e06c07dbe3018af16
-#+busybox-console.a3d57663741aa7028d30047a2396c2ad6ad2c003b41b4357f9dfb6c035ef9646
-#+busybox-getty.9f6b5c60b4a9decd14d5777be64cf5f1d6946631a7e04f46a91f06fe025a5919
-#+busybox-i2c-tools.58825d225b209cd8fe4f229c1864cbf2e3ff30f29f609b395b5ffc097e785771
-#+busybox-linux-extra.98459353c6ab525961c7588de45567be666c48c9d932de10f6a8022e99a00ba9
-#+busybox-mtd-utils.22f7846f09c5bc11cbe5f27d7da5a9aa324093bc1672fa6aca4e808b9e7c3aaf
-#+busybox-shadow.9529d2b1e4cc9a461453f69a216cae8209adb3590ccb9b1db18618cff132be21
-#+busybox-su.3e33932c67c686be1b67c732fd5f4f014b358c4bfa2d5ec22eae36b67d082dfd
-#+busybox-util-linux-priv.7614e93850020009da0961f788adf1472d528791aaaa03127e6bd5d9ed342f07
-#+busybox-logging.e2674933c594ea48ff61038d33e77960c4376bc82c6dda556b2ebde3ffb5d93f
-#+busybox-cron.8c51a9cf25f2143a6ba8e29cc0a87d27e35894d23bfa1c92bb62d542e66b37ca
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+diffutils.608190128e833539a8c8da2e5a5cd5f302f67eead904d4d274af3ac3829fe9d9
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+aat.36995ba96c9e753f09fbf5a362195eda2a5cee7ee4af8f02096590780f8ca5ca
-#+fileset.5873f643ff0e490a13bba171abdab4bb16b1e40045acdc8118131a54aed97fe0
-#+rsync.bd2da93ab3ce897d92956840e5d73284912811c66bf3d4ab45a0ab69df749722
-#+execline.d18b68e013041d932cb6e25de18722c8b10a31f7bd3c89700e31272053e61759
-#+kbd.590815c94ba4f282e38d0d48704dac872039d6c98ecc6495cfe1025b9fb53026
-#+mdevd.756436e8f4dc95004d8ae3bd663d025655105ec086991242e89532eb2f3afb94
-#+s6-linux-utils.1247b500ae6b7400f33e9749a9568e0db697e1f77ec4073b393b81a170874bbc
-#+s6-rc.f594b1fb5401ca006c4a7d68fe80de235f2770d48f9d9bd4ee50b93d0a0b19bf
-#+s6.3efe528f392680722d59c9a7e78e44c99b7db6c9953ed337ae707dc2b5409677
-#+zsh.bbc357369ae4f659065c55ed3ac39451b86f5839d668754ceb3805778fc91e74
-#+libcgroup.772d12399d06171af7e414d762bd74e7c803de5977281a0e8caf57e0fb508aca
-#+system-config-scripts.8ddc5cee092890691bce7c6078a7314f26f2bb53bfc6d9eac0778822451a2288
-#+logincaps.663a2628a025c0920f408f7da988deb30f3dd64b9982ee3586407d25e53bab77
-#+busybox-modutils.094d5f1da7f936f10ff3c428c21924e2e3878548f98a043fd32e88f6ba1d4843
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-dosfstools.e7a348e1d775913157f2fbf4d93241e63ea7cefc121771913d844e2e4a092556
+#+busybox-e2fsprogs.54785935d38485569d8cac755f946bde6bcea3c7a72dcceac84ea7fa7db314bc
+#+busybox-iproute2.75cdc7a50d36c594b4fdd9a8510548d224a1ec000f6965d2cf425464bdc13c55
+#+busybox-iputils.2cb817ed1dcaecec1127ff946bfaadb4c95620c76b476e2a6673494f962bef11
+#+busybox-net-misc.89144737562a757e2fb36baf148dc3c96ecb1505b739c04295ca742598817129
+#+busybox-net-tools.6745ec247e5bc21969c4599bfc115c1506c195b5ded1f4dc9e732b4dfe22ec59
+#+busybox-traceroute.4332cedee870c7ab2c27ea1c843baa7a5bc0419814680acda808668705644cd0
+#+busybox-wget.f5e9d254b2bb4300696e8af1d79bb40ee2f694c9ea5a5f155fbd74bfd3cd811b
+#+busybox-chpst.0b63627b038eb832ec7b82e768ff0deec3fb0c125d171edaa778839f9b83fd39
+#+busybox-console.d8457654ab5d0fe25ea4608aaf59610bf261c022c981d461063008284b7a5c51
+#+busybox-getty.079429247cf7e523b1cb79c5115fb5a78b31a2d5e423304965c224bb080681fb
+#+busybox-i2c-tools.bf5627624846ef390ac82e2c72ce15f1f7a72deb310aa1c950f7f0aacf45bcf3
+#+busybox-linux-extra.a039d9086d0faf44545424a9cc3c065aa2553f9796939203eda5c57c3399a273
+#+busybox-mtd-utils.9cdeb6c42a5ec10a0dd05ca09c889cf00a1e2d2cd5fd52fe7252e0623d9a2819
+#+busybox-shadow.a0dd3a9b5ec86db2d7f77bbe59eef8b838eb6315d34607751430d3a005adcb04
+#+busybox-su.d9e7dc0128758cacdc7eaa4b58bc7bf17410b5902a6f94227c807b71711e4439
+#+busybox-util-linux-priv.966960c5d6e6c476b9332c3886e675aef21bf985af73481beaad0aea2b3ebe22
+#+busybox-logging.ef04b463b75789424e27e56c3f85fea03184848916d81bbaa63ee8f0ccf0d0c2
+#+busybox-cron.1a836b227ba8b7021d5357bf5f7feb482ebdeeeb3c547571522286843551c43e
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+diffutils.7dd07321d0d6c3161b299ec616be1ce88a7dbecc58d3f90b043ac1f4c4378245
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+aat.389a312fee2930ac879920ac125a7375f93f06846ae4026bd2c9ef6e79d65b9e
+#+fileset.6e2b09e8969275f4cb1073ecfad577671fc7a8ffcfc5caa959b16242744efde0
+#+rsync.9d640e8227288087bb1b174674f7a18ef6ba5cb7d6e6eacc562e5206aeb217d2
+#+execline.5423f4b96a1f5f845f44c8ff25fe5f99e7e2ea9bdda045e39b2428e6e47cc71e
+#+kbd.bc799faa462bf694bf845cb2c2046fdf129a9f76f5b28d4912339a1375cadd57
+#+mdevd.4b6b20892f0779e8fc38dae3203697a51cac09450abfce754059324b3b1ef383
+#+s6-linux-utils.b898195ac86e82b037ba8c638be5aeaac6fd531bbe5ae0918bddd078766aeeed
+#+s6-rc.6ce4ee8b461f57ac4bb2f71a8b0a3a2911765786a7a950fb0abb70df61fd7441
+#+s6.284f89c0874e44f0e6fd9cf713c7af02a5c9aba553ec8691c4d47737e6afec56
+#+zsh.4bf497739c038075b843f732c942e800d8ff041388a1b0067e30424151a75d43
+#+libcgroup.0b1ce807ef068689087917202f24f28fe0b17e43e0bf6f8497303e6e09ba3a76
+#+system-config-scripts.37221caf1fae9d28e9520289d239fe19e0e667d9d1ce57cf5ef253e8ccdd25fe
+#+logincaps.ba9976b6226f9d2a15928fb3043c12a9b0ed43d5717e41d6b8ce758d0b54709c
+#+busybox-modutils.a7ccd47b15206710f62d0260414c7c5544be8a0d892a171e6ccdc30140e2d62a
 #@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.f0b635129fb7eb93dc96368ed7384755d88780568eb8fab554ddcc76429989a7' \
-	'pthbs_path_mdevd=/versions/env.902d6f93e08e11b5be732c99b97e4db8dbb9b8c2a73069c0cae9fe733a765e03' \
+	'pthbs_path_containers=/versions/env.c7b5c07ace5069a6d8355500004d907fa1161cf3a70377975d1addf4b81bb549' \
+	'pthbs_path_mdevd=/versions/env.79d173e19a4bda351df05b34b1db712ddb264ed118cc226c101552c914fe4553' \
 	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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-dosfstools.7c611daabb32afbdd073f954f8452aac5e54970370193db6c51fb6f22ca97585
-#+busybox-e2fsprogs.76cddd6409207b0da11916e85eb5a1f7d029b8910e4580b3142b9fec86c74e7a
-#+busybox-iproute2.550b1c0b492f6ba3079051dd8c864e6c1987db23a83b1603c92d0daf1aeb1169
-#+busybox-iputils.0c781d5f8e55b226f36faf725c63046d535aa3b5b3147246f945cb5f29d146f6
-#+busybox-net-misc.16ac87d6bd8fb8e96f2c7ab49bf5654add9f351b48e77fc8cfb7c85b30922ab6
-#+busybox-net-tools.ab3b95cfc6a5aecb4a23b8f2c3cdf6584471dae401a4ce4b57c0ef334a61c9bb
-#+busybox-traceroute.b978b5ee6505c9a5bd6ec712d672e4a4eac89b21d5213164195ef2c9bf521a9d
-#+busybox-wget.24e89fb2370069f68b500132f69b0bae90363bcecdafd2d1cbcc2cb1652073b5
-#+busybox-chpst.61db7ce002b28620e7e6d0bd51f6bcde2675dbfdaf49982e06c07dbe3018af16
-#+busybox-console.a3d57663741aa7028d30047a2396c2ad6ad2c003b41b4357f9dfb6c035ef9646
-#+busybox-getty.9f6b5c60b4a9decd14d5777be64cf5f1d6946631a7e04f46a91f06fe025a5919
-#+busybox-i2c-tools.58825d225b209cd8fe4f229c1864cbf2e3ff30f29f609b395b5ffc097e785771
-#+busybox-linux-extra.98459353c6ab525961c7588de45567be666c48c9d932de10f6a8022e99a00ba9
-#+busybox-mtd-utils.22f7846f09c5bc11cbe5f27d7da5a9aa324093bc1672fa6aca4e808b9e7c3aaf
-#+busybox-shadow.9529d2b1e4cc9a461453f69a216cae8209adb3590ccb9b1db18618cff132be21
-#+busybox-su.3e33932c67c686be1b67c732fd5f4f014b358c4bfa2d5ec22eae36b67d082dfd
-#+busybox-util-linux-priv.7614e93850020009da0961f788adf1472d528791aaaa03127e6bd5d9ed342f07
-#+busybox-logging.e2674933c594ea48ff61038d33e77960c4376bc82c6dda556b2ebde3ffb5d93f
-#+busybox-cron.8c51a9cf25f2143a6ba8e29cc0a87d27e35894d23bfa1c92bb62d542e66b37ca
-#+s6.3efe528f392680722d59c9a7e78e44c99b7db6c9953ed337ae707dc2b5409677
-#+s6-rc.f594b1fb5401ca006c4a7d68fe80de235f2770d48f9d9bd4ee50b93d0a0b19bf
-#+s6-portable-utils.0c9fbc4557db5dd840e61da0970484b593c0346552f029ce9ca05deb86473c9e
-#+s6-linux-init.9c390b905f844c09ec2069462db04728d2b079b11a6adf07accee62f49000db3
-#+execline.d18b68e013041d932cb6e25de18722c8b10a31f7bd3c89700e31272053e61759
-#+system-config-rc.776569c0ed06a5f65690c8eb0b00444dcc70c450f097a36e2d240a7dea85fd51
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-dosfstools.e7a348e1d775913157f2fbf4d93241e63ea7cefc121771913d844e2e4a092556
+#+busybox-e2fsprogs.54785935d38485569d8cac755f946bde6bcea3c7a72dcceac84ea7fa7db314bc
+#+busybox-iproute2.75cdc7a50d36c594b4fdd9a8510548d224a1ec000f6965d2cf425464bdc13c55
+#+busybox-iputils.2cb817ed1dcaecec1127ff946bfaadb4c95620c76b476e2a6673494f962bef11
+#+busybox-net-misc.89144737562a757e2fb36baf148dc3c96ecb1505b739c04295ca742598817129
+#+busybox-net-tools.6745ec247e5bc21969c4599bfc115c1506c195b5ded1f4dc9e732b4dfe22ec59
+#+busybox-traceroute.4332cedee870c7ab2c27ea1c843baa7a5bc0419814680acda808668705644cd0
+#+busybox-wget.f5e9d254b2bb4300696e8af1d79bb40ee2f694c9ea5a5f155fbd74bfd3cd811b
+#+busybox-chpst.0b63627b038eb832ec7b82e768ff0deec3fb0c125d171edaa778839f9b83fd39
+#+busybox-console.d8457654ab5d0fe25ea4608aaf59610bf261c022c981d461063008284b7a5c51
+#+busybox-getty.079429247cf7e523b1cb79c5115fb5a78b31a2d5e423304965c224bb080681fb
+#+busybox-i2c-tools.bf5627624846ef390ac82e2c72ce15f1f7a72deb310aa1c950f7f0aacf45bcf3
+#+busybox-linux-extra.a039d9086d0faf44545424a9cc3c065aa2553f9796939203eda5c57c3399a273
+#+busybox-mtd-utils.9cdeb6c42a5ec10a0dd05ca09c889cf00a1e2d2cd5fd52fe7252e0623d9a2819
+#+busybox-shadow.a0dd3a9b5ec86db2d7f77bbe59eef8b838eb6315d34607751430d3a005adcb04
+#+busybox-su.d9e7dc0128758cacdc7eaa4b58bc7bf17410b5902a6f94227c807b71711e4439
+#+busybox-util-linux-priv.966960c5d6e6c476b9332c3886e675aef21bf985af73481beaad0aea2b3ebe22
+#+busybox-logging.ef04b463b75789424e27e56c3f85fea03184848916d81bbaa63ee8f0ccf0d0c2
+#+busybox-cron.1a836b227ba8b7021d5357bf5f7feb482ebdeeeb3c547571522286843551c43e
+#+s6.284f89c0874e44f0e6fd9cf713c7af02a5c9aba553ec8691c4d47737e6afec56
+#+s6-rc.6ce4ee8b461f57ac4bb2f71a8b0a3a2911765786a7a950fb0abb70df61fd7441
+#+s6-portable-utils.95211b25d94b4c8840eb1105bbdd9783dc8ba8950f1939339e920543038c5edd
+#+s6-linux-init.68f1249b659fd4f5523a8b73aca043bb966f5ba14b254e201e5d0a06c2c5968c
+#+execline.5423f4b96a1f5f845f44c8ff25fe5f99e7e2ea9bdda045e39b2428e6e47cc71e
+#+system-config-rc.8ebd28410a86204db4b5e5822e06fa7f4b8a48896475529cac12b508f528917a
 
 
 # - build script start -
@@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-s6rcdb=/versions/system-config-rc.776569c0ed06a5f65690c8eb0b00444dcc70c450f097a36e2d240a7dea85fd51/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.8ebd28410a86204db4b5e5822e06fa7f4b8a48896475529cac12b508f528917a/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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+s6-rc.f594b1fb5401ca006c4a7d68fe80de235f2770d48f9d9bd4ee50b93d0a0b19bf
-#+fileset.5873f643ff0e490a13bba171abdab4bb16b1e40045acdc8118131a54aed97fe0
-#+system-config.b2fccf53aebc868bd358c2aa2038f4d7e5b3339f456e4118c45e6f6d62f1a0a6
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+s6-rc.6ce4ee8b461f57ac4bb2f71a8b0a3a2911765786a7a950fb0abb70df61fd7441
+#+fileset.6e2b09e8969275f4cb1073ecfad577671fc7a8ffcfc5caa959b16242744efde0
+#+system-config.816a468cb8c2d61b5f7bb91a55e33cc811d0583a19b5afa091e345e4b094e975
 
 
 # - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-src=/versions/system-config.b2fccf53aebc868bd358c2aa2038f4d7e5b3339f456e4118c45e6f6d62f1a0a6/config/s6-rc-source
+src=/versions/system-config.816a468cb8c2d61b5f7bb91a55e33cc811d0583a19b5afa091e345e4b094e975/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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+zsh.bbc357369ae4f659065c55ed3ac39451b86f5839d668754ceb3805778fc91e74
-#+pthbs-banginstall.c189916ff1f12273d0a1266d3fac34e0af97ff0d693699d9c0bb1512a16927b1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+zsh.4bf497739c038075b843f732c942e800d8ff041388a1b0067e30424151a75d43
+#+pthbs-banginstall.fec12edeb78561ceba0c01ed76d793f0d620a45568dbb3313d2736e8daa72a2d
 #@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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+zsh.bbc357369ae4f659065c55ed3ac39451b86f5839d668754ceb3805778fc91e74
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+zsh.4bf497739c038075b843f732c942e800d8ff041388a1b0067e30424151a75d43
 #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh
 
 
diff --git a/variants/root-x86_64/tinyssh b/variants/root-x86_64/tinyssh
@@ -1,43 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
 #@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 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.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628-
\ No newline at end of file
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f+
\ 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+execline.d18b68e013041d932cb6e25de18722c8b10a31f7bd3c89700e31272053e61759
-#+pthbs-banginstall.c189916ff1f12273d0a1266d3fac34e0af97ff0d693699d9c0bb1512a16927b1
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+execline.5423f4b96a1f5f845f44c8ff25fe5f99e7e2ea9bdda045e39b2428e6e47cc71e
+#+pthbs-banginstall.fec12edeb78561ceba0c01ed76d793f0d620a45568dbb3313d2736e8daa72a2d
 #@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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-dosfstools.7c611daabb32afbdd073f954f8452aac5e54970370193db6c51fb6f22ca97585
-#+busybox-e2fsprogs.76cddd6409207b0da11916e85eb5a1f7d029b8910e4580b3142b9fec86c74e7a
-#+busybox-iproute2.550b1c0b492f6ba3079051dd8c864e6c1987db23a83b1603c92d0daf1aeb1169
-#+busybox-iputils.0c781d5f8e55b226f36faf725c63046d535aa3b5b3147246f945cb5f29d146f6
-#+busybox-net-misc.16ac87d6bd8fb8e96f2c7ab49bf5654add9f351b48e77fc8cfb7c85b30922ab6
-#+busybox-net-tools.ab3b95cfc6a5aecb4a23b8f2c3cdf6584471dae401a4ce4b57c0ef334a61c9bb
-#+busybox-traceroute.b978b5ee6505c9a5bd6ec712d672e4a4eac89b21d5213164195ef2c9bf521a9d
-#+busybox-wget.24e89fb2370069f68b500132f69b0bae90363bcecdafd2d1cbcc2cb1652073b5
-#+busybox-chpst.61db7ce002b28620e7e6d0bd51f6bcde2675dbfdaf49982e06c07dbe3018af16
-#+busybox-console.a3d57663741aa7028d30047a2396c2ad6ad2c003b41b4357f9dfb6c035ef9646
-#+busybox-getty.9f6b5c60b4a9decd14d5777be64cf5f1d6946631a7e04f46a91f06fe025a5919
-#+busybox-i2c-tools.58825d225b209cd8fe4f229c1864cbf2e3ff30f29f609b395b5ffc097e785771
-#+busybox-linux-extra.98459353c6ab525961c7588de45567be666c48c9d932de10f6a8022e99a00ba9
-#+busybox-mtd-utils.22f7846f09c5bc11cbe5f27d7da5a9aa324093bc1672fa6aca4e808b9e7c3aaf
-#+busybox-shadow.9529d2b1e4cc9a461453f69a216cae8209adb3590ccb9b1db18618cff132be21
-#+busybox-su.3e33932c67c686be1b67c732fd5f4f014b358c4bfa2d5ec22eae36b67d082dfd
-#+busybox-util-linux-priv.7614e93850020009da0961f788adf1472d528791aaaa03127e6bd5d9ed342f07
-#+busybox-logging.e2674933c594ea48ff61038d33e77960c4376bc82c6dda556b2ebde3ffb5d93f
-#+busybox-cron.8c51a9cf25f2143a6ba8e29cc0a87d27e35894d23bfa1c92bb62d542e66b37ca
-#+attr.1539e5500c32c3f9d8e1e525f99a4ad0ca275f560ad6ce1c48a6d685aa6acf20
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+diffutils.608190128e833539a8c8da2e5a5cd5f302f67eead904d4d274af3ac3829fe9d9
-#+patch.8ecd35c8173bdc0a067515adae38f35d656ffc0aecae9e7634d7c797b51bd359
-#+flex.ebac7441650ba2f6fbc069f26b8b80e31515b61b6b62c79b0a2eabbf4b8f209a
-#+bison.3520cac13850cd73976f33a87d1db03834b887567c51442dc21f39d0e6996348
-#+rsync.bd2da93ab3ce897d92956840e5d73284912811c66bf3d4ab45a0ab69df749722
-#+execline.d18b68e013041d932cb6e25de18722c8b10a31f7bd3c89700e31272053e61759
-#+s6.3efe528f392680722d59c9a7e78e44c99b7db6c9953ed337ae707dc2b5409677
-#+s6-rc.f594b1fb5401ca006c4a7d68fe80de235f2770d48f9d9bd4ee50b93d0a0b19bf
-#+s6-portable-utils.0c9fbc4557db5dd840e61da0970484b593c0346552f029ce9ca05deb86473c9e
-#+s6-linux-utils.1247b500ae6b7400f33e9749a9568e0db697e1f77ec4073b393b81a170874bbc
-#+s6-linux-init.9c390b905f844c09ec2069462db04728d2b079b11a6adf07accee62f49000db3
-#+mdevd.756436e8f4dc95004d8ae3bd663d025655105ec086991242e89532eb2f3afb94
-#+s6-dns.3752bc9635dd91f8236def4f8124b1664f384b247d77d89b1a8f379de1459487
-#+libressl.1160d6705d54f6ef8f01613c3804e3d4a9b84b68d442dabb6a57b9ab9493b1a0
-#+s6-networking.61710ab5b9eb44351d637ba8490ad586e5311d3cd20171d3ce645bd1186af120
-#+zsh.bbc357369ae4f659065c55ed3ac39451b86f5839d668754ceb3805778fc91e74
-#+pthbs-banginstall.c189916ff1f12273d0a1266d3fac34e0af97ff0d693699d9c0bb1512a16927b1
-#+aat.36995ba96c9e753f09fbf5a362195eda2a5cee7ee4af8f02096590780f8ca5ca
-#+confz.f983e6a43ab4d396e298b8bbfe9bf9a5a2c68e543ba1a4b8bda980fe35981b2d
-#+containers.b9a857041e070bf5b7c3387c1196f27bac103b72571f90c0cc8e2aae28c1f186
-#+fileset.5873f643ff0e490a13bba171abdab4bb16b1e40045acdc8118131a54aed97fe0
-#+logincaps.663a2628a025c0920f408f7da988deb30f3dd64b9982ee3586407d25e53bab77
-#+snaprep.467b3ed10c8c7f1c0052ce054f9ad560b5e21867a04a8785263f84fe240b3a3c
-#+curl.ee692cec0552af873f5df64a39bb6f05f53f4933821abc6b7d3a832ecffecc53
-#+git.6be07435aa1a3cd7d3d092a45c271db2d06ed3ada9b23f1907f35c6675d989a6
-#+xbps.876c7b5e27a6f0d8d357abb2c998cb5f31e47370e7a44efad38f82d2c2161505
-#+apk-tools.ffa5b4e49404faf9de4bddff8997ef4b6c2873549de493a61b07ad13b5595888
-#+getent.33ac0bec77db0587d48488ae661dce7aee49e856388d7b4597563b3317ebf592
-#+getconf.7aaac14fe02860179a1eb4b700e3ae34b8b41553e9ef16f0876ef3383e569508
-#+iconv.a196681a9aedad6c533d8e680ed195519dc8ab6a9468bc63c9982d41ce2d36ea
-#+libcap.eee6868b84367e062137d11074c7ad81ee9389f153052251b36c7540027cd5f7
-#+applyuidgid-caps.98fab9f6ba041a60882702e5556e160675cb16c705381b464d0bb97072dedcd5
-#+ccx-utils.73c3f29a27c203b6b799edb9ee6ea58d1eb28efbf2a27534a96c11744a6979b4
-#+user-env.ff0031dd31e15dbdc2701242ee2e10afc93c53fa617dd115df44d4db2af70d6a
-#+strace.5d73813fdf3e4c1568e910ed6e5f7bf9df2c368254670cc6bff042351dc2cf60
-#+mlog.952ce119097c43d9692e19cb05d3647890906a97462781ee4e7caba47a3b04ba
-#+findutils.fa4fdb063bc00c370ae025837a6b2cd41b38a425022c653533f15483e9f7f101
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+nvi.7d7fdc65fa1fa436cedd5c2b9ddd2f80fe318ded80202266201a1f1523de2bb2
-#+squashfs-tools.f520976aa74b3c92198f514001fe48fe1c50d6697206e45bf47ede975638d9e1
-#+mandoc.4e4665e1e6f2cddda49a42f2a30d2f9f178730c6e6500ba7ca4f0399e28fcd2e
-#+tinyssh.a4cac4580ad7804683f85b9969a627a6e5e1aebf577ee973b378139fc30ca571-
\ No newline at end of file
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-dosfstools.e7a348e1d775913157f2fbf4d93241e63ea7cefc121771913d844e2e4a092556
+#+busybox-e2fsprogs.54785935d38485569d8cac755f946bde6bcea3c7a72dcceac84ea7fa7db314bc
+#+busybox-iproute2.75cdc7a50d36c594b4fdd9a8510548d224a1ec000f6965d2cf425464bdc13c55
+#+busybox-iputils.2cb817ed1dcaecec1127ff946bfaadb4c95620c76b476e2a6673494f962bef11
+#+busybox-net-misc.89144737562a757e2fb36baf148dc3c96ecb1505b739c04295ca742598817129
+#+busybox-net-tools.6745ec247e5bc21969c4599bfc115c1506c195b5ded1f4dc9e732b4dfe22ec59
+#+busybox-traceroute.4332cedee870c7ab2c27ea1c843baa7a5bc0419814680acda808668705644cd0
+#+busybox-wget.f5e9d254b2bb4300696e8af1d79bb40ee2f694c9ea5a5f155fbd74bfd3cd811b
+#+busybox-chpst.0b63627b038eb832ec7b82e768ff0deec3fb0c125d171edaa778839f9b83fd39
+#+busybox-console.d8457654ab5d0fe25ea4608aaf59610bf261c022c981d461063008284b7a5c51
+#+busybox-getty.079429247cf7e523b1cb79c5115fb5a78b31a2d5e423304965c224bb080681fb
+#+busybox-i2c-tools.bf5627624846ef390ac82e2c72ce15f1f7a72deb310aa1c950f7f0aacf45bcf3
+#+busybox-linux-extra.a039d9086d0faf44545424a9cc3c065aa2553f9796939203eda5c57c3399a273
+#+busybox-mtd-utils.9cdeb6c42a5ec10a0dd05ca09c889cf00a1e2d2cd5fd52fe7252e0623d9a2819
+#+busybox-shadow.a0dd3a9b5ec86db2d7f77bbe59eef8b838eb6315d34607751430d3a005adcb04
+#+busybox-su.d9e7dc0128758cacdc7eaa4b58bc7bf17410b5902a6f94227c807b71711e4439
+#+busybox-util-linux-priv.966960c5d6e6c476b9332c3886e675aef21bf985af73481beaad0aea2b3ebe22
+#+busybox-logging.ef04b463b75789424e27e56c3f85fea03184848916d81bbaa63ee8f0ccf0d0c2
+#+busybox-cron.1a836b227ba8b7021d5357bf5f7feb482ebdeeeb3c547571522286843551c43e
+#+attr.960060714c2b576113a7b2fb291c644d332b13710f9d67b15d2c2ff3f3b0f895
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+diffutils.7dd07321d0d6c3161b299ec616be1ce88a7dbecc58d3f90b043ac1f4c4378245
+#+patch.dfa91c3dd07b78021e22e13d945a6aa1fd86784d9d0b855afc8456d641aa8c50
+#+flex.27df5386adc46073659b232a29920f24dd7b450848d7f0084fd3895c9bedc888
+#+bison.bb1d7092815d00a3a31a39fedb8e418bc35f9fb41c49a9ede292c2c9b277a585
+#+rsync.9d640e8227288087bb1b174674f7a18ef6ba5cb7d6e6eacc562e5206aeb217d2
+#+execline.5423f4b96a1f5f845f44c8ff25fe5f99e7e2ea9bdda045e39b2428e6e47cc71e
+#+s6.284f89c0874e44f0e6fd9cf713c7af02a5c9aba553ec8691c4d47737e6afec56
+#+s6-rc.6ce4ee8b461f57ac4bb2f71a8b0a3a2911765786a7a950fb0abb70df61fd7441
+#+s6-portable-utils.95211b25d94b4c8840eb1105bbdd9783dc8ba8950f1939339e920543038c5edd
+#+s6-linux-utils.b898195ac86e82b037ba8c638be5aeaac6fd531bbe5ae0918bddd078766aeeed
+#+s6-linux-init.68f1249b659fd4f5523a8b73aca043bb966f5ba14b254e201e5d0a06c2c5968c
+#+mdevd.4b6b20892f0779e8fc38dae3203697a51cac09450abfce754059324b3b1ef383
+#+s6-dns.dc5af061895d362c4a6b0884cb7b3cdb4ea53b0ecc444097089bcf5407ec0b1c
+#+libressl.4c07ed10608c48646995dddd52870e657b74a37293a8dd18688ca39426891278
+#+s6-networking.9b8207fe5fc4118c60c259a7623fa688b559acdb8afa09dc9ae593bd669df444
+#+zsh.4bf497739c038075b843f732c942e800d8ff041388a1b0067e30424151a75d43
+#+pthbs-banginstall.fec12edeb78561ceba0c01ed76d793f0d620a45568dbb3313d2736e8daa72a2d
+#+aat.389a312fee2930ac879920ac125a7375f93f06846ae4026bd2c9ef6e79d65b9e
+#+confz.6e66d378495133195a0854e25aafa195522161f65cbb15262687ea3c7bb6f84f
+#+containers.1c1cbd056de1268a6b13d12911db6bb3b9a8dcfe491338ff7be2f9f812ac4d3e
+#+fileset.6e2b09e8969275f4cb1073ecfad577671fc7a8ffcfc5caa959b16242744efde0
+#+logincaps.ba9976b6226f9d2a15928fb3043c12a9b0ed43d5717e41d6b8ce758d0b54709c
+#+snaprep.1be9e39ff5198a2a7655a96a24dc8ff29babc93f014f61f58e140da960c5f274
+#+curl.638391f857d6278428f738a4de9e70bd3ed30e6b32ddb60f271d271559caffee
+#+git.58fe478690051ff28001856ddf5d82ef61ecd1ca2ce3089ee643263165f8d24d
+#+xbps.3b3cc8ce83fa6268b15138517cf581b49c07e1bd49691f3faba2aa2778e0eb2f
+#+apk-tools.3c09d674cbce2c1b606a9dd33943fa6e95fdcbfa4c23d1b1ffaffd4dc4e5b254
+#+getent.71a6190244cf9b96b0bb2a865c6ed63fb4a32cc26240fe467e355f2b741ef04f
+#+getconf.d791d172ecee20ddbb3cc4b0963cfb2bf82a25a7e472a922704705741a802674
+#+iconv.5ec3bbaf79ddf8a8693f4c5b5e97a0c96765442d772b0a9a77eab46af2c25db9
+#+libcap.4544ffcd5c8b495efc0bc03a21d673703ce18f02f308e25f60d894ee98bf6184
+#+applyuidgid-caps.67645bda9b5a8a04777db0f9c33b53d9675547f16bb02bd58b7fce2668a1dd84
+#+ccx-utils.663d23cb13bca584f07de1ca7a62476936fc9c9488584481f01e5fcb745e3ae0
+#+user-env.dd1ed5feb00faaaa39db1c15ff9247147459b89fd52226ec15bf5e04af928dcd
+#+strace.23997b0cf19f9c50cf7bf3b0089bd846f314f71a20973c97af163af409690f04
+#+mlog.2f8b887191a2ddfcc6779a440fa9291fb73dae820381f54feff420c833b3209a
+#+findutils.3e90c5c2e3b384bbd0e63963a328f6fb9ddc7e80e35eff39a6a46e7c31a6994d
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+nvi.c40f8b5e31333c456b9a941082139553e9518eec30e3b397edebb6956ec3f6bf
+#+squashfs-tools.aa8f3a9f3e28a8061b64daa894147016aac48c316b15e1a9d329bb1b2f500797
+#+mandoc.baf4ded296034f5deb8e6c3cac67cfae5b38e195a69880eaa8eefc3115234d5d
+#+tinyssh.46dae95f43a55a628214fa4ab14b8676fe093dafb91b560bc985fc11146fe1d4+
\ 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.f5272f5b4c2f62ab89c1c588c0a069f575a16693ca03519b1a115cf1f36b0672-
\ No newline at end of file
+#+linux-qemu-guest.f9bd86f2934fe4c60322db80433c9e95390b14b011e27a9572e05b23bda9d164+
\ No newline at end of file
diff --git a/variants/root-x86_64/xbps b/variants/root-x86_64/xbps
@@ -1,45 +1,47 @@
 #!/usr/bin/env pthbs-build
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+libarchive.21c038bffca7d9b996c09ecdd3f52af1eb8be8796d3cd27bd5290844c16fd0e6
-#+libressl.1160d6705d54f6ef8f01613c3804e3d4a9b84b68d442dabb6a57b9ab9493b1a0
-#+pkgconf-pkg-config.bab78c97363f15ff8964b4c3cf45f71e665e04a69facdb5f1e9b0ae98167206c
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+libarchive.9d6219ab295e642a352c9f23dccb730d5b10dfc84829907a96af9899e6407137
+#+libressl.4c07ed10608c48646995dddd52870e657b74a37293a8dd18688ca39426891278
+#+pkgconf-pkg-config.ba0e5c0fa191afa584afe826220475d25200c5b386643d65dae9842bfb2b3b39
 #@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 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.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+m4.c660fe061f5ffaa82c00841257aa109e14b27d12b024a373f278586d85a3c3f0
-#+netbsd-curses.73f036814cdc086750d291f9f758bd9be4fe13dad0d51e535358d080da49097b
-#+libbsd.ed9573486b1a6063325ea59dcd017141c91269e2a7ea05697c2dd856753fbfc8
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+m4.32beafc54cc9ced1138e0231fe717528810de9b8f82012b5a85d017156360f50
+#+netbsd-curses.2f8fd93d356fd884131ec295d27dd173c3801857bec19d790439369b23a1fb46
+#+libbsd.ca306b1628a2f18b82a58a647ac140bad48511c6a2d4a5fbc670b5044c9379c7
 #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config
 #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:.
 
@@ -65,6 +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 LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"
diff --git a/variants/root-x86_64/zstd b/variants/root-x86_64/zstd
@@ -1,43 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.58c783e1ed09910962c0c5d3168171bd1d83eac49fe36277b86a283d55fbf5b9
-#+busybox-bzip2.492b52ebb0fe1f096ddc90c906d9ffa38e4a9aa49fb66f1dbec81b591f926b6c
-#+busybox-gzip.13f99ddd6042c96f08b21d87ec5a57759f762be92a0bc6bbbd81a3dda3c7624b
-#+busybox-lzop.4dbdccc3bc7b5ad784bfea13f376fdf9575e6414f31c8e207d1f7ea3b066541d
-#+busybox-unzip.de84ae4fbcfcaf1e6a031774f8922c6d25009875cb81bebdb30f3c0078e0cf4b
-#+busybox-xz.9c2642c65d8d1228d858c760853d4e5c49e3d4bf2ce192417bd240f94c841058
-#+busybox-cpio.07de5f61f1d8d5ac87baf8e052db925a614d87056084b8f21a97f4a82ad7a856
-#+busybox-dpkg.9179c9a9c5501a3cec3601f87289a3916136df49cb473fff50156102e705613b
-#+busybox-rpm.567b9c8f34934cd8b466d0c441c5027c23812a4d5e183b9f05774d4500693f86
-#+busybox-tar.902db1ec94c0fba5f10bbdef50a4a5c9d6febe9ecdaedc4599bfc5892c8a4e57
-#+busybox-ed.abd333c3ebb727c73196a0536880c2a5ad503a702a0d7fbc9515c3f84bbef874
-#+busybox-sed.23e34bc5664a769a4cc25150aa09cdfc5a6f68a719b306c8ea2765fdcd1f9bbb
-#+busybox-vi.adcbe7c1f06b4ebf09f0e150511b876f663abbf7c94d2c82b7e37d10f1f75f4b
-#+busybox-xxd.2ce38799731eca82ca1cc1580abd8d3752ce668b0a86d064a448b306f1c82ae8
-#+busybox-process-extra.e49ac59f8f0150feff2afd8cb282cdbc9da036bcf71d69626f6bc645f66ad250
-#+busybox-procps.65fcaf28f360a100f8bfaf4e3906a11c765aeffcaf876a7d1bad51570a2db3ae
-#+busybox-psmisc.ca6e6cc3012be02ed4b766389d009953571bb6ed36ae864ab221a7c5ca08ce2c
-#+busybox-ash.293a5464e1f3dfb6fa5ab4e3c2931ed295ce275711b9492d2e0d1f9d22f890d2
-#+busybox-bc.afe1511b2edbb9f0b1c4052e1e9102033ffcb1928e017745254b49e3931e2fb7
-#+busybox-coreutils.90c8039366c634615d76f16f20ad8b83bd4dfb812d1c4c6ce516db9ebc11eb95
-#+busybox-coreutils-extra.2d92db463775469e0e6dfbf03505db1a0da79ce55d6011f7819a62bd1ddc62f1
-#+busybox-daemontools.75e96d32444d142e0bb94d720d3a54cc270d81982f1434ced650c91bd4159cb8
-#+busybox-grep.005d0f5302586b762ec6e0c2ae988afcaffd4ebb26432fc85ce748521431f91b
-#+busybox-misc.a4c822403bf4d90dd1d2287b8255fb52a81d4858d39a6b7b726deb3636fea0ae
-#+busybox-sh.0d50a77252ba334df003227079d30407a12b7f9d37d216335170643432d88be9
-#+busybox-util-linux-unpriv.4c867fcabf18b8915347ab8dcef8c3daa0411006b28ef98fb746a62168ee709f
-#+busybox-findutils.b964c50176ebbbcf55d16ee6506dcd411025d84e17097bc4070799b4584ba23d
-#+nawk.6ba34a9c6d37278d62d09df288542ad9049c5e985d5ec1eaa0953ba04f0c7010
-#+musl.154dfc093006cca9f0757fe79af830e7ed6a078f1953744b6cea57d4597142a3
-#+gcc.4cf692211253ac016d4a006cd3209929393e9e502b8b21239ed7399152b5a5ee
-#+binutils.8799d8d4943d5d9e4e06405b7d3eebc61033d7e4a29e191ce1025f6331e6d628
-#+gnu-make.452072070ef48fc15411e910b8e59b1fe8c98fb344b316d028ba86a6eed6f6db
-#+busybox-diffutils.76573146b8bb974149ec91b7e26ab5839755df8a4618c03c958db9347a372bea
+#+busybox.e39975a1d0355807b63fac68931d5f37e13b87082fb668888b38906ff87086f1
+#+busybox-bzip2.6104ee1026016708ad03921dc35b5e798e39ba179a96a9e2049cbb935d06a70e
+#+busybox-gzip.371a961d5ab6279d69f5300545f02291d6bd267330aa86e8bdf99495c1395d14
+#+busybox-lzop.68e96feec8e99da604a1bc6c28f310cc1f1ba998cc1ce3118ad8af030a4d9727
+#+busybox-unzip.cc9b03ccc1d96b3ba573c9f779fd8cd05b1c8389e3902a43cd7f647a26900ce3
+#+busybox-xz.fcc52443faf39a862d251323a3755fd837fac3e89c493357f1db350b2c291b6c
+#+busybox-cpio.9aaaf356d69313af294a74b89cab910fe4c7edb5ab62a727ac5f4c1fa3186209
+#+busybox-dpkg.3857af6f4b8d6c342f323996ff292c3d7468af575a3417d16cc5ac15bd450d1d
+#+busybox-rpm.70ad8a8dc6bc0c6d17797f41d6dfa1cae6f51309e458510d0a474e4d0505148f
+#+busybox-tar.254b4601b7b50e421f700472609ea76329d9c31a0fe52365006cf43fff801800
+#+busybox-ed.c0f520ff180ae23e5bfa5942e524db03d42f2c7be919c4bf2dc9ae72d9d9aa00
+#+busybox-sed.649d3e779e7f95c76a66da4064699a0dcf8fb8f8408a894a074a0aef11df2669
+#+busybox-vi.be7addfbbd91cb00ff052df5f696aa846c08d1ad761df62650650626466702d1
+#+busybox-xxd.5575f448801af486b4fb0cb40e366f7f65a41333aa1b9a9d34427402e40cb42c
+#+busybox-process-extra.4c7b7ebe99fa788c3ea60081de53197e292e82af8d5979beeda26e8f8908ec71
+#+busybox-procps.45d6f266759ce3e002e772c9f2d3e49f5c9b5241d1834d1fc5e2305b41984226
+#+busybox-psmisc.de00516d27369f2951a2200fed7c0d105201f159c1458cabd0dfe028d8abcf53
+#+busybox-ash.b4bc332957a2de5cbab260a1f72106bafaa84a3ac50e2eabd5fa20cdc3a2aa10
+#+busybox-bc.9ec6ed63a8c4820a7bd55e9406345f0ea82633e0cda0a1fec65fcdc5e160a2c1
+#+busybox-coreutils.eb5498b28e99de663829daf0e7ebcf13122ced14e7920f8151fdf239d56bd48b
+#+busybox-coreutils-extra.8a360d41f421e0b6c03ce2d48ac64d6e06f0c2609089019957cec13836df6bff
+#+busybox-daemontools.0b9af372c19be96470954fd0e9b4735ff64e8c4d3426f73ddb6166d3a1559123
+#+busybox-grep.af568a85e76fcd011134fd865f5826c81586b07ec2668982588af6598747ba56
+#+busybox-misc.d2b1e00bcc3e8cdc52af89103d1ed362c85e2bd2d29c9038bc9cb46e733448ce
+#+busybox-sh.f41f8ba97ab941e5ff12fdd6eca1e311c77aaf5f8b2a3387f34e156a56d9a96a
+#+busybox-util-linux-unpriv.69b2f4cb42f78fdb637214b11b1ab5ec938ba1c4de3662b13867e4c4192fac17
+#+busybox-findutils.90674a6478b1985bb2a6316b641fc6fb03782b4a2d4ccf2e0817fde42c99f83b
+#+nawk.e930455f2bdee49a5dd430b2dc4e4ec5d78d27baacd0c9d997bf729b0b85175a
+#+musl.0374f5657a21da8785cb9ae4bf1bb60af1019c9ee0bbbdda56a51363cd071f6e
+#+gcc.24f92fd5ee92df66b55d2e346525d29f19b66757b1835ffc9b295ce4be81e7c1
+#+binutils.8efc4b55ef078839cdab41b8221f6961a0203b5743e9d722c9eee5e97b52a63f
+#+gnu-make.8cd74977c124445a60aba4371289c72f9c4a5b2608a7600f601c998dad8fad2f
+#+busybox-diffutils.b4e545e9ce8c86acb4f1009b4fae80f94710068dfdaf658fe87c6260ff18bb91
 #@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 LD_LIBRARY_PATH="$pthbs_build_environment/library"
 	export CPATH="$pthbs_build_environment/include"
 	export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS"