mrrl

commit f123ca11876317c0f8e351ea98cc45cc3f82af7a
parent 5e17863755f679a16ae630a7091d9a3de4df4f16
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Sat, 29 Nov 2025 12:38:49 +0000

Better genlinks errors, change zsh build options

Diffstat:
M
templates/genlinks
 | 
4
+++-
M
templates/musl-cross-make
 | 
3
++-
M
templates/pkg/zsh
 | 
28
++++++++++++++++++++--------
M
variants/ccx-x86_64/aat
 | 
64
+++++++++++++++++++++++++++++++++-------------------------------
M
variants/ccx-x86_64/abduco
 | 
66
++++++++++++++++++++++++++++++++++--------------------------------
M
variants/ccx-x86_64/alpine-keys
 | 
60
+++++++++++++++++++++++++++++++-----------------------------
M
variants/ccx-x86_64/apk-tools
 | 
74
++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/applyuidgid-caps
 | 
66
++++++++++++++++++++++++++++++++++--------------------------------
M
variants/ccx-x86_64/argp-standalone
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/attr
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/bison
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/bootstrap.environment
 | 
8
++++----
M
variants/ccx-x86_64/busybox
 | 
6
+++---
M
variants/ccx-x86_64/busybox-ash
 | 
4
++--
M
variants/ccx-x86_64/busybox-attr
 | 
4
++--
M
variants/ccx-x86_64/busybox-awk
 | 
4
++--
M
variants/ccx-x86_64/busybox-bc
 | 
4
++--
M
variants/ccx-x86_64/busybox-bzip2
 | 
4
++--
M
variants/ccx-x86_64/busybox-chpst
 | 
4
++--
M
variants/ccx-x86_64/busybox-console
 | 
4
++--
M
variants/ccx-x86_64/busybox-coreutils
 | 
4
++--
M
variants/ccx-x86_64/busybox-coreutils-extra
 | 
4
++--
M
variants/ccx-x86_64/busybox-cpio
 | 
4
++--
M
variants/ccx-x86_64/busybox-cron
 | 
4
++--
M
variants/ccx-x86_64/busybox-daemontools
 | 
4
++--
M
variants/ccx-x86_64/busybox-diffutils
 | 
4
++--
M
variants/ccx-x86_64/busybox-dosfstools
 | 
4
++--
M
variants/ccx-x86_64/busybox-dpkg
 | 
4
++--
M
variants/ccx-x86_64/busybox-e2fsprogs
 | 
4
++--
M
variants/ccx-x86_64/busybox-ed
 | 
4
++--
M
variants/ccx-x86_64/busybox-findutils
 | 
4
++--
M
variants/ccx-x86_64/busybox-getty
 | 
4
++--
M
variants/ccx-x86_64/busybox-grep
 | 
4
++--
M
variants/ccx-x86_64/busybox-gzip
 | 
4
++--
M
variants/ccx-x86_64/busybox-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
 | 
8
++++----
M
variants/ccx-x86_64/busybox:modutils
 | 
64
++++++++++++++++++++++++++++++++--------------------------------
M
variants/ccx-x86_64/ca-certificates-wip-donotuse
 | 
62
++++++++++++++++++++++++++++++++------------------------------
M
variants/ccx-x86_64/ccx-utils
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/certdata2pem
 | 
62
++++++++++++++++++++++++++++++++------------------------------
M
variants/ccx-x86_64/confz
 | 
64
+++++++++++++++++++++++++++++++++-------------------------------
M
variants/ccx-x86_64/container-bin-image
 | 
112
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/ccx-x86_64/containers
 | 
88
++++++++++++++++++++++++++++++++++++++++---------------------------------------
M
variants/ccx-x86_64/containers.environment
 | 
128
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/ccx-x86_64/curl
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/default.environment
 | 
192
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/ccx-x86_64/diffutils
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/dune
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/easyseccomp
 | 
80
++++++++++++++++++++++++++++++++++++++++---------------------------------------
M
variants/ccx-x86_64/error-standalone
 | 
66
++++++++++++++++++++++++++++++++++--------------------------------
M
variants/ccx-x86_64/execline
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/execline:bootstrap
 | 
14
++++++++------
M
variants/ccx-x86_64/fileset
 | 
64
+++++++++++++++++++++++++++++++++-------------------------------
M
variants/ccx-x86_64/findutils
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/flex
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/getconf
 | 
62
++++++++++++++++++++++++++++++++------------------------------
M
variants/ccx-x86_64/getent
 | 
62
++++++++++++++++++++++++++++++++------------------------------
M
variants/ccx-x86_64/git
 | 
72
+++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/gnu-make
 | 
10
++++++----
M
variants/ccx-x86_64/gnu-make:bootstrap
 | 
8
+++++---
M
variants/ccx-x86_64/gperf
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/iconv
 | 
62
++++++++++++++++++++++++++++++++------------------------------
M
variants/ccx-x86_64/kbd
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/kernel.environment
 | 
6
+++---
M
variants/ccx-x86_64/libarchive
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/libbsd
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/libcap
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/libcap:bootstrap
 | 
10
++++++----
M
variants/ccx-x86_64/libcgroup
 | 
74
++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/libelf
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/libmd
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/libressl
 | 
72
+++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/libseccomp
 | 
72
+++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/libunwind
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/linux
 | 
82
++++++++++++++++++++++++++++++++++++++++---------------------------------------
M
variants/ccx-x86_64/linux-qemu-guest
 | 
82
++++++++++++++++++++++++++++++++++++++++---------------------------------------
M
variants/ccx-x86_64/lnstools:bootstrap
 | 
16
+++++++++-------
M
variants/ccx-x86_64/logincaps
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/m4
 | 
66
++++++++++++++++++++++++++++++++++--------------------------------
M
variants/ccx-x86_64/mandoc
 | 
66
++++++++++++++++++++++++++++++++++--------------------------------
M
variants/ccx-x86_64/mdev-scripts
 | 
64
+++++++++++++++++++++++++++++++++-------------------------------
M
variants/ccx-x86_64/mdevd
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/mdevd.environment
 | 
102
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/ccx-x86_64/mlog
 | 
64
+++++++++++++++++++++++++++++++++-------------------------------
M
variants/ccx-x86_64/musl-cross-make
 | 
40
++++++----------------------------------
M
variants/ccx-x86_64/musl-cross-make:bootstrap-0
 | 
34
+++-------------------------------
M
variants/ccx-x86_64/musl-cross-make:bootstrap-1
 | 
38
+++++---------------------------------
M
variants/ccx-x86_64/musl-fts
 | 
64
+++++++++++++++++++++++++++++++++-------------------------------
M
variants/ccx-x86_64/nawk
 | 
66
++++++++++++++++++++++++++++++++++--------------------------------
M
variants/ccx-x86_64/netbsd-curses
 | 
64
+++++++++++++++++++++++++++++++++-------------------------------
M
variants/ccx-x86_64/ocaml-astring
 | 
74
++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/ocaml-base
 | 
72
+++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/ocaml-bos
 | 
86
++++++++++++++++++++++++++++++++++++++++---------------------------------------
M
variants/ccx-x86_64/ocaml-cmdliner
 | 
74
++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/ocaml-compiler-libs
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/ocaml-cppo
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/ocaml-findlib
 | 
78
++++++++++++++++++++++++++++++++++++++++--------------------------------------
M
variants/ccx-x86_64/ocaml-fmt
 | 
76
+++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/ocaml-fpath
 | 
76
+++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/ocaml-logs
 | 
80
++++++++++++++++++++++++++++++++++++++++---------------------------------------
M
variants/ccx-x86_64/ocaml-lun
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/ocaml-mtime
 | 
74
++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/ocaml-ppx_derivers
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/ocaml-ppx_deriving
 | 
82
++++++++++++++++++++++++++++++++++++++++---------------------------------------
M
variants/ccx-x86_64/ocaml-ppxlib
 | 
76
+++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/ocaml-rresult
 | 
74
++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/ocaml-sexplib0
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/ocaml-stdlib-shims
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/ocaml-topkg
 | 
72
+++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/ocaml.environment
 | 
18
+++++++++---------
M
variants/ccx-x86_64/ocaml:dynlink
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/ocaml_intrinsics_kernel
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/ocamlbuild
 | 
74
++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/opam
 | 
76
+++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/patch
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/pkgconf
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/pkgconf-pkg-config
 | 
54
+++++++++++++++++++++++++++---------------------------
M
variants/ccx-x86_64/popt
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/pthbs-banginstall
 | 
62
++++++++++++++++++++++++++++++++------------------------------
M
variants/ccx-x86_64/pthbs-sandbox-rootns
 | 
8
++++----
M
variants/ccx-x86_64/rsync
 | 
74
++++++++++++++++++++++++++++++++++++++------------------------------------
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
 | 
8
++++----
M
variants/ccx-x86_64/sandbox_rootns.environment
 | 
8
++++----
M
variants/ccx-x86_64/skalibs
 | 
64
+++++++++++++++++++++++++++++++++-------------------------------
M
variants/ccx-x86_64/skalibs:bootstrap
 | 
10
++++++----
M
variants/ccx-x86_64/snaprep
 | 
64
+++++++++++++++++++++++++++++++++-------------------------------
M
variants/ccx-x86_64/squashfs-tools
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/strace
 | 
72
+++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/system-config
 | 
134
++++++++++++++++++++++++++++++++++++++++---------------------------------------
M
variants/ccx-x86_64/system-config-init
 | 
112
++++++++++++++++++++++++++++++++++++++++---------------------------------------
M
variants/ccx-x86_64/system-config-rc
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/system-config-scripts
 | 
64
+++++++++++++++++++++++++++++++++-------------------------------
M
variants/ccx-x86_64/system-config-zsh
 | 
62
++++++++++++++++++++++++++++++++------------------------------
M
variants/ccx-x86_64/tinyssh
 | 
66
++++++++++++++++++++++++++++++++++--------------------------------
M
variants/ccx-x86_64/user-env
 | 
64
+++++++++++++++++++++++++++++++++-------------------------------
M
variants/ccx-x86_64/userspace.environment
 | 
180
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/ccx-x86_64/vm.environment
 | 
4
++--
M
variants/ccx-x86_64/xbps
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/ccx-x86_64/zsh
 | 
95
++++++++++++++++++++++++++++++++++++++++++++++---------------------------------
M
variants/ccx-x86_64/zstd
 | 
66
++++++++++++++++++++++++++++++++++--------------------------------
M
variants/root-x86_64/aat
 | 
64
+++++++++++++++++++++++++++++++++-------------------------------
M
variants/root-x86_64/abduco
 | 
66
++++++++++++++++++++++++++++++++++--------------------------------
M
variants/root-x86_64/alpine-keys
 | 
60
+++++++++++++++++++++++++++++++-----------------------------
M
variants/root-x86_64/apk-tools
 | 
74
++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/applyuidgid-caps
 | 
66
++++++++++++++++++++++++++++++++++--------------------------------
M
variants/root-x86_64/argp-standalone
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/attr
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/bison
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/bootstrap.environment
 | 
8
++++----
M
variants/root-x86_64/busybox
 | 
6
+++---
M
variants/root-x86_64/busybox-ash
 | 
4
++--
M
variants/root-x86_64/busybox-attr
 | 
4
++--
M
variants/root-x86_64/busybox-awk
 | 
4
++--
M
variants/root-x86_64/busybox-bc
 | 
4
++--
M
variants/root-x86_64/busybox-bzip2
 | 
4
++--
M
variants/root-x86_64/busybox-chpst
 | 
4
++--
M
variants/root-x86_64/busybox-console
 | 
4
++--
M
variants/root-x86_64/busybox-coreutils
 | 
4
++--
M
variants/root-x86_64/busybox-coreutils-extra
 | 
4
++--
M
variants/root-x86_64/busybox-cpio
 | 
4
++--
M
variants/root-x86_64/busybox-cron
 | 
4
++--
M
variants/root-x86_64/busybox-daemontools
 | 
4
++--
M
variants/root-x86_64/busybox-diffutils
 | 
4
++--
M
variants/root-x86_64/busybox-dosfstools
 | 
4
++--
M
variants/root-x86_64/busybox-dpkg
 | 
4
++--
M
variants/root-x86_64/busybox-e2fsprogs
 | 
4
++--
M
variants/root-x86_64/busybox-ed
 | 
4
++--
M
variants/root-x86_64/busybox-findutils
 | 
4
++--
M
variants/root-x86_64/busybox-getty
 | 
4
++--
M
variants/root-x86_64/busybox-grep
 | 
4
++--
M
variants/root-x86_64/busybox-gzip
 | 
4
++--
M
variants/root-x86_64/busybox-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
 | 
8
++++----
M
variants/root-x86_64/ca-certificates-wip-donotuse
 | 
62
++++++++++++++++++++++++++++++++------------------------------
M
variants/root-x86_64/ccx-utils
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/certdata2pem
 | 
62
++++++++++++++++++++++++++++++++------------------------------
M
variants/root-x86_64/confz
 | 
64
+++++++++++++++++++++++++++++++++-------------------------------
M
variants/root-x86_64/container-bin-image
 | 
112
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/root-x86_64/containers
 | 
88
++++++++++++++++++++++++++++++++++++++++---------------------------------------
M
variants/root-x86_64/containers.environment
 | 
128
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/root-x86_64/curl
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/default.environment
 | 
192
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/root-x86_64/diffutils
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/dune
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/easyseccomp
 | 
80
++++++++++++++++++++++++++++++++++++++++---------------------------------------
M
variants/root-x86_64/error-standalone
 | 
66
++++++++++++++++++++++++++++++++++--------------------------------
M
variants/root-x86_64/execline
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/execline:bootstrap
 | 
14
++++++++------
M
variants/root-x86_64/fileset
 | 
64
+++++++++++++++++++++++++++++++++-------------------------------
M
variants/root-x86_64/findutils
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/flex
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/getconf
 | 
62
++++++++++++++++++++++++++++++++------------------------------
M
variants/root-x86_64/getent
 | 
62
++++++++++++++++++++++++++++++++------------------------------
M
variants/root-x86_64/git
 | 
72
+++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/gnu-make
 | 
10
++++++----
M
variants/root-x86_64/gnu-make:bootstrap
 | 
8
+++++---
M
variants/root-x86_64/gperf
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/iconv
 | 
62
++++++++++++++++++++++++++++++++------------------------------
M
variants/root-x86_64/kbd
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/libarchive
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/libbsd
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/libcap
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/libcap:bootstrap
 | 
10
++++++----
M
variants/root-x86_64/libcgroup
 | 
74
++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/libelf
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/libmd
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/libressl
 | 
72
+++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/libseccomp
 | 
72
+++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/libunwind
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/linux-qemu-guest
 | 
82
++++++++++++++++++++++++++++++++++++++++---------------------------------------
M
variants/root-x86_64/lnstools:bootstrap
 | 
16
+++++++++-------
M
variants/root-x86_64/logincaps
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/m4
 | 
66
++++++++++++++++++++++++++++++++++--------------------------------
M
variants/root-x86_64/mandoc
 | 
66
++++++++++++++++++++++++++++++++++--------------------------------
M
variants/root-x86_64/mdev-scripts
 | 
64
+++++++++++++++++++++++++++++++++-------------------------------
M
variants/root-x86_64/mdevd
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/mdevd.environment
 | 
102
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/root-x86_64/mlog
 | 
64
+++++++++++++++++++++++++++++++++-------------------------------
M
variants/root-x86_64/musl-cross-make
 | 
40
++++++----------------------------------
M
variants/root-x86_64/musl-cross-make:bootstrap-0
 | 
34
+++-------------------------------
M
variants/root-x86_64/musl-cross-make:bootstrap-1
 | 
38
+++++---------------------------------
M
variants/root-x86_64/musl-fts
 | 
64
+++++++++++++++++++++++++++++++++-------------------------------
M
variants/root-x86_64/nawk
 | 
66
++++++++++++++++++++++++++++++++++--------------------------------
M
variants/root-x86_64/netbsd-curses
 | 
64
+++++++++++++++++++++++++++++++++-------------------------------
M
variants/root-x86_64/ocaml-astring
 | 
74
++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/ocaml-base
 | 
72
+++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/ocaml-bos
 | 
86
++++++++++++++++++++++++++++++++++++++++---------------------------------------
M
variants/root-x86_64/ocaml-cmdliner
 | 
74
++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/ocaml-compiler-libs
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/ocaml-cppo
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/ocaml-findlib
 | 
78
++++++++++++++++++++++++++++++++++++++++--------------------------------------
M
variants/root-x86_64/ocaml-fmt
 | 
76
+++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/ocaml-fpath
 | 
76
+++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/ocaml-logs
 | 
80
++++++++++++++++++++++++++++++++++++++++---------------------------------------
M
variants/root-x86_64/ocaml-lun
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/ocaml-mtime
 | 
74
++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/ocaml-ppx_derivers
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/ocaml-ppx_deriving
 | 
82
++++++++++++++++++++++++++++++++++++++++---------------------------------------
M
variants/root-x86_64/ocaml-ppxlib
 | 
76
+++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/ocaml-rresult
 | 
74
++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/ocaml-sexplib0
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/ocaml-stdlib-shims
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/ocaml-topkg
 | 
72
+++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/ocaml.environment
 | 
18
+++++++++---------
M
variants/root-x86_64/ocaml:dynlink
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/ocaml_intrinsics_kernel
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/ocamlbuild
 | 
74
++++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/opam
 | 
76
+++++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/patch
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/pkgconf
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/pkgconf-pkg-config
 | 
54
+++++++++++++++++++++++++++---------------------------
M
variants/root-x86_64/popt
 | 
68
+++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/pthbs-banginstall
 | 
62
++++++++++++++++++++++++++++++++------------------------------
M
variants/root-x86_64/pthbs-sandbox-rootns
 | 
8
++++----
M
variants/root-x86_64/rsync
 | 
74
++++++++++++++++++++++++++++++++++++++------------------------------------
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
 | 
8
++++----
M
variants/root-x86_64/sandbox_rootns.environment
 | 
8
++++----
M
variants/root-x86_64/skalibs
 | 
64
+++++++++++++++++++++++++++++++++-------------------------------
M
variants/root-x86_64/skalibs:bootstrap
 | 
10
++++++----
M
variants/root-x86_64/snaprep
 | 
64
+++++++++++++++++++++++++++++++++-------------------------------
M
variants/root-x86_64/squashfs-tools
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/strace
 | 
72
+++++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/system-config
 | 
134
++++++++++++++++++++++++++++++++++++++++---------------------------------------
M
variants/root-x86_64/system-config-init
 | 
112
++++++++++++++++++++++++++++++++++++++++---------------------------------------
M
variants/root-x86_64/system-config-rc
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/system-config-scripts
 | 
64
+++++++++++++++++++++++++++++++++-------------------------------
M
variants/root-x86_64/system-config-zsh
 | 
62
++++++++++++++++++++++++++++++++------------------------------
M
variants/root-x86_64/tinyssh
 | 
66
++++++++++++++++++++++++++++++++++--------------------------------
M
variants/root-x86_64/user-env
 | 
64
+++++++++++++++++++++++++++++++++-------------------------------
M
variants/root-x86_64/userspace.environment
 | 
180
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/root-x86_64/vm.environment
 | 
4
++--
M
variants/root-x86_64/xbps
 | 
70
++++++++++++++++++++++++++++++++++++----------------------------------
M
variants/root-x86_64/zsh
 | 
95
++++++++++++++++++++++++++++++++++++++++++++++---------------------------------
M
variants/root-x86_64/zstd
 | 
66
++++++++++++++++++++++++++++++++++--------------------------------

346 files changed, 8250 insertions(+), 7967 deletions(-)
diff --git a/templates/genlinks b/templates/genlinks
@@ -57,12 +57,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 {% endblock finish %}
diff --git a/templates/musl-cross-make b/templates/musl-cross-make
@@ -35,7 +35,7 @@ grep -F "$pthbs_package" true.linker
 {% block genlinks_begin %}
 	x["./bin/{{triplet}}-g++"]=1
 	x["./bin/{{triplet}}-gcc"]=1
-
+{#-
 	x["./{{triplet}}/include/assert.h"]=1  # standard headers as per C11
 	x["./{{triplet}}/include/complex.h"]=1
 	x["./{{triplet}}/include/ctype.h"]=1
@@ -65,6 +65,7 @@ grep -F "$pthbs_package" true.linker
 	x["./{{triplet}}/include/uchar.h"]=1
 	x["./{{triplet}}/include/wchar.h"]=1
 	x["./{{triplet}}/include/wctype.h"]=1
+#}
 {% endblock %}
 {% block genlinks_rules %}
 $2 == "bin" && $3 ~ /^{{triplet}}-/ { target=$3; sub("{{triplet}}-", "", target); link("./command/" target) }
diff --git a/templates/pkg/zsh b/templates/pkg/zsh
@@ -7,11 +7,8 @@
 #+{{pkg_install_name("libbsd")}}
 #@git:{{submodule.current["zsh_config"]}}:zsh_config
 {% endblock %}
-{% block configure_args -%}
-	--enable-static --disable-shared \
-	--enable-libc-musl --disable-locale \
-	--enable-cap \
-	--enable-maildir-support \
+{%- block configure %}
+autotools_config \
 	--enable-datadir="${prefix}" \
 	--enable-datarootdir="${prefix}" \
 	--enable-etcdir="${prefix}/etc" \
@@ -20,10 +17,25 @@
 	--enable-fndir="${prefix}/zsh/functions" \
 	--enable-site-fndir="${prefix}/zsh/site-functions" \
 	--enable-runhelpdir="${prefix}/zsh/help" \
+	--disable-dynamic \
+	--disable-restricted-r \
+	--enable-locale \
+	--enable-maildir-support \
+	--disable-pcre \
+	--disable-gdbm \
+	--enable-cap \
+	--enable-multibyte \
+	--enable-unicode9 \
+	--enable-libc-musl \
+	--disable-dynamic-nss \
 	--with-tcsetpgrp
-{% endblock %}
-{% block configure -%}
-{{ super() -}}
+
+# consider enabling:
+# name=zsh/attr modfile=Src/Modules/attr.mdd link=no auto=yes load=no
+# name=zsh/cap modfile=Src/Modules/cap.mdd link=no auto=yes load=no
+# name=zsh/curses modfile=Src/Modules/curses.mdd link=no auto=yes load=no
+# name=zsh/mathfunc modfile=Src/Modules/mathfunc.mdd link=no auto=yes load=no
+# name=zsh/zprof modfile=Src/Modules/zprof.mdd link=no auto=yes load=no
 sed -Ee '/name=zsh\/(files|stat|system|zselect|zutil|regex|net\/socket|net\/tcp) /s/link=[^ ]+/link=static/' -i config.modules
 cat config.modules
 
diff --git a/variants/ccx-x86_64/aat b/variants/ccx-x86_64/aat
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+zsh.7b99d4c89d067b4dbf2b1d80dda11f2d4cf636988ca7037eef5e13ff2aeebb78
-#+pthbs-banginstall.5204681c37f6f2b2fc9191fb2755a1e998f05e7d74a7665b5d3926e53a331c16
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+zsh.d6a0bbc670433d1df6ea77735e63fcd1825782766457dfec5b75fff57ed229a7
+#+pthbs-banginstall.107948011aedc6fdcc44097d706a1c77990cdd8a8c72c0911af91a7b88813221
 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat
 
 
@@ -115,12 +115,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/abduco b/variants/ccx-x86_64/abduco
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
 #@git:8c32909a159aaa9484c82b71f05b7a73321eb491:abduco
 
 
@@ -136,12 +136,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
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.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
 #@git:c7b36ed27103ee3f9aa01905ba1fac2d606079cf:alpine-keys
 
 
@@ -94,12 +94,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/apk-tools b/variants/ccx-x86_64/apk-tools
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+patch.49cd0df84abbc8dbceadbe048372c8f6a53798e563f3b37ae1949b997f2a29b1
-#+libressl.41ff2305967824c8bc4f745d6f725d1b211ca8784157d40c5e069eb915e14d1e
-#+zstd.95289201da3b17803fbb968db2c2be675cf214dd1c0490928af1c8d50a3ad3ae
-#+pkgconf-pkg-config.887274589ed9d8851d242e84e26fd90e8e4cec514a8aa1f1044f4d313ef92096
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+patch.22417d3878fcce24877e5285481ba9b8ed3cb4114f01dd35e02b64f6a2ec245e
+#+libressl.fc2f48e22bfc2eedac1ab7f30203448cf4c4326d27d9884756da5c09983a5b29
+#+zstd.bec5ce685f048b9187b82cddc72366c8c7fc9aea6bb800df58752a71cb8ba898
+#+pkgconf-pkg-config.4fe10ac5e20e36ea2a64a45fe59107e310ef4c84ebaf98cf5b9670b083150594
 #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch
 #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools
 
@@ -134,12 +134,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/applyuidgid-caps b/variants/ccx-x86_64/applyuidgid-caps
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+skalibs.a47e9b9b17ff00d9a4992c11aabd7433b94bf76350e76bd86a69ed545862b8e8
-#+libcap.f7b9e4a8ba271cf8cf9fdd37f118350f1b348b5c3e62b126eb15559af88daba1
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+skalibs.7601d35bdf431e184e2d53a86151d2aa572b0036ca689a2a9c59ee22930563d8
+#+libcap.ffb7a2e12924697efeb24ea043793ea32e9f206398d98704943f09fb9bc5ae74
 #@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c
 
 
@@ -123,12 +123,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/argp-standalone b/variants/ccx-x86_64/argp-standalone
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+m4.b8e999c51db94861dd245fb124d0ff26c7c1a0319b5031650bfeea527663afa5
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+m4.35234fd497356ccd3993f8730e6f7097888c37474e62a9b01993b4025ad650f0
 #@untar:-z:sha256:c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6:.
 #@untar::sha256:a4facc0856b512ad8ab5aed7b07e14a9629aaf042b1e92377ba22fcfc4c4205b:argp-standalone-1.5.0
 
@@ -132,12 +132,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/attr b/variants/ccx-x86_64/attr
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+m4.b8e999c51db94861dd245fb124d0ff26c7c1a0319b5031650bfeea527663afa5
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+m4.35234fd497356ccd3993f8730e6f7097888c37474e62a9b01993b4025ad650f0
 #@untar:-z:sha256:39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87:.
 
 
@@ -151,12 +151,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/bison b/variants/ccx-x86_64/bison
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+m4.b8e999c51db94861dd245fb124d0ff26c7c1a0319b5031650bfeea527663afa5
-#+flex.c807deafd5dcf61ab4b56ccc6e344d4534998be335b365a385b15a7a7100132b
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+m4.35234fd497356ccd3993f8730e6f7097888c37474e62a9b01993b4025ad650f0
+#+flex.26923b9a97577df9eca703d35dfbdd94ecf9052ff5d696d781be46d0c5a7f137
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 
@@ -153,12 +153,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+gnu-make.21e5b69f469d66bea208a7d13ef5b5ac12be0321db44a53f95d1a54f5022bb1d
-#+musl-cross-make.902ec66224ca84eb656a9710bb00f926d6cdce3cf854ec75d26be51cb93bc9d5-
\ No newline at end of file
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+gnu-make.bfc2dfe04b627342ab19a53cabfd38260491d1bbc0bf92da9f567cd22d7669da
+#+musl-cross-make.2e3da518bf9f90004096c42152f0d72b04a18cf629858bb25c26c765acbf5280+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/busybox b/variants/ccx-x86_64/busybox
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.21e5b69f469d66bea208a7d13ef5b5ac12be0321db44a53f95d1a54f5022bb1d
-#+busybox.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.bfc2dfe04b627342ab19a53cabfd38260491d1bbc0bf92da9f567cd22d7669da
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
 #@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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
 
 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,14 +1,14 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
 #@pragma:nopath
-#+musl-cross-make.902ec66224ca84eb656a9710bb00f926d6cdce3cf854ec75d26be51cb93bc9d5
-#+gnu-make.21e5b69f469d66bea208a7d13ef5b5ac12be0321db44a53f95d1a54f5022bb1d
+#+musl-cross-make.2e3da518bf9f90004096c42152f0d72b04a18cf629858bb25c26c765acbf5280
+#+gnu-make.bfc2dfe04b627342ab19a53cabfd38260491d1bbc0bf92da9f567cd22d7669da
 #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox
 #@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config
 
 PATH="$pthbs_build_environment:$PATH"
-mcm=/home/ccx/versions/musl-cross-make.902ec66224ca84eb656a9710bb00f926d6cdce3cf854ec75d26be51cb93bc9d5
-make=/home/ccx/versions/gnu-make.21e5b69f469d66bea208a7d13ef5b5ac12be0321db44a53f95d1a54f5022bb1d
+mcm=/home/ccx/versions/musl-cross-make.2e3da518bf9f90004096c42152f0d72b04a18cf629858bb25c26c765acbf5280
+make=/home/ccx/versions/gnu-make.bfc2dfe04b627342ab19a53cabfd38260491d1bbc0bf92da9f567cd22d7669da
 
 export CC="$mcm/bin/x86_64-linux-musl-gcc"
 export CFLAGS="-D_GNU_SOURCE"
diff --git a/variants/ccx-x86_64/busybox:modutils b/variants/ccx-x86_64/busybox:modutils
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+linux-qemu-guest.68b61594f2c1eb1505a3822228c0204ba45da2e41a696ee7c39ad4e15dc8a342
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
+#+linux-qemu-guest.1c04cf5b2e76cfbe19debfcb4d99a9858c452a6efc04485a72e1dc71c384418c
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
 #@sha256:ccb459010923e1a9b49cb39d45bc93d0fc8749acea6efd7b19cfb00e76a5562e:busybox/.config
 #@git:3621595939e43a831d66f6b757d4f410029bff95:busybox
 
@@ -60,7 +60,7 @@ export CFLAGS="-D_GNU_SOURCE"
 export LDFLAGS="-static"
 # TODO: indirection via deps directory/symlink
 cat >>.config <<EOF
-CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux-qemu-guest.68b61594f2c1eb1505a3822228c0204ba45da2e41a696ee7c39ad4e15dc8a342"
+CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux-qemu-guest.1c04cf5b2e76cfbe19debfcb4d99a9858c452a6efc04485a72e1dc71c384418c"
 EOF
 make oldconfig
 cat .config
diff --git a/variants/ccx-x86_64/ca-certificates-wip-donotuse b/variants/ccx-x86_64/ca-certificates-wip-donotuse
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+certdata2pem.10f8c0e8868c52288a8c498f37c834b3b4feb30cad722b6d3744965ab42b3297
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+certdata2pem.f6c2c784b432725b5583fde62be8189bbeec3c412b5dc6a6a331a7c8f847c6f8
 #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:.
 
 
@@ -103,12 +103,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/ccx-utils b/variants/ccx-x86_64/ccx-utils
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+skalibs.a47e9b9b17ff00d9a4992c11aabd7433b94bf76350e76bd86a69ed545862b8e8
-#+s6.ab0c54c542b24a5b8a15009de6962dee7e399a329cf57c6124b323540c68d9b0
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+skalibs.7601d35bdf431e184e2d53a86151d2aa572b0036ca689a2a9c59ee22930563d8
+#+s6.cb95971310601341da2f37ab9ec8992b5f290a2272b3b1383ae3535a31e08791
 #@git:461a9ec198c1e2b9c39a34e21786747dbb8671b4:ccx-utils
 
 
@@ -153,12 +153,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/certdata2pem b/variants/ccx-x86_64/certdata2pem
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
 #@sha256:064f7d41106cd9efa08b9e68cf049f44e3be55666bd2ab96d02c508293b8dce7:certdata2pem.c
 
 
@@ -121,12 +121,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/confz b/variants/ccx-x86_64/confz
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+zsh.7b99d4c89d067b4dbf2b1d80dda11f2d4cf636988ca7037eef5e13ff2aeebb78
-#+pthbs-banginstall.5204681c37f6f2b2fc9191fb2755a1e998f05e7d74a7665b5d3926e53a331c16
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+zsh.d6a0bbc670433d1df6ea77735e63fcd1825782766457dfec5b75fff57ed229a7
+#+pthbs-banginstall.107948011aedc6fdcc44097d706a1c77990cdd8a8c72c0911af91a7b88813221
 #@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz
 
 
@@ -112,12 +112,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
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.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-dosfstools.82766735729433eb0d1bc742540abb0af92ae4b842066d0d756b8944bdfea638
-#+busybox-e2fsprogs.df4d118c75cc1635cb52d3c15e1bc603de9d3d891a81788f84db48de1699f7ef
-#+busybox-iproute2.4c1971d8c98cc94ee3b82b425a0f8df013b7720d924607fcc21632c9f871c565
-#+busybox-iputils.076c2ca8ac141e828d9ebc850641b6798cd6773abeb369d8a93b11c60b73882d
-#+busybox-net-misc.25947c3cfeb357e5e7af36967c3304696e3ec438c9f1f754094a0a97050d89c9
-#+busybox-net-tools.ed5fb79809b146542775f46cde1616f84000bbd627f1980c6d4db7a08fd51106
-#+busybox-traceroute.ce5074fcd0b36c6ce6fad0eddb0f87bbbee721f3d6cb1a8e5c6a4b9aa6bd2622
-#+busybox-wget.a50537704eccdd23746d105408551db3849a3966667f36aa11e8294ffe11e115
-#+busybox-chpst.604a4ac59aa16eb535aeb284e7fce71783892129dba92340865f352a626e0532
-#+busybox-console.3912704751c8ac7dbd8aef1086def399d0057cd46095e114f851c91bde1a259c
-#+busybox-getty.4467f4c6255b8ee3462c53703894360f4221e4b4a5c818764d836eb134355e0a
-#+busybox-i2c-tools.a4c0ad46c9dcfa30227f87e3ebda832f49417684316fa91c12d9f507d09d7388
-#+busybox-linux-extra.48d395f1941956c74f5420ca74da5064d3c913b082bf7f07d2c9d78d3687ebc1
-#+busybox-mtd-utils.35d8cc711ce403d29b8266a5bdb8cd25e2490e87079c95deadd26b3f53ccf460
-#+busybox-shadow.d1773710792709bcf09967920bdea4041e1dddc8d01a018cfd71ff3e778b50d6
-#+busybox-su.90648ac2715b9b85ab120acc65b5ac97f726354d31494fe05f63a1fb7fbbb81a
-#+busybox-util-linux-priv.f5763a3b4dce4895c0e21542c448848b806456f8c4710240059981d8a15c77c0
-#+busybox-logging.3f5e1cc2a8b6894c584f050a719370ed9e415b3ba7403aafb2bb70c3763c1ae9
-#+busybox-cron.bfc04eb7114ade53ae26f3b8ab0e4bf261300b07f5283d5e3cfa01c57150739f
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-login.e25a34f56d0854644ec5e31484fd161848723b25deb2905e6c5587b2a02cd63c
-#+execline.376df17984a16a89974061d5186d4aa7613b8b9d3b2ac25399f03f628ec19bed
-#+s6.ab0c54c542b24a5b8a15009de6962dee7e399a329cf57c6124b323540c68d9b0
-#+ccx-utils.d2d83050e2fbf9670301fa6673055f14b9e575d0c6f983041eaa7335acc40c83
-#+applyuidgid-caps.6d88248e983fbabbbd098a0812977524fccc68c65f5a806950083a50ab272d95
-#+easyseccomp.bd9ebffc04d86b34ac080644bc857b117cd48a84836c03da9840b834f213e22e
-#+mlog.da13da7c97d59cd668e1e7be3582621240cc0eca2679eaabb08b3fb983a049eb
-#+abduco.647257b4fb810fdaf9405d8d27148ec9b6de50eecbd890eba52d97bf464d8f37
-#+nawk.7a27c857311a384a9b2baadca56e2806a399c6f35aa6f36a79bf2fe5b8774d31
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-dosfstools.8f5b1ee38114136cac68bb6f4afae1e07dc56d1b4bc70a1194790781718f3c22
+#+busybox-e2fsprogs.2161e5dbaba77dc468290cd2b337468a51bb66b45800279cec83e6ae539e1383
+#+busybox-iproute2.77bb99af64d279b87e456ef446adb8c6d1fcd82b4a744548985cd4c96ea6462a
+#+busybox-iputils.130cf65c6749d79a78efe5ee862662d29f647609a327e06886c868fefebd352f
+#+busybox-net-misc.b8f85c6672aa212be5c152b32272fd3ec52ce9eca2b08c24ceb9e65ec17a1fd9
+#+busybox-net-tools.e1f372550a56fca9c2f3c7fed774c65bf39551a43d1841303c54168b5de96cf2
+#+busybox-traceroute.d713ce38720b240566caa2ad99f9f4c46a5635ccdab516b005b3c15c28519b57
+#+busybox-wget.c90771f6331074e16a31c2d8bb61c661cd10ae1be8657f5c33f9d2d2ffa26350
+#+busybox-chpst.17dada726c42a5937c7481b53a98ebe3d5a002f9d4192adb2eedee6c16355e82
+#+busybox-console.38bbabc39ee90af57b1aeca68a210ea643acf3d2eb79975e175630c0da2b9fa3
+#+busybox-getty.707a78c7052976fad3c9ca24d2546aaeb9704cd89ce365614de04831c1b687fd
+#+busybox-i2c-tools.e310aff45a96eeca5fa82c88e77b383d5c85616942ffa613e5bc911033b26564
+#+busybox-linux-extra.ba82e9e6e9f1964f6cbb791a9a4f9e9d8b3ce7ecedd94c295c36c8234a19a006
+#+busybox-mtd-utils.477479f60e6c2e5657c84641e34f0665c28c604d2cfc612184fa75fcd40fe326
+#+busybox-shadow.11c79b4faf86969368126c89e34dee72abdddde292f870d38267cf0a2ab37116
+#+busybox-su.82f758f3f28e28635e4308e5328171c1e7089e2564ab6f260bb1f19b4025837a
+#+busybox-util-linux-priv.63bdb15a591612704d66c87da50a109b60be449dcb851789e8550030276a0d99
+#+busybox-logging.cdb603c17dd0d261c341acd290264b329ba98bdc84c7825043e94a9b8097bb08
+#+busybox-cron.38da282721d48a9aa823292b7ce48fe8097ec908fc0ead5c5a6ca17b1d2980e7
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-login.1bc34688dadaf811248c2978f4b2e835bcdb4ed7d9843187975c15f59f70eab1
+#+execline.e2ffbf13ccce17342289f014e7910f9fc0269270b9551aea5fb85046c63762ef
+#+s6.cb95971310601341da2f37ab9ec8992b5f290a2272b3b1383ae3535a31e08791
+#+ccx-utils.a55827cd69b17cb0ef9f7e9297464148979c4ae45a8deaf3d633adba99460c17
+#+applyuidgid-caps.edaf481f34f0db18970bd8c40b883f0ff1cb6a8c98055cdff810bb6c08d2e8b6
+#+easyseccomp.da139fb595bd530dead35e1fd55215ff7efb8e734e39f4143d4fdb7712a20ede
+#+mlog.4d0b86eecfd76f7a916e8591d3f8906fa9b338681b2acfbf8e5cff8f6d6f8fed
+#+abduco.66e7545a2f0a9ebbabc0eac75925239ef75eaa3f8518d08b12e2a75a4e5d8139
+#+nawk.38f6c65ae0a08ab3779373229bd7848e11a1e643789b942fae89da61531b7821
 #@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.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+zsh.7b99d4c89d067b4dbf2b1d80dda11f2d4cf636988ca7037eef5e13ff2aeebb78
-#+pthbs-banginstall.5204681c37f6f2b2fc9191fb2755a1e998f05e7d74a7665b5d3926e53a331c16
-#+execline.376df17984a16a89974061d5186d4aa7613b8b9d3b2ac25399f03f628ec19bed
-#+alpine-keys.ff308491189f1f4a8d3f273225260ba334f4d748a007e2779d0a069e1bff293b
-#+apk-tools.99525c3d85245706b220b86fbbd0b0da0bae0b75f7d03044ca05a438b17e23cb
-#+xbps.f6d5aa22c04dad28fdad2cbbba0c70fbaeac816faca5c98a336e428cf3a1fdc4
-#+container-bin-image.681ac5964d583ca7b5da1b70b8edadf5a19339c4c91a7a642939fd6baa8c2ae6
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+zsh.d6a0bbc670433d1df6ea77735e63fcd1825782766457dfec5b75fff57ed229a7
+#+pthbs-banginstall.107948011aedc6fdcc44097d706a1c77990cdd8a8c72c0911af91a7b88813221
+#+execline.e2ffbf13ccce17342289f014e7910f9fc0269270b9551aea5fb85046c63762ef
+#+alpine-keys.e83ca22eae8bea984446f2f6fd3dc744eb7ac5965bdb3c0edf762fa4c240b759
+#+apk-tools.562f9315d0e5dc860b56d692a416ec56df37d5dc9572bd34130b4b27b5321416
+#+xbps.f86d9b9eef39924a39ef19d54d8a8f598b6891bb6b69983e023a39b1a6c0cb1d
+#+container-bin-image.dc05fefd64d305b0b3a04fc4aa444d7faf885dd1b4761e54b02efc281386099c
 #@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.99525c3d85245706b220b86fbbd0b0da0bae0b75f7d03044ca05a438b17e23cb/command/apk.static' "${dest}/deps/command/"
-ln -sf '/home/ccx/versions/xbps.f6d5aa22c04dad28fdad2cbbba0c70fbaeac816faca5c98a336e428cf3a1fdc4/command/xbps-install.static' "${dest}/deps/command/"
+ln -sf '/home/ccx/versions/apk-tools.562f9315d0e5dc860b56d692a416ec56df37d5dc9572bd34130b4b27b5321416/command/apk.static' "${dest}/deps/command/"
+ln -sf '/home/ccx/versions/xbps.f86d9b9eef39924a39ef19d54d8a8f598b6891bb6b69983e023a39b1a6c0cb1d/command/xbps-install.static' "${dest}/deps/command/"
 
-for f in '/home/ccx/versions/alpine-keys.ff308491189f1f4a8d3f273225260ba334f4d748a007e2779d0a069e1bff293b'/keys/alpine/*/*; do
+for f in '/home/ccx/versions/alpine-keys.e83ca22eae8bea984446f2f6fd3dc744eb7ac5965bdb3c0edf762fa4c240b759'/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.ff308491189f1f4a8d3f273225260ba334f4d74
 done
  
 mkdir -p "${dest}/deps/keys/void"
-for f in '/home/ccx/versions/xbps.f6d5aa22c04dad28fdad2cbbba0c70fbaeac816faca5c98a336e428cf3a1fdc4'/keys/void/*; do
+for f in '/home/ccx/versions/xbps.f86d9b9eef39924a39ef19d54d8a8f598b6891bb6b69983e023a39b1a6c0cb1d'/keys/void/*; do
 	ln -sf "$f" "${dest}/deps/keys/void/"
 done
 
-test -d '/home/ccx/versions/container-bin-image.681ac5964d583ca7b5da1b70b8edadf5a19339c4c91a7a642939fd6baa8c2ae6/container-bin-image'
-test -f '/home/ccx/versions/container-bin-image.681ac5964d583ca7b5da1b70b8edadf5a19339c4c91a7a642939fd6baa8c2ae6/container-bin-image/if'
-ln -sf '/home/ccx/versions/container-bin-image.681ac5964d583ca7b5da1b70b8edadf5a19339c4c91a7a642939fd6baa8c2ae6/container-bin-image' "${dest}/deps/"
+test -d '/home/ccx/versions/container-bin-image.dc05fefd64d305b0b3a04fc4aa444d7faf885dd1b4761e54b02efc281386099c/container-bin-image'
+test -f '/home/ccx/versions/container-bin-image.dc05fefd64d305b0b3a04fc4aa444d7faf885dd1b4761e54b02efc281386099c/container-bin-image/if'
+ln -sf '/home/ccx/versions/container-bin-image.dc05fefd64d305b0b3a04fc4aa444d7faf885dd1b4761e54b02efc281386099c/container-bin-image' "${dest}/deps/"
  
 
 
@@ -154,12 +154,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
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.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-dosfstools.82766735729433eb0d1bc742540abb0af92ae4b842066d0d756b8944bdfea638
-#+busybox-e2fsprogs.df4d118c75cc1635cb52d3c15e1bc603de9d3d891a81788f84db48de1699f7ef
-#+busybox-iproute2.4c1971d8c98cc94ee3b82b425a0f8df013b7720d924607fcc21632c9f871c565
-#+busybox-iputils.076c2ca8ac141e828d9ebc850641b6798cd6773abeb369d8a93b11c60b73882d
-#+busybox-net-misc.25947c3cfeb357e5e7af36967c3304696e3ec438c9f1f754094a0a97050d89c9
-#+busybox-net-tools.ed5fb79809b146542775f46cde1616f84000bbd627f1980c6d4db7a08fd51106
-#+busybox-traceroute.ce5074fcd0b36c6ce6fad0eddb0f87bbbee721f3d6cb1a8e5c6a4b9aa6bd2622
-#+busybox-wget.a50537704eccdd23746d105408551db3849a3966667f36aa11e8294ffe11e115
-#+busybox-chpst.604a4ac59aa16eb535aeb284e7fce71783892129dba92340865f352a626e0532
-#+busybox-console.3912704751c8ac7dbd8aef1086def399d0057cd46095e114f851c91bde1a259c
-#+busybox-getty.4467f4c6255b8ee3462c53703894360f4221e4b4a5c818764d836eb134355e0a
-#+busybox-i2c-tools.a4c0ad46c9dcfa30227f87e3ebda832f49417684316fa91c12d9f507d09d7388
-#+busybox-linux-extra.48d395f1941956c74f5420ca74da5064d3c913b082bf7f07d2c9d78d3687ebc1
-#+busybox-mtd-utils.35d8cc711ce403d29b8266a5bdb8cd25e2490e87079c95deadd26b3f53ccf460
-#+busybox-shadow.d1773710792709bcf09967920bdea4041e1dddc8d01a018cfd71ff3e778b50d6
-#+busybox-su.90648ac2715b9b85ab120acc65b5ac97f726354d31494fe05f63a1fb7fbbb81a
-#+busybox-util-linux-priv.f5763a3b4dce4895c0e21542c448848b806456f8c4710240059981d8a15c77c0
-#+busybox-logging.3f5e1cc2a8b6894c584f050a719370ed9e415b3ba7403aafb2bb70c3763c1ae9
-#+busybox-cron.bfc04eb7114ade53ae26f3b8ab0e4bf261300b07f5283d5e3cfa01c57150739f
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+execline.376df17984a16a89974061d5186d4aa7613b8b9d3b2ac25399f03f628ec19bed
-#+s6.ab0c54c542b24a5b8a15009de6962dee7e399a329cf57c6124b323540c68d9b0
-#+s6-portable-utils.bbda636ba011a5cf8494a0703a67e3ddc63c7f2cb2bfd0f3ed4baa6227a05447
-#+s6-linux-utils.06ab7b8fc116f0cfc4ca0ab68096e4abdce1c2567f6cf996af907c0ad3f4f0f7
-#+zsh.7b99d4c89d067b4dbf2b1d80dda11f2d4cf636988ca7037eef5e13ff2aeebb78
-#+confz.7c2060ef43955de74c52a5369ea0f89c377071b46a20654e0c541dc899f9d3be
-#+containers.1960b32d2a595225b1573f0a13acd172a63b94bb05af999f567c6764c344f793
-#+xbps.f6d5aa22c04dad28fdad2cbbba0c70fbaeac816faca5c98a336e428cf3a1fdc4
-#+zstd.95289201da3b17803fbb968db2c2be675cf214dd1c0490928af1c8d50a3ad3ae
-#+apk-tools.99525c3d85245706b220b86fbbd0b0da0bae0b75f7d03044ca05a438b17e23cb
-#+alpine-keys.ff308491189f1f4a8d3f273225260ba334f4d748a007e2779d0a069e1bff293b
-#+getent.2459e727ee129d5d8c04a9fcc4dcb0cb76954700605b6d0e97a57047ee38a3ac
-#+fileset.aba852844dc5d95659391f6d454d1f4ec5745bbc70ea1ec6f22c3c922afe5d93
-#+ccx-utils.d2d83050e2fbf9670301fa6673055f14b9e575d0c6f983041eaa7335acc40c83
-#+easyseccomp.bd9ebffc04d86b34ac080644bc857b117cd48a84836c03da9840b834f213e22e
-#+findutils.7a3e2dc070fc3c657de30df99cf0a25b36c15e645594f8788be464c3f8fef348
-#+nawk.7a27c857311a384a9b2baadca56e2806a399c6f35aa6f36a79bf2fe5b8774d31-
\ No newline at end of file
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-dosfstools.8f5b1ee38114136cac68bb6f4afae1e07dc56d1b4bc70a1194790781718f3c22
+#+busybox-e2fsprogs.2161e5dbaba77dc468290cd2b337468a51bb66b45800279cec83e6ae539e1383
+#+busybox-iproute2.77bb99af64d279b87e456ef446adb8c6d1fcd82b4a744548985cd4c96ea6462a
+#+busybox-iputils.130cf65c6749d79a78efe5ee862662d29f647609a327e06886c868fefebd352f
+#+busybox-net-misc.b8f85c6672aa212be5c152b32272fd3ec52ce9eca2b08c24ceb9e65ec17a1fd9
+#+busybox-net-tools.e1f372550a56fca9c2f3c7fed774c65bf39551a43d1841303c54168b5de96cf2
+#+busybox-traceroute.d713ce38720b240566caa2ad99f9f4c46a5635ccdab516b005b3c15c28519b57
+#+busybox-wget.c90771f6331074e16a31c2d8bb61c661cd10ae1be8657f5c33f9d2d2ffa26350
+#+busybox-chpst.17dada726c42a5937c7481b53a98ebe3d5a002f9d4192adb2eedee6c16355e82
+#+busybox-console.38bbabc39ee90af57b1aeca68a210ea643acf3d2eb79975e175630c0da2b9fa3
+#+busybox-getty.707a78c7052976fad3c9ca24d2546aaeb9704cd89ce365614de04831c1b687fd
+#+busybox-i2c-tools.e310aff45a96eeca5fa82c88e77b383d5c85616942ffa613e5bc911033b26564
+#+busybox-linux-extra.ba82e9e6e9f1964f6cbb791a9a4f9e9d8b3ce7ecedd94c295c36c8234a19a006
+#+busybox-mtd-utils.477479f60e6c2e5657c84641e34f0665c28c604d2cfc612184fa75fcd40fe326
+#+busybox-shadow.11c79b4faf86969368126c89e34dee72abdddde292f870d38267cf0a2ab37116
+#+busybox-su.82f758f3f28e28635e4308e5328171c1e7089e2564ab6f260bb1f19b4025837a
+#+busybox-util-linux-priv.63bdb15a591612704d66c87da50a109b60be449dcb851789e8550030276a0d99
+#+busybox-logging.cdb603c17dd0d261c341acd290264b329ba98bdc84c7825043e94a9b8097bb08
+#+busybox-cron.38da282721d48a9aa823292b7ce48fe8097ec908fc0ead5c5a6ca17b1d2980e7
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+execline.e2ffbf13ccce17342289f014e7910f9fc0269270b9551aea5fb85046c63762ef
+#+s6.cb95971310601341da2f37ab9ec8992b5f290a2272b3b1383ae3535a31e08791
+#+s6-portable-utils.f1d75067377bad2900506a54923c4cebadb763a040ed9699e264c52365c62fc0
+#+s6-linux-utils.f2e3c6d8b41ec40f8bba9b5b256edf58e084205699448906b62a9f8a642281fa
+#+zsh.d6a0bbc670433d1df6ea77735e63fcd1825782766457dfec5b75fff57ed229a7
+#+confz.410ad69682b24dee0242bebd26c82422837f91a7cb7e041f4838d2e35711e8c7
+#+containers.f17f94ccb7f8184c097a441c0c69dfa87464478ee6075d08cbc908171dece923
+#+xbps.f86d9b9eef39924a39ef19d54d8a8f598b6891bb6b69983e023a39b1a6c0cb1d
+#+zstd.bec5ce685f048b9187b82cddc72366c8c7fc9aea6bb800df58752a71cb8ba898
+#+apk-tools.562f9315d0e5dc860b56d692a416ec56df37d5dc9572bd34130b4b27b5321416
+#+alpine-keys.e83ca22eae8bea984446f2f6fd3dc744eb7ac5965bdb3c0edf762fa4c240b759
+#+getent.5e57845ba815b26d6c3e8e279cdebeb2d925b1b4f7c066da8e44b5143efade34
+#+fileset.c2b3679be67e2aed59ebcd3d32e7abcfb4cc335580abc7e3fc9064d263d5986b
+#+ccx-utils.a55827cd69b17cb0ef9f7e9297464148979c4ae45a8deaf3d633adba99460c17
+#+easyseccomp.da139fb595bd530dead35e1fd55215ff7efb8e734e39f4143d4fdb7712a20ede
+#+findutils.0c5ab165515a83b47f2363de1db3091d87eafbc4f0d979f358f6418989f1ff1c
+#+nawk.38f6c65ae0a08ab3779373229bd7848e11a1e643789b942fae89da61531b7821+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/curl b/variants/ccx-x86_64/curl
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+m4.b8e999c51db94861dd245fb124d0ff26c7c1a0319b5031650bfeea527663afa5
-#+libressl.41ff2305967824c8bc4f745d6f725d1b211ca8784157d40c5e069eb915e14d1e
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+m4.35234fd497356ccd3993f8730e6f7097888c37474e62a9b01993b4025ad650f0
+#+libressl.fc2f48e22bfc2eedac1ab7f30203448cf4c4326d27d9884756da5c09983a5b29
 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:.
 
 
@@ -172,12 +172,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -1,96 +1,96 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-dosfstools.82766735729433eb0d1bc742540abb0af92ae4b842066d0d756b8944bdfea638
-#+busybox-e2fsprogs.df4d118c75cc1635cb52d3c15e1bc603de9d3d891a81788f84db48de1699f7ef
-#+busybox-iproute2.4c1971d8c98cc94ee3b82b425a0f8df013b7720d924607fcc21632c9f871c565
-#+busybox-iputils.076c2ca8ac141e828d9ebc850641b6798cd6773abeb369d8a93b11c60b73882d
-#+busybox-net-misc.25947c3cfeb357e5e7af36967c3304696e3ec438c9f1f754094a0a97050d89c9
-#+busybox-net-tools.ed5fb79809b146542775f46cde1616f84000bbd627f1980c6d4db7a08fd51106
-#+busybox-traceroute.ce5074fcd0b36c6ce6fad0eddb0f87bbbee721f3d6cb1a8e5c6a4b9aa6bd2622
-#+busybox-wget.a50537704eccdd23746d105408551db3849a3966667f36aa11e8294ffe11e115
-#+busybox-chpst.604a4ac59aa16eb535aeb284e7fce71783892129dba92340865f352a626e0532
-#+busybox-console.3912704751c8ac7dbd8aef1086def399d0057cd46095e114f851c91bde1a259c
-#+busybox-getty.4467f4c6255b8ee3462c53703894360f4221e4b4a5c818764d836eb134355e0a
-#+busybox-i2c-tools.a4c0ad46c9dcfa30227f87e3ebda832f49417684316fa91c12d9f507d09d7388
-#+busybox-linux-extra.48d395f1941956c74f5420ca74da5064d3c913b082bf7f07d2c9d78d3687ebc1
-#+busybox-mtd-utils.35d8cc711ce403d29b8266a5bdb8cd25e2490e87079c95deadd26b3f53ccf460
-#+busybox-shadow.d1773710792709bcf09967920bdea4041e1dddc8d01a018cfd71ff3e778b50d6
-#+busybox-su.90648ac2715b9b85ab120acc65b5ac97f726354d31494fe05f63a1fb7fbbb81a
-#+busybox-util-linux-priv.f5763a3b4dce4895c0e21542c448848b806456f8c4710240059981d8a15c77c0
-#+busybox-logging.3f5e1cc2a8b6894c584f050a719370ed9e415b3ba7403aafb2bb70c3763c1ae9
-#+busybox-cron.bfc04eb7114ade53ae26f3b8ab0e4bf261300b07f5283d5e3cfa01c57150739f
-#+attr.98984f5c39fd7a746e7d945d7d03278d144f2c778913bb62e0bb89d9e7b10c87
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+diffutils.3809ea70683c0d0447e0319ee4a07400139d138539da1644f2b9d755ee669ecd
-#+patch.49cd0df84abbc8dbceadbe048372c8f6a53798e563f3b37ae1949b997f2a29b1
-#+flex.c807deafd5dcf61ab4b56ccc6e344d4534998be335b365a385b15a7a7100132b
-#+bison.8f9a8e6afcc6d49b72dd5a525bb72db0486826be790931f9886b7ea2b18625e7
-#+rsync.0e3d7c531e3d8fa3b583cbbcb88710b34ad72dfafc49fa23cf3fcc7aa43bd155
-#+execline.376df17984a16a89974061d5186d4aa7613b8b9d3b2ac25399f03f628ec19bed
-#+s6.ab0c54c542b24a5b8a15009de6962dee7e399a329cf57c6124b323540c68d9b0
-#+s6-rc.7d1f71680711f4faf6e09a4f30f99f4fe00966ab2d76610b0f7cfbe9635727f6
-#+s6-portable-utils.bbda636ba011a5cf8494a0703a67e3ddc63c7f2cb2bfd0f3ed4baa6227a05447
-#+s6-linux-utils.06ab7b8fc116f0cfc4ca0ab68096e4abdce1c2567f6cf996af907c0ad3f4f0f7
-#+s6-linux-init.7c46cd9db1839a7f63d3c1c299e988f8ed9512c72a8da399427498375b87ddb5
-#+mdevd.fb1c9b400e79fffc5a212ff41cba797a97d73f179dfb2d271e43adfa37f1d736
-#+s6-dns.71e48ca3c840c69047a2e5fedb0a90221129fb03eace405338bd5a233654ffaa
-#+libressl.41ff2305967824c8bc4f745d6f725d1b211ca8784157d40c5e069eb915e14d1e
-#+s6-networking.279d67c48f9d8d76271af99c7c5e1274b4a324f6aad0df53f8cab33abddecb6a
-#+zsh.7b99d4c89d067b4dbf2b1d80dda11f2d4cf636988ca7037eef5e13ff2aeebb78
-#+pthbs-banginstall.5204681c37f6f2b2fc9191fb2755a1e998f05e7d74a7665b5d3926e53a331c16
-#+aat.f7f64d3253bbb353c33b7a1957b4bc44626e1dccf08b93b6236b01b951dbf7a0
-#+confz.7c2060ef43955de74c52a5369ea0f89c377071b46a20654e0c541dc899f9d3be
-#+containers.1960b32d2a595225b1573f0a13acd172a63b94bb05af999f567c6764c344f793
-#+fileset.aba852844dc5d95659391f6d454d1f4ec5745bbc70ea1ec6f22c3c922afe5d93
-#+logincaps.739d410b1b4666beeae28ccff8612b8c48da98f24d6f7940f0a3f919ee3afc2e
-#+snaprep.4695e5b4567d05718ab29801e29092e263534d87a128b32b6f3670591079d202
-#+curl.dac04ccb0022160b1c8505688e963d3b1a2fc8e637d6783c263e07db381d1fa0
-#+git.655b5cbba35586219093f873c345678cbb474b02c9057d10d3d994667ef41b1a
-#+xbps.f6d5aa22c04dad28fdad2cbbba0c70fbaeac816faca5c98a336e428cf3a1fdc4
-#+apk-tools.99525c3d85245706b220b86fbbd0b0da0bae0b75f7d03044ca05a438b17e23cb
-#+getent.2459e727ee129d5d8c04a9fcc4dcb0cb76954700605b6d0e97a57047ee38a3ac
-#+getconf.ccca4783e40a8887c335db92435a7e1da05121f74d07f155957a21e4f79abb75
-#+iconv.dd746237a64560a44192122195d821618fc3c5fc52aba161cf6692bfcc7f5db0
-#+libcap.f7b9e4a8ba271cf8cf9fdd37f118350f1b348b5c3e62b126eb15559af88daba1
-#+applyuidgid-caps.6d88248e983fbabbbd098a0812977524fccc68c65f5a806950083a50ab272d95
-#+ccx-utils.d2d83050e2fbf9670301fa6673055f14b9e575d0c6f983041eaa7335acc40c83
-#+user-env.926c5c38794bdd7b2d90ad40663a5c8c9331168ddd985a55eab231691da50602
-#+strace.62ad38bce9f1a35005c66ea50ea813a3e7a9b2350baca321a7b398d141a47813
-#+mlog.da13da7c97d59cd668e1e7be3582621240cc0eca2679eaabb08b3fb983a049eb
-#+findutils.7a3e2dc070fc3c657de30df99cf0a25b36c15e645594f8788be464c3f8fef348
-#+nawk.7a27c857311a384a9b2baadca56e2806a399c6f35aa6f36a79bf2fe5b8774d31
-#+squashfs-tools.60a1c0daec22d7cadc3eb76f58b80fe11d66918029889f35838d370d5fed311e
-#+mandoc.d837aafee2f13e11f2e54e97dedab43e9b9b8fc21ca02f0eadd8be0cc8270856
-#+tinyssh.7c3bb893d33bbaa9ab9726fab6af134ef0a5f8dc338780c46461e3405956a15e
-#+system-config.d4ffd6bdba59e125b0b326363f48e7477b51a8579693aa7a94a8f322e9c52d8e
-#+system-config-rc.a4d6b68c11b8cebb3359be52ed69f3be7ee530c1e29ba93982083868ac89be32
-#+system-config-scripts.b5f97068b37d530c77ae7381372f5c04eabe3db87dd6347d37b3cb873eddfe43
-#+system-config-init.a40e61907a0dee5d0efcae59570ccb5647c7d28888c40441925b8c2ff5dcdbd4
-#+system-config-zsh.39349a463b5e33dee5e20b0cd975c03f11757effd095a3ca16b5232ea0073326
-#+busybox.d384a8f5c0be30879980f648903b5d88363a4d20ca3f70a2645bab3bec08a635-
\ No newline at end of file
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-dosfstools.8f5b1ee38114136cac68bb6f4afae1e07dc56d1b4bc70a1194790781718f3c22
+#+busybox-e2fsprogs.2161e5dbaba77dc468290cd2b337468a51bb66b45800279cec83e6ae539e1383
+#+busybox-iproute2.77bb99af64d279b87e456ef446adb8c6d1fcd82b4a744548985cd4c96ea6462a
+#+busybox-iputils.130cf65c6749d79a78efe5ee862662d29f647609a327e06886c868fefebd352f
+#+busybox-net-misc.b8f85c6672aa212be5c152b32272fd3ec52ce9eca2b08c24ceb9e65ec17a1fd9
+#+busybox-net-tools.e1f372550a56fca9c2f3c7fed774c65bf39551a43d1841303c54168b5de96cf2
+#+busybox-traceroute.d713ce38720b240566caa2ad99f9f4c46a5635ccdab516b005b3c15c28519b57
+#+busybox-wget.c90771f6331074e16a31c2d8bb61c661cd10ae1be8657f5c33f9d2d2ffa26350
+#+busybox-chpst.17dada726c42a5937c7481b53a98ebe3d5a002f9d4192adb2eedee6c16355e82
+#+busybox-console.38bbabc39ee90af57b1aeca68a210ea643acf3d2eb79975e175630c0da2b9fa3
+#+busybox-getty.707a78c7052976fad3c9ca24d2546aaeb9704cd89ce365614de04831c1b687fd
+#+busybox-i2c-tools.e310aff45a96eeca5fa82c88e77b383d5c85616942ffa613e5bc911033b26564
+#+busybox-linux-extra.ba82e9e6e9f1964f6cbb791a9a4f9e9d8b3ce7ecedd94c295c36c8234a19a006
+#+busybox-mtd-utils.477479f60e6c2e5657c84641e34f0665c28c604d2cfc612184fa75fcd40fe326
+#+busybox-shadow.11c79b4faf86969368126c89e34dee72abdddde292f870d38267cf0a2ab37116
+#+busybox-su.82f758f3f28e28635e4308e5328171c1e7089e2564ab6f260bb1f19b4025837a
+#+busybox-util-linux-priv.63bdb15a591612704d66c87da50a109b60be449dcb851789e8550030276a0d99
+#+busybox-logging.cdb603c17dd0d261c341acd290264b329ba98bdc84c7825043e94a9b8097bb08
+#+busybox-cron.38da282721d48a9aa823292b7ce48fe8097ec908fc0ead5c5a6ca17b1d2980e7
+#+attr.80f325beb7a48d84938ce7dacd69f970a84f7422008b6a1a588c39f6c7f271b1
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+diffutils.9f2ad07cc1b8bade131a41a10b953be66739dd9170ec580366178c5ebd98e703
+#+patch.22417d3878fcce24877e5285481ba9b8ed3cb4114f01dd35e02b64f6a2ec245e
+#+flex.26923b9a97577df9eca703d35dfbdd94ecf9052ff5d696d781be46d0c5a7f137
+#+bison.4f1834363af8931677e08af3ec355d17faa0950dbb0840e4d0d5be4a9d86ff4b
+#+rsync.041d08a05c60f42f0c5b149f9b0da89f7adaa58221896bb7eef86983974759cf
+#+execline.e2ffbf13ccce17342289f014e7910f9fc0269270b9551aea5fb85046c63762ef
+#+s6.cb95971310601341da2f37ab9ec8992b5f290a2272b3b1383ae3535a31e08791
+#+s6-rc.6e5bd0c73f355b8231738da584288d41d26bace1a47b49bb59d4bd692c05ab72
+#+s6-portable-utils.f1d75067377bad2900506a54923c4cebadb763a040ed9699e264c52365c62fc0
+#+s6-linux-utils.f2e3c6d8b41ec40f8bba9b5b256edf58e084205699448906b62a9f8a642281fa
+#+s6-linux-init.ef02026af87faaad5a57090083ec9be3cb0804a33a3225e369dfe03f76bf7217
+#+mdevd.f425bcbcada4f99c20101cddc044bc4d6b316745ad2092f812940f78ff0d995b
+#+s6-dns.e6b7fcc396d5cc8b1b81b681cb47339d742457fac2b3f67027af0b14823d3d71
+#+libressl.fc2f48e22bfc2eedac1ab7f30203448cf4c4326d27d9884756da5c09983a5b29
+#+s6-networking.7762ef69f83dcbb1ae50e69c125a0b0d991aa233b5232178829e4c6a3a41520b
+#+zsh.d6a0bbc670433d1df6ea77735e63fcd1825782766457dfec5b75fff57ed229a7
+#+pthbs-banginstall.107948011aedc6fdcc44097d706a1c77990cdd8a8c72c0911af91a7b88813221
+#+aat.097f9629dbaac0913aaae76f4995d516a56af74d2d504f1efd894ccc9c0390f0
+#+confz.410ad69682b24dee0242bebd26c82422837f91a7cb7e041f4838d2e35711e8c7
+#+containers.f17f94ccb7f8184c097a441c0c69dfa87464478ee6075d08cbc908171dece923
+#+fileset.c2b3679be67e2aed59ebcd3d32e7abcfb4cc335580abc7e3fc9064d263d5986b
+#+logincaps.4510f832af1397b428d0820b89fd56222e202449cea2fd9f283cef4774d1ab55
+#+snaprep.c04876ad6a7d1a1b4a3fd15e68cb88d57984295fd10d3e4f677d4b2d2e956e0b
+#+curl.f035fbbbad6f776f9269d35ed4d43adf4cb54e99d7308178625edc076e80898f
+#+git.00cb06db1e323cff420d4f9f6cbf94e06a1df61f5f216090d8332629fe07b424
+#+xbps.f86d9b9eef39924a39ef19d54d8a8f598b6891bb6b69983e023a39b1a6c0cb1d
+#+apk-tools.562f9315d0e5dc860b56d692a416ec56df37d5dc9572bd34130b4b27b5321416
+#+getent.5e57845ba815b26d6c3e8e279cdebeb2d925b1b4f7c066da8e44b5143efade34
+#+getconf.fad953bc55d9544d2fef4ee39f6c7154b3efb90ecd482632234eb0f63a27aa92
+#+iconv.847f40217bbb0c8153e962cf2d3339ac37a018a5d960b5ec65364221431885d2
+#+libcap.ffb7a2e12924697efeb24ea043793ea32e9f206398d98704943f09fb9bc5ae74
+#+applyuidgid-caps.edaf481f34f0db18970bd8c40b883f0ff1cb6a8c98055cdff810bb6c08d2e8b6
+#+ccx-utils.a55827cd69b17cb0ef9f7e9297464148979c4ae45a8deaf3d633adba99460c17
+#+user-env.22a16bb3b5b8ae5a2cee55d25a665409db780fe54cddce9e81d25b3bf65f0357
+#+strace.dce75a24151b9ae3b4df4f9ad397f1aac5014e7a23ea21548996cae7a8669254
+#+mlog.4d0b86eecfd76f7a916e8591d3f8906fa9b338681b2acfbf8e5cff8f6d6f8fed
+#+findutils.0c5ab165515a83b47f2363de1db3091d87eafbc4f0d979f358f6418989f1ff1c
+#+nawk.38f6c65ae0a08ab3779373229bd7848e11a1e643789b942fae89da61531b7821
+#+squashfs-tools.6d31f13220dc6b46e528a883fe2bea4d9027d96d0fd7adc90bab1cb7230b6416
+#+mandoc.a91ececd912f651acc883d29b3cd0409425597f842bdcf3e57510bfa4ab3aee5
+#+tinyssh.84a1f67aad02fc83710752e790d477371102eb0f2cd0da82e9bca68309764edd
+#+system-config.7fdb4d4d79a21773ff9734a7df8bb0ec392289f166c006f2cf7909f21516c137
+#+system-config-rc.fc94897cea38dd560ac29ff627d91987d0b01e9859cc5e1248dd4ae1b2e69018
+#+system-config-scripts.afe77e39e518735c31bc7e4b5f04b6c77ddaab0585e9ec55c13c6a6e47448f11
+#+system-config-init.9a31dd0f1c77948ef22845a2b2431f58efac167f060422b8184f6c331ff48e57
+#+system-config-zsh.4e3cec99755919cb2c629feb9b300f00cb4e3a018b5828b838b49048186f9171
+#+busybox.d82a2b0dc90b1a28b9e75e730a9685854b99e25c20bd67f46afb801a6b0705f9+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/diffutils b/variants/ccx-x86_64/diffutils
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+m4.b8e999c51db94861dd245fb124d0ff26c7c1a0319b5031650bfeea527663afa5
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+m4.35234fd497356ccd3993f8730e6f7097888c37474e62a9b01993b4025ad650f0
 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:.
 
 
@@ -149,12 +149,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/dune b/variants/ccx-x86_64/dune
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+ocaml.6c95877dd652dc715e10ac739106396e8d90cd5b8bb13cc0a3057c9626542e7c
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+ocaml.8738588164a4c5b7e02b735a0c61d4d87f5336e730d4efe1c8040038432c5ff1
 #@untar:-z:sha256:579c738f8ca191ba0a9b22dbe78f1377542442c9827cf4939f8964f09f9edb28:.
 
 
@@ -49,7 +49,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/home/ccx/versions/musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/home/ccx/versions/musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
 			return 0
 			;;
 		(*)
@@ -150,12 +150,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/easyseccomp b/variants/ccx-x86_64/easyseccomp
@@ -1,42 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+m4.b8e999c51db94861dd245fb124d0ff26c7c1a0319b5031650bfeea527663afa5
-#+patch.49cd0df84abbc8dbceadbe048372c8f6a53798e563f3b37ae1949b997f2a29b1
-#+flex.c807deafd5dcf61ab4b56ccc6e344d4534998be335b365a385b15a7a7100132b
-#+bison.8f9a8e6afcc6d49b72dd5a525bb72db0486826be790931f9886b7ea2b18625e7
-#+libseccomp.210ece13a41f2b9aeec73acfef87078048b4e89306c7e990f8ae594fcc21b604
-#+error-standalone.acbc0a55be93c2bce2c0c5c29350855caaef46494bf10bdd3c73eb900a557ea9
-#+argp-standalone.2932411cdfea9d40a7d0f417308f060124fa64979c37993fb9a0a7c7c0b68dc4
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+m4.35234fd497356ccd3993f8730e6f7097888c37474e62a9b01993b4025ad650f0
+#+patch.22417d3878fcce24877e5285481ba9b8ed3cb4114f01dd35e02b64f6a2ec245e
+#+flex.26923b9a97577df9eca703d35dfbdd94ecf9052ff5d696d781be46d0c5a7f137
+#+bison.4f1834363af8931677e08af3ec355d17faa0950dbb0840e4d0d5be4a9d86ff4b
+#+libseccomp.90bf3458d6b00940807d26b1a8ca1930045ab581c143a58cffe71c3b2add4cbf
+#+error-standalone.e790dcdfb04671f12f6f19a81ff1c2b6d5a700c32e637d16b61aee5de679fd64
+#+argp-standalone.ca003ec72d1b626e4a9a66bd2d4b762506128ee3746b1129a4ec36612acd23fa
 #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp
 #@sha256:eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10:easyseccomp_fix_includes.patch
 #@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
@@ -156,12 +156,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/error-standalone b/variants/ccx-x86_64/error-standalone
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
 #@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:.
 
 
@@ -105,12 +105,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/execline b/variants/ccx-x86_64/execline
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+skalibs.a47e9b9b17ff00d9a4992c11aabd7433b94bf76350e76bd86a69ed545862b8e8
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+skalibs.7601d35bdf431e184e2d53a86151d2aa572b0036ca689a2a9c59ee22930563d8
 #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline
 
 
@@ -46,7 +46,7 @@ cd 'execline'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.a47e9b9b17ff00d9a4992c11aabd7433b94bf76350e76bd86a69ed545862b8e8/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.7601d35bdf431e184e2d53a86151d2aa572b0036ca689a2a9c59ee22930563d8/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -115,12 +115,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/execline:bootstrap b/variants/ccx-x86_64/execline:bootstrap
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.902ec66224ca84eb656a9710bb00f926d6cdce3cf854ec75d26be51cb93bc9d5
-#+gnu-make.21e5b69f469d66bea208a7d13ef5b5ac12be0321db44a53f95d1a54f5022bb1d
-#+busybox.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+skalibs.5f85dfa9379847a9b23e6fa968ad2b992a441ed79ce0a6cda3b35e426e6820ff
+#+musl-cross-make.2e3da518bf9f90004096c42152f0d72b04a18cf629858bb25c26c765acbf5280
+#+gnu-make.bfc2dfe04b627342ab19a53cabfd38260491d1bbc0bf92da9f567cd22d7669da
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+skalibs.ad7a1b9cb792bea5fac6ebfa87ff93e5073a1f66107102286488937b4061ce78
 #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline
 
 
@@ -27,7 +27,7 @@ export CFLAGS="-O2 -ggdb"
 	--dynlibdir="${prefix}/library.so" \
 	--libdir="${prefix}/library" \
 	--includedir="${prefix}/include" \
-	--with-sysdeps='/home/ccx/versions/skalibs.5f85dfa9379847a9b23e6fa968ad2b992a441ed79ce0a6cda3b35e426e6820ff/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.ad7a1b9cb792bea5fac6ebfa87ff93e5073a1f66107102286488937b4061ce78/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -87,12 +87,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/fileset b/variants/ccx-x86_64/fileset
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+zsh.7b99d4c89d067b4dbf2b1d80dda11f2d4cf636988ca7037eef5e13ff2aeebb78
-#+pthbs-banginstall.5204681c37f6f2b2fc9191fb2755a1e998f05e7d74a7665b5d3926e53a331c16
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+zsh.d6a0bbc670433d1df6ea77735e63fcd1825782766457dfec5b75fff57ed229a7
+#+pthbs-banginstall.107948011aedc6fdcc44097d706a1c77990cdd8a8c72c0911af91a7b88813221
 #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset
 
 
@@ -114,12 +114,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/findutils b/variants/ccx-x86_64/findutils
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+m4.b8e999c51db94861dd245fb124d0ff26c7c1a0319b5031650bfeea527663afa5
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+m4.35234fd497356ccd3993f8730e6f7097888c37474e62a9b01993b4025ad650f0
 #@untar:-J:sha256:1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5:.
 
 
@@ -158,12 +158,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/flex b/variants/ccx-x86_64/flex
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+m4.b8e999c51db94861dd245fb124d0ff26c7c1a0319b5031650bfeea527663afa5
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+m4.35234fd497356ccd3993f8730e6f7097888c37474e62a9b01993b4025ad650f0
 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
 
 
@@ -153,12 +153,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/getconf b/variants/ccx-x86_64/getconf
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
 #@sha256:d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c:getconf.c
 
 
@@ -119,12 +119,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/getent b/variants/ccx-x86_64/getent
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
 #@sha256:002c1a216f6bed0f816ab1cfebde94a0b127193ef410c36b2190599983e015b8:getent.c
 
 
@@ -119,12 +119,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/git b/variants/ccx-x86_64/git
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+m4.b8e999c51db94861dd245fb124d0ff26c7c1a0319b5031650bfeea527663afa5
-#+libressl.41ff2305967824c8bc4f745d6f725d1b211ca8784157d40c5e069eb915e14d1e
-#+curl.dac04ccb0022160b1c8505688e963d3b1a2fc8e637d6783c263e07db381d1fa0
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+m4.35234fd497356ccd3993f8730e6f7097888c37474e62a9b01993b4025ad650f0
+#+libressl.fc2f48e22bfc2eedac1ab7f30203448cf4c4326d27d9884756da5c09983a5b29
+#+curl.f035fbbbad6f776f9269d35ed4d43adf4cb54e99d7308178625edc076e80898f
 #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:.
 
 
@@ -130,12 +130,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/gnu-make b/variants/ccx-x86_64/gnu-make
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.21e5b69f469d66bea208a7d13ef5b5ac12be0321db44a53f95d1a54f5022bb1d
-#+busybox.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.bfc2dfe04b627342ab19a53cabfd38260491d1bbc0bf92da9f567cd22d7669da
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -119,12 +119,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/gnu-make:bootstrap b/variants/ccx-x86_64/gnu-make:bootstrap
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
 #@pragma:nopath
-#+musl-cross-make.902ec66224ca84eb656a9710bb00f926d6cdce3cf854ec75d26be51cb93bc9d5
+#+musl-cross-make.2e3da518bf9f90004096c42152f0d72b04a18cf629858bb25c26c765acbf5280
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -37,7 +37,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'make-4.4.1'
 
 
-mcm=/home/ccx/versions/musl-cross-make.902ec66224ca84eb656a9710bb00f926d6cdce3cf854ec75d26be51cb93bc9d5
+mcm=/home/ccx/versions/musl-cross-make.2e3da518bf9f90004096c42152f0d72b04a18cf629858bb25c26c765acbf5280
 
 export CC="$mcm/bin/x86_64-linux-musl-gcc"
 export CXX="$mcm/bin/x86_64-linux-musl-g++"
@@ -104,12 +104,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/gperf b/variants/ccx-x86_64/gperf
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+m4.b8e999c51db94861dd245fb124d0ff26c7c1a0319b5031650bfeea527663afa5
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+m4.35234fd497356ccd3993f8730e6f7097888c37474e62a9b01993b4025ad650f0
 #@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:.
 
 
@@ -146,12 +146,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/iconv b/variants/ccx-x86_64/iconv
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
 #@sha256:f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7:iconv.c
 
 
@@ -119,12 +119,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/kbd b/variants/ccx-x86_64/kbd
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+m4.b8e999c51db94861dd245fb124d0ff26c7c1a0319b5031650bfeea527663afa5
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+m4.35234fd497356ccd3993f8730e6f7097888c37474e62a9b01993b4025ad650f0
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 
@@ -152,12 +152,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
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.68b61594f2c1eb1505a3822228c0204ba45da2e41a696ee7c39ad4e15dc8a342
-#+busybox.d384a8f5c0be30879980f648903b5d88363a4d20ca3f70a2645bab3bec08a635-
\ No newline at end of file
+#+linux-qemu-guest.1c04cf5b2e76cfbe19debfcb4d99a9858c452a6efc04485a72e1dc71c384418c
+#+busybox.d82a2b0dc90b1a28b9e75e730a9685854b99e25c20bd67f46afb801a6b0705f9+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/libarchive b/variants/ccx-x86_64/libarchive
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+m4.b8e999c51db94861dd245fb124d0ff26c7c1a0319b5031650bfeea527663afa5
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+m4.35234fd497356ccd3993f8730e6f7097888c37474e62a9b01993b4025ad650f0
 #@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:.
 
 
@@ -151,12 +151,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/libbsd b/variants/ccx-x86_64/libbsd
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+m4.b8e999c51db94861dd245fb124d0ff26c7c1a0319b5031650bfeea527663afa5
-#+libmd.daf90ad18c460d73a076575268c2bf0e097a5948cea82e9edfc819ee9802b022
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+m4.35234fd497356ccd3993f8730e6f7097888c37474e62a9b01993b4025ad650f0
+#+libmd.3469d089475fa72b43bf4cb341c7afa4b7d5d1106fc10f12014edb2b91817027
 #@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:.
 
 
@@ -147,12 +147,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/libcap b/variants/ccx-x86_64/libcap
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+pkgconf-pkg-config.887274589ed9d8851d242e84e26fd90e8e4cec514a8aa1f1044f4d313ef92096
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+pkgconf-pkg-config.4fe10ac5e20e36ea2a64a45fe59107e310ef4c84ebaf98cf5b9670b083150594
 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:.
 
 
@@ -145,12 +145,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/libcap:bootstrap b/variants/ccx-x86_64/libcap:bootstrap
@@ -1,8 +1,8 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.902ec66224ca84eb656a9710bb00f926d6cdce3cf854ec75d26be51cb93bc9d5
-#+gnu-make.21e5b69f469d66bea208a7d13ef5b5ac12be0321db44a53f95d1a54f5022bb1d
-#+busybox.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
+#+musl-cross-make.2e3da518bf9f90004096c42152f0d72b04a18cf629858bb25c26c765acbf5280
+#+gnu-make.bfc2dfe04b627342ab19a53cabfd38260491d1bbc0bf92da9f567cd22d7669da
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:.
 
 
@@ -94,12 +94,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/libcgroup b/variants/ccx-x86_64/libcgroup
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+m4.b8e999c51db94861dd245fb124d0ff26c7c1a0319b5031650bfeea527663afa5
-#+flex.c807deafd5dcf61ab4b56ccc6e344d4534998be335b365a385b15a7a7100132b
-#+bison.8f9a8e6afcc6d49b72dd5a525bb72db0486826be790931f9886b7ea2b18625e7
-#+musl-fts.60e1900cce795c39cf8bc60454f6501681f1a8ae4bb1b7cba7bade4cb0e3429b
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+m4.35234fd497356ccd3993f8730e6f7097888c37474e62a9b01993b4025ad650f0
+#+flex.26923b9a97577df9eca703d35dfbdd94ecf9052ff5d696d781be46d0c5a7f137
+#+bison.4f1834363af8931677e08af3ec355d17faa0950dbb0840e4d0d5be4a9d86ff4b
+#+musl-fts.79a1f662035d5f936349c0b21c6e90f4a0b07072ed307b213c1d10be78d253a0
 #@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:.
 
 
@@ -160,12 +160,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/libelf b/variants/ccx-x86_64/libelf
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+zstd.95289201da3b17803fbb968db2c2be675cf214dd1c0490928af1c8d50a3ad3ae
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+zstd.bec5ce685f048b9187b82cddc72366c8c7fc9aea6bb800df58752a71cb8ba898
 #@git:288355d104ff9930520c0283fe82556c6cc5c16f:libelf
 
 
@@ -124,12 +124,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/libmd b/variants/ccx-x86_64/libmd
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+m4.b8e999c51db94861dd245fb124d0ff26c7c1a0319b5031650bfeea527663afa5
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+m4.35234fd497356ccd3993f8730e6f7097888c37474e62a9b01993b4025ad650f0
 #@untar:-J:sha256:1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332:.
 
 
@@ -147,12 +147,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/libressl b/variants/ccx-x86_64/libressl
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+m4.b8e999c51db94861dd245fb124d0ff26c7c1a0319b5031650bfeea527663afa5
-#+ca-certificates-wip-donotuse.003ed33d28eda48f891fba3624c1d5c6ac0613458f53e75b5c3c25c3ca52c817
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+m4.35234fd497356ccd3993f8730e6f7097888c37474e62a9b01993b4025ad650f0
+#+ca-certificates-wip-donotuse.df68e343cf34ed2ad19ee72ae21d239d909007509d8efb9242c0de3b4bd36fed
 #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c
 #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:.
 
@@ -99,7 +99,7 @@ make DESTDIR="$pthbs_destdir" install
 
 cd ..
 gcc ./c_rehash.c -o c_rehash --static -static -I"$pthbs_destdir/$prefix/include" -L"$pthbs_destdir/$prefix/library" -lssl -lcrypto
-cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.003ed33d28eda48f891fba3624c1d5c6ac0613458f53e75b5c3c25c3ca52c817/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
+cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.df68e343cf34ed2ad19ee72ae21d239d909007509d8efb9242c0de3b4bd36fed/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
@@ -174,12 +174,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/libseccomp b/variants/ccx-x86_64/libseccomp
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+m4.b8e999c51db94861dd245fb124d0ff26c7c1a0319b5031650bfeea527663afa5
-#+pkgconf-pkg-config.887274589ed9d8851d242e84e26fd90e8e4cec514a8aa1f1044f4d313ef92096
-#+gperf.85611c46a9ef1361093160e520ee067a6d05bbb69439eccbf0ad676c185a1eef
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+m4.35234fd497356ccd3993f8730e6f7097888c37474e62a9b01993b4025ad650f0
+#+pkgconf-pkg-config.4fe10ac5e20e36ea2a64a45fe59107e310ef4c84ebaf98cf5b9670b083150594
+#+gperf.0b571e7ad23ae7dc102c61fbec99401ac1069897d49329ae9ffdd168ea035357
 #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:.
 
 
@@ -152,12 +152,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/libunwind b/variants/ccx-x86_64/libunwind
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+m4.b8e999c51db94861dd245fb124d0ff26c7c1a0319b5031650bfeea527663afa5
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+m4.35234fd497356ccd3993f8730e6f7097888c37474e62a9b01993b4025ad650f0
 #@untar:-z:sha256:ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157:.
 
 
@@ -152,12 +152,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/linux b/variants/ccx-x86_64/linux
@@ -1,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-modutils.f2f00ed2486e74a02bfa930daf3227d5dd7eb5ec80e57d37746c6991c6d88d8b
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+findutils.7a3e2dc070fc3c657de30df99cf0a25b36c15e645594f8788be464c3f8fef348
-#+diffutils.3809ea70683c0d0447e0319ee4a07400139d138539da1644f2b9d755ee669ecd
-#+patch.49cd0df84abbc8dbceadbe048372c8f6a53798e563f3b37ae1949b997f2a29b1
-#+flex.c807deafd5dcf61ab4b56ccc6e344d4534998be335b365a385b15a7a7100132b
-#+bison.8f9a8e6afcc6d49b72dd5a525bb72db0486826be790931f9886b7ea2b18625e7
-#+rsync.0e3d7c531e3d8fa3b583cbbcb88710b34ad72dfafc49fa23cf3fcc7aa43bd155
-#+zstd.95289201da3b17803fbb968db2c2be675cf214dd1c0490928af1c8d50a3ad3ae
-#+libelf.121b7a783a0362abe7f61a87d4025937b406cc97a94e9c4ac71dad589506b849
-#+pkgconf-pkg-config.887274589ed9d8851d242e84e26fd90e8e4cec514a8aa1f1044f4d313ef92096
-#+nawk.7a27c857311a384a9b2baadca56e2806a399c6f35aa6f36a79bf2fe5b8774d31
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-modutils.60b05f1ec934093a35bb0ced4d4313a1e46228f046865b1528760488ef6965c7
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+findutils.0c5ab165515a83b47f2363de1db3091d87eafbc4f0d979f358f6418989f1ff1c
+#+diffutils.9f2ad07cc1b8bade131a41a10b953be66739dd9170ec580366178c5ebd98e703
+#+patch.22417d3878fcce24877e5285481ba9b8ed3cb4114f01dd35e02b64f6a2ec245e
+#+flex.26923b9a97577df9eca703d35dfbdd94ecf9052ff5d696d781be46d0c5a7f137
+#+bison.4f1834363af8931677e08af3ec355d17faa0950dbb0840e4d0d5be4a9d86ff4b
+#+rsync.041d08a05c60f42f0c5b149f9b0da89f7adaa58221896bb7eef86983974759cf
+#+zstd.bec5ce685f048b9187b82cddc72366c8c7fc9aea6bb800df58752a71cb8ba898
+#+libelf.bf335d9f8bf702a2c66347602fb1ac4012c10129fabcb86ebd21b3c55af03874
+#+pkgconf-pkg-config.4fe10ac5e20e36ea2a64a45fe59107e310ef4c84ebaf98cf5b9670b083150594
+#+nawk.38f6c65ae0a08ab3779373229bd7848e11a1e643789b942fae89da61531b7821
 #@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:.
 #@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz
 #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config
@@ -150,12 +150,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/linux-qemu-guest b/variants/ccx-x86_64/linux-qemu-guest
@@ -1,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-modutils.f2f00ed2486e74a02bfa930daf3227d5dd7eb5ec80e57d37746c6991c6d88d8b
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+findutils.7a3e2dc070fc3c657de30df99cf0a25b36c15e645594f8788be464c3f8fef348
-#+diffutils.3809ea70683c0d0447e0319ee4a07400139d138539da1644f2b9d755ee669ecd
-#+patch.49cd0df84abbc8dbceadbe048372c8f6a53798e563f3b37ae1949b997f2a29b1
-#+flex.c807deafd5dcf61ab4b56ccc6e344d4534998be335b365a385b15a7a7100132b
-#+bison.8f9a8e6afcc6d49b72dd5a525bb72db0486826be790931f9886b7ea2b18625e7
-#+rsync.0e3d7c531e3d8fa3b583cbbcb88710b34ad72dfafc49fa23cf3fcc7aa43bd155
-#+zstd.95289201da3b17803fbb968db2c2be675cf214dd1c0490928af1c8d50a3ad3ae
-#+libelf.121b7a783a0362abe7f61a87d4025937b406cc97a94e9c4ac71dad589506b849
-#+pkgconf-pkg-config.887274589ed9d8851d242e84e26fd90e8e4cec514a8aa1f1044f4d313ef92096
-#+nawk.7a27c857311a384a9b2baadca56e2806a399c6f35aa6f36a79bf2fe5b8774d31
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-modutils.60b05f1ec934093a35bb0ced4d4313a1e46228f046865b1528760488ef6965c7
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+findutils.0c5ab165515a83b47f2363de1db3091d87eafbc4f0d979f358f6418989f1ff1c
+#+diffutils.9f2ad07cc1b8bade131a41a10b953be66739dd9170ec580366178c5ebd98e703
+#+patch.22417d3878fcce24877e5285481ba9b8ed3cb4114f01dd35e02b64f6a2ec245e
+#+flex.26923b9a97577df9eca703d35dfbdd94ecf9052ff5d696d781be46d0c5a7f137
+#+bison.4f1834363af8931677e08af3ec355d17faa0950dbb0840e4d0d5be4a9d86ff4b
+#+rsync.041d08a05c60f42f0c5b149f9b0da89f7adaa58221896bb7eef86983974759cf
+#+zstd.bec5ce685f048b9187b82cddc72366c8c7fc9aea6bb800df58752a71cb8ba898
+#+libelf.bf335d9f8bf702a2c66347602fb1ac4012c10129fabcb86ebd21b3c55af03874
+#+pkgconf-pkg-config.4fe10ac5e20e36ea2a64a45fe59107e310ef4c84ebaf98cf5b9670b083150594
+#+nawk.38f6c65ae0a08ab3779373229bd7848e11a1e643789b942fae89da61531b7821
 #@untar:-J:sha256:7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764:.
 #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config
 #@sha256:ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417:noobjtool.patch
@@ -148,12 +148,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/lnstools:bootstrap b/variants/ccx-x86_64/lnstools:bootstrap
@@ -1,11 +1,11 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.902ec66224ca84eb656a9710bb00f926d6cdce3cf854ec75d26be51cb93bc9d5
-#+gnu-make.21e5b69f469d66bea208a7d13ef5b5ac12be0321db44a53f95d1a54f5022bb1d
-#+busybox.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+skalibs.5f85dfa9379847a9b23e6fa968ad2b992a441ed79ce0a6cda3b35e426e6820ff
-#+execline.39644ce8b0585775f1c7615f732017ab362ff1c20b14da4dcee84d64c1ac7b39
-#+libcap.88950b4d82fd328b382b7f985838f2364fa86b5759ddb53352cd3dcad184bd31
+#+musl-cross-make.2e3da518bf9f90004096c42152f0d72b04a18cf629858bb25c26c765acbf5280
+#+gnu-make.bfc2dfe04b627342ab19a53cabfd38260491d1bbc0bf92da9f567cd22d7669da
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+skalibs.ad7a1b9cb792bea5fac6ebfa87ff93e5073a1f66107102286488937b4061ce78
+#+execline.3a98c22077c4df12eae84a7cbc2fc63e0138e056b7590f4bfc52ce25cfa75b9b
+#+libcap.e3eeb468876470a4e58d86d80eefc81fad460fa38b893a441e430a115e866177
 #@git:7fbfb934cdaa187a063a4df41498c06c46d4a6a9:lnstools
 
 
@@ -86,12 +86,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/logincaps b/variants/ccx-x86_64/logincaps
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+zsh.7b99d4c89d067b4dbf2b1d80dda11f2d4cf636988ca7037eef5e13ff2aeebb78
-#+pthbs-banginstall.5204681c37f6f2b2fc9191fb2755a1e998f05e7d74a7665b5d3926e53a331c16
-#+execline.376df17984a16a89974061d5186d4aa7613b8b9d3b2ac25399f03f628ec19bed
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+ccx-utils.d2d83050e2fbf9670301fa6673055f14b9e575d0c6f983041eaa7335acc40c83
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+zsh.d6a0bbc670433d1df6ea77735e63fcd1825782766457dfec5b75fff57ed229a7
+#+pthbs-banginstall.107948011aedc6fdcc44097d706a1c77990cdd8a8c72c0911af91a7b88813221
+#+execline.e2ffbf13ccce17342289f014e7910f9fc0269270b9551aea5fb85046c63762ef
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+ccx-utils.a55827cd69b17cb0ef9f7e9297464148979c4ae45a8deaf3d633adba99460c17
 #@git:409db79b3e7e5fc6b73305471d9bbb6ac5c14036:logincaps
 
 
@@ -149,12 +149,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/m4 b/variants/ccx-x86_64/m4
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
 
 
@@ -146,12 +146,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/mandoc b/variants/ccx-x86_64/mandoc
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
 #@untar:-z:sha256:8bf0d570f01e70a6e124884088870cbed7537f36328d512909eb10cd53179d9c:.
 
 
@@ -139,12 +139,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
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.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+zsh.7b99d4c89d067b4dbf2b1d80dda11f2d4cf636988ca7037eef5e13ff2aeebb78
-#+pthbs-banginstall.5204681c37f6f2b2fc9191fb2755a1e998f05e7d74a7665b5d3926e53a331c16
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+zsh.d6a0bbc670433d1df6ea77735e63fcd1825782766457dfec5b75fff57ed229a7
+#+pthbs-banginstall.107948011aedc6fdcc44097d706a1c77990cdd8a8c72c0911af91a7b88813221
 #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts
 
 
@@ -94,12 +94,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/mdevd b/variants/ccx-x86_64/mdevd
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+skalibs.a47e9b9b17ff00d9a4992c11aabd7433b94bf76350e76bd86a69ed545862b8e8
-#+execline.376df17984a16a89974061d5186d4aa7613b8b9d3b2ac25399f03f628ec19bed
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+skalibs.7601d35bdf431e184e2d53a86151d2aa572b0036ca689a2a9c59ee22930563d8
+#+execline.e2ffbf13ccce17342289f014e7910f9fc0269270b9551aea5fb85046c63762ef
 #@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd
 
 
@@ -47,7 +47,7 @@ cd 'mdevd'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.a47e9b9b17ff00d9a4992c11aabd7433b94bf76350e76bd86a69ed545862b8e8/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.7601d35bdf431e184e2d53a86151d2aa572b0036ca689a2a9c59ee22930563d8/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -108,12 +108,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
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.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-dosfstools.82766735729433eb0d1bc742540abb0af92ae4b842066d0d756b8944bdfea638
-#+busybox-e2fsprogs.df4d118c75cc1635cb52d3c15e1bc603de9d3d891a81788f84db48de1699f7ef
-#+busybox-iproute2.4c1971d8c98cc94ee3b82b425a0f8df013b7720d924607fcc21632c9f871c565
-#+busybox-iputils.076c2ca8ac141e828d9ebc850641b6798cd6773abeb369d8a93b11c60b73882d
-#+busybox-net-misc.25947c3cfeb357e5e7af36967c3304696e3ec438c9f1f754094a0a97050d89c9
-#+busybox-net-tools.ed5fb79809b146542775f46cde1616f84000bbd627f1980c6d4db7a08fd51106
-#+busybox-traceroute.ce5074fcd0b36c6ce6fad0eddb0f87bbbee721f3d6cb1a8e5c6a4b9aa6bd2622
-#+busybox-wget.a50537704eccdd23746d105408551db3849a3966667f36aa11e8294ffe11e115
-#+busybox-chpst.604a4ac59aa16eb535aeb284e7fce71783892129dba92340865f352a626e0532
-#+busybox-console.3912704751c8ac7dbd8aef1086def399d0057cd46095e114f851c91bde1a259c
-#+busybox-getty.4467f4c6255b8ee3462c53703894360f4221e4b4a5c818764d836eb134355e0a
-#+busybox-i2c-tools.a4c0ad46c9dcfa30227f87e3ebda832f49417684316fa91c12d9f507d09d7388
-#+busybox-linux-extra.48d395f1941956c74f5420ca74da5064d3c913b082bf7f07d2c9d78d3687ebc1
-#+busybox-mtd-utils.35d8cc711ce403d29b8266a5bdb8cd25e2490e87079c95deadd26b3f53ccf460
-#+busybox-shadow.d1773710792709bcf09967920bdea4041e1dddc8d01a018cfd71ff3e778b50d6
-#+busybox-su.90648ac2715b9b85ab120acc65b5ac97f726354d31494fe05f63a1fb7fbbb81a
-#+busybox-util-linux-priv.f5763a3b4dce4895c0e21542c448848b806456f8c4710240059981d8a15c77c0
-#+busybox-logging.3f5e1cc2a8b6894c584f050a719370ed9e415b3ba7403aafb2bb70c3763c1ae9
-#+busybox-cron.bfc04eb7114ade53ae26f3b8ab0e4bf261300b07f5283d5e3cfa01c57150739f
-#+execline.376df17984a16a89974061d5186d4aa7613b8b9d3b2ac25399f03f628ec19bed
-#+s6.ab0c54c542b24a5b8a15009de6962dee7e399a329cf57c6124b323540c68d9b0
-#+mdev-scripts.9951b3251af1fdc98fc01c8c872ed11f87daf8d73f56e7a7178abe21f6df6a60
-#+mdevd.fb1c9b400e79fffc5a212ff41cba797a97d73f179dfb2d271e43adfa37f1d736
-#+busybox.d384a8f5c0be30879980f648903b5d88363a4d20ca3f70a2645bab3bec08a635-
\ No newline at end of file
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-dosfstools.8f5b1ee38114136cac68bb6f4afae1e07dc56d1b4bc70a1194790781718f3c22
+#+busybox-e2fsprogs.2161e5dbaba77dc468290cd2b337468a51bb66b45800279cec83e6ae539e1383
+#+busybox-iproute2.77bb99af64d279b87e456ef446adb8c6d1fcd82b4a744548985cd4c96ea6462a
+#+busybox-iputils.130cf65c6749d79a78efe5ee862662d29f647609a327e06886c868fefebd352f
+#+busybox-net-misc.b8f85c6672aa212be5c152b32272fd3ec52ce9eca2b08c24ceb9e65ec17a1fd9
+#+busybox-net-tools.e1f372550a56fca9c2f3c7fed774c65bf39551a43d1841303c54168b5de96cf2
+#+busybox-traceroute.d713ce38720b240566caa2ad99f9f4c46a5635ccdab516b005b3c15c28519b57
+#+busybox-wget.c90771f6331074e16a31c2d8bb61c661cd10ae1be8657f5c33f9d2d2ffa26350
+#+busybox-chpst.17dada726c42a5937c7481b53a98ebe3d5a002f9d4192adb2eedee6c16355e82
+#+busybox-console.38bbabc39ee90af57b1aeca68a210ea643acf3d2eb79975e175630c0da2b9fa3
+#+busybox-getty.707a78c7052976fad3c9ca24d2546aaeb9704cd89ce365614de04831c1b687fd
+#+busybox-i2c-tools.e310aff45a96eeca5fa82c88e77b383d5c85616942ffa613e5bc911033b26564
+#+busybox-linux-extra.ba82e9e6e9f1964f6cbb791a9a4f9e9d8b3ce7ecedd94c295c36c8234a19a006
+#+busybox-mtd-utils.477479f60e6c2e5657c84641e34f0665c28c604d2cfc612184fa75fcd40fe326
+#+busybox-shadow.11c79b4faf86969368126c89e34dee72abdddde292f870d38267cf0a2ab37116
+#+busybox-su.82f758f3f28e28635e4308e5328171c1e7089e2564ab6f260bb1f19b4025837a
+#+busybox-util-linux-priv.63bdb15a591612704d66c87da50a109b60be449dcb851789e8550030276a0d99
+#+busybox-logging.cdb603c17dd0d261c341acd290264b329ba98bdc84c7825043e94a9b8097bb08
+#+busybox-cron.38da282721d48a9aa823292b7ce48fe8097ec908fc0ead5c5a6ca17b1d2980e7
+#+execline.e2ffbf13ccce17342289f014e7910f9fc0269270b9551aea5fb85046c63762ef
+#+s6.cb95971310601341da2f37ab9ec8992b5f290a2272b3b1383ae3535a31e08791
+#+mdev-scripts.81bf5abf5f035bcc306c0e307a27b2d2bd41a12fccf76c3132cadad146164e42
+#+mdevd.f425bcbcada4f99c20101cddc044bc4d6b316745ad2092f812940f78ff0d995b
+#+busybox.d82a2b0dc90b1a28b9e75e730a9685854b99e25c20bd67f46afb801a6b0705f9+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/mlog b/variants/ccx-x86_64/mlog
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
 #@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog
 
 
@@ -121,12 +121,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/musl-cross-make b/variants/ccx-x86_64/musl-cross-make
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.902ec66224ca84eb656a9710bb00f926d6cdce3cf854ec75d26be51cb93bc9d5
-#+gnu-make.21e5b69f469d66bea208a7d13ef5b5ac12be0321db44a53f95d1a54f5022bb1d
-#+busybox.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
+#+musl-cross-make.2e3da518bf9f90004096c42152f0d72b04a18cf629858bb25c26c765acbf5280
+#+gnu-make.bfc2dfe04b627342ab19a53cabfd38260491d1bbc0bf92da9f567cd22d7669da
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
 #@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
@@ -95,36 +95,6 @@ BEGIN {
 	x["./bin/x86_64-linux-musl-g++"]=1
 	x["./bin/x86_64-linux-musl-gcc"]=1
 
-	x["./x86_64-linux-musl/include/assert.h"]=1  # standard headers as per C11
-	x["./x86_64-linux-musl/include/complex.h"]=1
-	x["./x86_64-linux-musl/include/ctype.h"]=1
-	x["./x86_64-linux-musl/include/errno.h"]=1
-	x["./x86_64-linux-musl/include/fenv.h"]=1
-	x["./x86_64-linux-musl/include/float.h"]=1
-	x["./x86_64-linux-musl/include/inttypes.h"]=1
-	x["./x86_64-linux-musl/include/iso646.h"]=1
-	x["./x86_64-linux-musl/include/limits.h"]=1
-	x["./x86_64-linux-musl/include/locale.h"]=1
-	x["./x86_64-linux-musl/include/math.h"]=1
-	x["./x86_64-linux-musl/include/setjmp.h"]=1
-	x["./x86_64-linux-musl/include/signal.h"]=1
-	x["./x86_64-linux-musl/include/stdalign.h"]=1
-	x["./x86_64-linux-musl/include/stdarg.h"]=1
-	# x["./x86_64-linux-musl/include/stdatomic.h"]=1  # in ./lib/gcc/...
-	x["./x86_64-linux-musl/include/stdbool.h"]=1
-	x["./x86_64-linux-musl/include/stddef.h"]=1
-	x["./x86_64-linux-musl/include/stdint.h"]=1
-	x["./x86_64-linux-musl/include/stdio.h"]=1
-	x["./x86_64-linux-musl/include/stdlib.h"]=1
-	x["./x86_64-linux-musl/include/stdnoreturn.h"]=1
-	x["./x86_64-linux-musl/include/string.h"]=1
-	x["./x86_64-linux-musl/include/tgmath.h"]=1
-	x["./x86_64-linux-musl/include/threads.h"]=1
-	x["./x86_64-linux-musl/include/time.h"]=1
-	x["./x86_64-linux-musl/include/uchar.h"]=1
-	x["./x86_64-linux-musl/include/wchar.h"]=1
-	x["./x86_64-linux-musl/include/wctype.h"]=1
-
 	x["./lib/libgmp.a"]=1
 	x["./lib/libmpc.a"]=1
 	x["./lib/libmpfr.a"]=1
@@ -186,12 +156,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/musl-cross-make:bootstrap-0 b/variants/ccx-x86_64/musl-cross-make:bootstrap-0
@@ -59,36 +59,6 @@ find -type d -o -print | awk -F/ '
 BEGIN {
 	x["./bin/x86_64-linux-musl-g++"]=1
 	x["./bin/x86_64-linux-musl-gcc"]=1
-
-	x["./x86_64-linux-musl/include/assert.h"]=1  # standard headers as per C11
-	x["./x86_64-linux-musl/include/complex.h"]=1
-	x["./x86_64-linux-musl/include/ctype.h"]=1
-	x["./x86_64-linux-musl/include/errno.h"]=1
-	x["./x86_64-linux-musl/include/fenv.h"]=1
-	x["./x86_64-linux-musl/include/float.h"]=1
-	x["./x86_64-linux-musl/include/inttypes.h"]=1
-	x["./x86_64-linux-musl/include/iso646.h"]=1
-	x["./x86_64-linux-musl/include/limits.h"]=1
-	x["./x86_64-linux-musl/include/locale.h"]=1
-	x["./x86_64-linux-musl/include/math.h"]=1
-	x["./x86_64-linux-musl/include/setjmp.h"]=1
-	x["./x86_64-linux-musl/include/signal.h"]=1
-	x["./x86_64-linux-musl/include/stdalign.h"]=1
-	x["./x86_64-linux-musl/include/stdarg.h"]=1
-	# x["./x86_64-linux-musl/include/stdatomic.h"]=1  # in ./lib/gcc/...
-	x["./x86_64-linux-musl/include/stdbool.h"]=1
-	x["./x86_64-linux-musl/include/stddef.h"]=1
-	x["./x86_64-linux-musl/include/stdint.h"]=1
-	x["./x86_64-linux-musl/include/stdio.h"]=1
-	x["./x86_64-linux-musl/include/stdlib.h"]=1
-	x["./x86_64-linux-musl/include/stdnoreturn.h"]=1
-	x["./x86_64-linux-musl/include/string.h"]=1
-	x["./x86_64-linux-musl/include/tgmath.h"]=1
-	x["./x86_64-linux-musl/include/threads.h"]=1
-	x["./x86_64-linux-musl/include/time.h"]=1
-	x["./x86_64-linux-musl/include/uchar.h"]=1
-	x["./x86_64-linux-musl/include/wchar.h"]=1
-	x["./x86_64-linux-musl/include/wctype.h"]=1
 }
 
 function r1(s) {
@@ -137,12 +107,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/musl-cross-make:bootstrap-1 b/variants/ccx-x86_64/musl-cross-make:bootstrap-1
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
 #@pragma:nopath
-#+musl-cross-make.06d6a2cd55e8362c2de05c7e5b720449916cf8510af9d60d2e80996afb54beab
+#+musl-cross-make.85a936992994fa4a8d8ad83bbd8502f2a124ddd2f1373e2448e41a3de8d5cbb4
 #@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
@@ -21,7 +21,7 @@ prefix=/home/ccx/versions/$pthbs_package
 dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
-bootstrap=/home/ccx/versions/musl-cross-make.06d6a2cd55e8362c2de05c7e5b720449916cf8510af9d60d2e80996afb54beab
+bootstrap=/home/ccx/versions/musl-cross-make.85a936992994fa4a8d8ad83bbd8502f2a124ddd2f1373e2448e41a3de8d5cbb4
 "$bootstrap/bin/x86_64-linux-musl-gcc" --version
 
 cat >musl-cross-make/config.mak <<EOF
@@ -68,36 +68,6 @@ find -type d -o -print | awk -F/ '
 BEGIN {
 	x["./bin/x86_64-linux-musl-g++"]=1
 	x["./bin/x86_64-linux-musl-gcc"]=1
-
-	x["./x86_64-linux-musl/include/assert.h"]=1  # standard headers as per C11
-	x["./x86_64-linux-musl/include/complex.h"]=1
-	x["./x86_64-linux-musl/include/ctype.h"]=1
-	x["./x86_64-linux-musl/include/errno.h"]=1
-	x["./x86_64-linux-musl/include/fenv.h"]=1
-	x["./x86_64-linux-musl/include/float.h"]=1
-	x["./x86_64-linux-musl/include/inttypes.h"]=1
-	x["./x86_64-linux-musl/include/iso646.h"]=1
-	x["./x86_64-linux-musl/include/limits.h"]=1
-	x["./x86_64-linux-musl/include/locale.h"]=1
-	x["./x86_64-linux-musl/include/math.h"]=1
-	x["./x86_64-linux-musl/include/setjmp.h"]=1
-	x["./x86_64-linux-musl/include/signal.h"]=1
-	x["./x86_64-linux-musl/include/stdalign.h"]=1
-	x["./x86_64-linux-musl/include/stdarg.h"]=1
-	# x["./x86_64-linux-musl/include/stdatomic.h"]=1  # in ./lib/gcc/...
-	x["./x86_64-linux-musl/include/stdbool.h"]=1
-	x["./x86_64-linux-musl/include/stddef.h"]=1
-	x["./x86_64-linux-musl/include/stdint.h"]=1
-	x["./x86_64-linux-musl/include/stdio.h"]=1
-	x["./x86_64-linux-musl/include/stdlib.h"]=1
-	x["./x86_64-linux-musl/include/stdnoreturn.h"]=1
-	x["./x86_64-linux-musl/include/string.h"]=1
-	x["./x86_64-linux-musl/include/tgmath.h"]=1
-	x["./x86_64-linux-musl/include/threads.h"]=1
-	x["./x86_64-linux-musl/include/time.h"]=1
-	x["./x86_64-linux-musl/include/uchar.h"]=1
-	x["./x86_64-linux-musl/include/wchar.h"]=1
-	x["./x86_64-linux-musl/include/wctype.h"]=1
 }
 
 function r1(s) {
@@ -146,12 +116,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/musl-fts b/variants/ccx-x86_64/musl-fts
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
 #@untar:-z:sha256:49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6:.
 
 
@@ -118,12 +118,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/nawk b/variants/ccx-x86_64/nawk
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+bison.8f9a8e6afcc6d49b72dd5a525bb72db0486826be790931f9886b7ea2b18625e7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+bison.4f1834363af8931677e08af3ec355d17faa0950dbb0840e4d0d5be4a9d86ff4b
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
 #@untar:-z:sha256:e031b1e1d2b230f276f975bffb923f0ea15f798c839d15a3f26a1a39448e32d7:.
 
 
@@ -97,12 +97,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/netbsd-curses b/variants/ccx-x86_64/netbsd-curses
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
 #@git:51d179dad861640caeb76674b5908ccd79f04fae:netbsd-curses
 
 
@@ -110,12 +110,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/ocaml-astring b/variants/ccx-x86_64/ocaml-astring
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+ocaml.6c95877dd652dc715e10ac739106396e8d90cd5b8bb13cc0a3057c9626542e7c
-#+ocaml-findlib.2957899cdc360d489e0764de0177274873498f4e2ea414f68928b0a9df1700db
-#+ocamlbuild.00f174a924d63448f55a2ddf7d41b2a29997941960f1b4d948aacf929e897c82
-#+opam.94b1e20c9f31acda97cd48ea7bd1bd0e7830f873dfda341fc6fa821c07b65c1d
-#+ocaml-topkg.be338e97e1d7e6c924249997c26913e209ddd71f6a8344ee4793ca44c476c8d4
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+ocaml.8738588164a4c5b7e02b735a0c61d4d87f5336e730d4efe1c8040038432c5ff1
+#+ocaml-findlib.6b23c25cdd5790aa380d9d657ae88078d2120700cd57876435420bd378042e28
+#+ocamlbuild.8eadc5cf98277a2279f64e690718211d2cc0fc541201a5ab0f37528950f902fb
+#+opam.d07873ddbce157dc3a9f52ce6911d612ba40021d5ff137a22230ff825f70c259
+#+ocaml-topkg.09860bba567bc457c91b0af5a3692beafdf2cd72f091c969d2a557c166e787f7
 #@untar:-j:sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa:.
 
 
@@ -116,12 +116,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/ocaml-base b/variants/ccx-x86_64/ocaml-base
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+ocaml.6c95877dd652dc715e10ac739106396e8d90cd5b8bb13cc0a3057c9626542e7c
-#+dune.7f1068eec5b0a405f1821c1e22f52424a1bb0c33e13f0ead999ed646c4ddc119
-#+ocaml_intrinsics_kernel.d21d984bd527c1e6b00ae2be70b25bc58d557da37f8518ad80ffb229adef5e4d
-#+ocaml-sexplib0.38673aed01143dd9b0892cab0ffbe5b73db3bc3cdb83c1856f5357308f50ae16
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+ocaml.8738588164a4c5b7e02b735a0c61d4d87f5336e730d4efe1c8040038432c5ff1
+#+dune.9bdb8020482d2b46df00b4f8b10db6084725949162968bd1640c46504cd952c8
+#+ocaml_intrinsics_kernel.a52d37a1f7cc0bb368df5b2a31bd007a39d43e917b0e57c559da10482bc13a07
+#+ocaml-sexplib0.9d878e46c4aa765d2b95e77a1c4203d9d90a4ea76c07d39d5da86583fba2fbf3
 #@untar:-z:sha256:3f3f64789ab25bb5cb7f5f907dd651dec9cc9440981822fe75df6b94344b7208:.
 
 
@@ -123,12 +123,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/ocaml-bos b/variants/ccx-x86_64/ocaml-bos
@@ -1,45 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+ocaml.6c95877dd652dc715e10ac739106396e8d90cd5b8bb13cc0a3057c9626542e7c
-#+ocaml-findlib.2957899cdc360d489e0764de0177274873498f4e2ea414f68928b0a9df1700db
-#+ocamlbuild.00f174a924d63448f55a2ddf7d41b2a29997941960f1b4d948aacf929e897c82
-#+opam.94b1e20c9f31acda97cd48ea7bd1bd0e7830f873dfda341fc6fa821c07b65c1d
-#+ocaml-topkg.be338e97e1d7e6c924249997c26913e209ddd71f6a8344ee4793ca44c476c8d4
-#+ocaml-astring.bd81243b1b11ec0899d680d6f0e88e28e232eaa2cd8fc8cd673f9ab2d349ecf5
-#+ocaml-fpath.6cf540b8c9bc1973ca2f8660e6b50c46560bd03c7c58c10484d97f7535f3adb0
-#+ocaml-rresult.f4b9211172efa364199e65ddba6062e319ed86bede8fa33685b00c34a5e14722
-#+ocaml-fmt.299857f0e077f9cbf1c76884c1a47e0f2ff647aa45b6269125b670166afc2546
-#+ocaml-logs.da216e68a8c32cf83cd442d360e135234c8fffd2501391c629257dff56bfc0ff
-#+ocaml-mtime.d749ae7dfca25257012d981c4a5f1af50a40f3641ba160bdd278466deffdfc2a
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+ocaml.8738588164a4c5b7e02b735a0c61d4d87f5336e730d4efe1c8040038432c5ff1
+#+ocaml-findlib.6b23c25cdd5790aa380d9d657ae88078d2120700cd57876435420bd378042e28
+#+ocamlbuild.8eadc5cf98277a2279f64e690718211d2cc0fc541201a5ab0f37528950f902fb
+#+opam.d07873ddbce157dc3a9f52ce6911d612ba40021d5ff137a22230ff825f70c259
+#+ocaml-topkg.09860bba567bc457c91b0af5a3692beafdf2cd72f091c969d2a557c166e787f7
+#+ocaml-astring.bab409440fe9eebe0ba7f956f279cff0320517246361606b1ab8ac6162d1d99f
+#+ocaml-fpath.f42961d0b5a637187b967d14ebd28fd4d7014c375f16a97894e0b374487f0d2b
+#+ocaml-rresult.9290177d5c51da1b8f6efaed9523b7d7caef1037a324ab7be68d2d2913df53f3
+#+ocaml-fmt.0f6bb74b776dfccc7eb2b60e6c87dcd2b87dcbc3beadac65a8ac18e332c3637c
+#+ocaml-logs.e31ae068dd6a4ad4d24a4b2e3e586ab68c11a164d68c64faa81030ac19254ea9
+#+ocaml-mtime.0707dbc6bd0aa705a5d8f68f670c18c33dd4aa31787bf72662cf6c56694fa9e8
 #@untar:-j:sha256:d8d62e786b10d697e0457205a8eedeaa27ebcc90f1855f18df190cac2e3d8f37:.
 
 
@@ -122,12 +122,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/ocaml-cmdliner b/variants/ccx-x86_64/ocaml-cmdliner
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+ocaml.6c95877dd652dc715e10ac739106396e8d90cd5b8bb13cc0a3057c9626542e7c
-#+ocaml-findlib.2957899cdc360d489e0764de0177274873498f4e2ea414f68928b0a9df1700db
-#+ocamlbuild.00f174a924d63448f55a2ddf7d41b2a29997941960f1b4d948aacf929e897c82
-#+opam.94b1e20c9f31acda97cd48ea7bd1bd0e7830f873dfda341fc6fa821c07b65c1d
-#+ocaml-topkg.be338e97e1d7e6c924249997c26913e209ddd71f6a8344ee4793ca44c476c8d4
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+ocaml.8738588164a4c5b7e02b735a0c61d4d87f5336e730d4efe1c8040038432c5ff1
+#+ocaml-findlib.6b23c25cdd5790aa380d9d657ae88078d2120700cd57876435420bd378042e28
+#+ocamlbuild.8eadc5cf98277a2279f64e690718211d2cc0fc541201a5ab0f37528950f902fb
+#+opam.d07873ddbce157dc3a9f52ce6911d612ba40021d5ff137a22230ff825f70c259
+#+ocaml-topkg.09860bba567bc457c91b0af5a3692beafdf2cd72f091c969d2a557c166e787f7
 #@untar:-j:sha256:4e547a631c36fbaadff60d3bd7724eb3f83ba274e92fb725950bae7868378582:.
 
 
@@ -116,12 +116,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/ocaml-compiler-libs b/variants/ccx-x86_64/ocaml-compiler-libs
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+ocaml.6c95877dd652dc715e10ac739106396e8d90cd5b8bb13cc0a3057c9626542e7c
-#+dune.7f1068eec5b0a405f1821c1e22f52424a1bb0c33e13f0ead999ed646c4ddc119
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+ocaml.8738588164a4c5b7e02b735a0c61d4d87f5336e730d4efe1c8040038432c5ff1
+#+dune.9bdb8020482d2b46df00b4f8b10db6084725949162968bd1640c46504cd952c8
 #@untar:-z:sha256:9b9644d7351db699e57ddba7c767bb4153e6e988ccf45ead2fb238a3bd75cdc7:.
 
 
@@ -119,12 +119,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/ocaml-cppo b/variants/ccx-x86_64/ocaml-cppo
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+ocaml.6c95877dd652dc715e10ac739106396e8d90cd5b8bb13cc0a3057c9626542e7c
-#+dune.7f1068eec5b0a405f1821c1e22f52424a1bb0c33e13f0ead999ed646c4ddc119
-#+ocamlbuild.00f174a924d63448f55a2ddf7d41b2a29997941960f1b4d948aacf929e897c82
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+ocaml.8738588164a4c5b7e02b735a0c61d4d87f5336e730d4efe1c8040038432c5ff1
+#+dune.9bdb8020482d2b46df00b4f8b10db6084725949162968bd1640c46504cd952c8
+#+ocamlbuild.8eadc5cf98277a2279f64e690718211d2cc0fc541201a5ab0f37528950f902fb
 #@untar:-z:sha256:6e62a8ee0217c9cc38d5860110eb18eb8d89c05c420353d298e1431fe8bac00f:.
 
 
@@ -124,12 +124,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/ocaml-findlib b/variants/ccx-x86_64/ocaml-findlib
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+m4.b8e999c51db94861dd245fb124d0ff26c7c1a0319b5031650bfeea527663afa5
-#+netbsd-curses.35a41707b68506a7daaf2a344859fa859d122997b9bfd58d6f391d9e1df61db7
-#+ocaml.6c95877dd652dc715e10ac739106396e8d90cd5b8bb13cc0a3057c9626542e7c
-#+ocamlbuild.00f174a924d63448f55a2ddf7d41b2a29997941960f1b4d948aacf929e897c82
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+m4.35234fd497356ccd3993f8730e6f7097888c37474e62a9b01993b4025ad650f0
+#+netbsd-curses.81629871857eb22aee7ebf2846f42201dcce7c57944e498ef7c5195afd3a74a6
+#+ocaml.8738588164a4c5b7e02b735a0c61d4d87f5336e730d4efe1c8040038432c5ff1
+#+ocamlbuild.8eadc5cf98277a2279f64e690718211d2cc0fc541201a5ab0f37528950f902fb
 #@untar:-z:sha256:662c910f774e9fee3a19c4e057f380581ab2fc4ee52da4761304ac9c31b8869d:.
 
 
@@ -53,7 +53,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/home/ccx/versions/musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/home/ccx/versions/musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
 			return 0
 			;;
 		(*)
@@ -79,7 +79,7 @@ cd 'findlib-1.9.8'
 make -j1 all opt
 
 # workaround `topfind` getting installed to stdlib directory, this is not configurable
-stdlib="$pthbs_destdir/home/ccx/versions/ocaml.6c95877dd652dc715e10ac739106396e8d90cd5b8bb13cc0a3057c9626542e7c"
+stdlib="$pthbs_destdir/home/ccx/versions/ocaml.8738588164a4c5b7e02b735a0c61d4d87f5336e730d4efe1c8040038432c5ff1"
 mkdir -p "${stdlib%/*}"
 ln -s "$pthbs_package" "$stdlib"
 make install prefix="$pthbs_destdir"
@@ -153,12 +153,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/ocaml-fmt b/variants/ccx-x86_64/ocaml-fmt
@@ -1,40 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+ocaml.6c95877dd652dc715e10ac739106396e8d90cd5b8bb13cc0a3057c9626542e7c
-#+ocaml-findlib.2957899cdc360d489e0764de0177274873498f4e2ea414f68928b0a9df1700db
-#+ocamlbuild.00f174a924d63448f55a2ddf7d41b2a29997941960f1b4d948aacf929e897c82
-#+opam.94b1e20c9f31acda97cd48ea7bd1bd0e7830f873dfda341fc6fa821c07b65c1d
-#+ocaml-topkg.be338e97e1d7e6c924249997c26913e209ddd71f6a8344ee4793ca44c476c8d4
-#+ocaml-cmdliner.2c590506e58d32f44e341b436249450eeaed858b04544c2139a9418f0e67cdfa
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+ocaml.8738588164a4c5b7e02b735a0c61d4d87f5336e730d4efe1c8040038432c5ff1
+#+ocaml-findlib.6b23c25cdd5790aa380d9d657ae88078d2120700cd57876435420bd378042e28
+#+ocamlbuild.8eadc5cf98277a2279f64e690718211d2cc0fc541201a5ab0f37528950f902fb
+#+opam.d07873ddbce157dc3a9f52ce6911d612ba40021d5ff137a22230ff825f70c259
+#+ocaml-topkg.09860bba567bc457c91b0af5a3692beafdf2cd72f091c969d2a557c166e787f7
+#+ocaml-cmdliner.9c4bf2a3c88f92c0c464a8fd7fd0ea465afb621b57b8e641b949b458fa5d2a96
 #@untar:-j:sha256:857cfd47a54b52429cd9b3e2665e44173cd1bd3b435bece7172f984ad5376a1b:.
 
 
@@ -117,12 +117,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/ocaml-fpath b/variants/ccx-x86_64/ocaml-fpath
@@ -1,40 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+ocaml.6c95877dd652dc715e10ac739106396e8d90cd5b8bb13cc0a3057c9626542e7c
-#+ocaml-findlib.2957899cdc360d489e0764de0177274873498f4e2ea414f68928b0a9df1700db
-#+ocamlbuild.00f174a924d63448f55a2ddf7d41b2a29997941960f1b4d948aacf929e897c82
-#+opam.94b1e20c9f31acda97cd48ea7bd1bd0e7830f873dfda341fc6fa821c07b65c1d
-#+ocaml-topkg.be338e97e1d7e6c924249997c26913e209ddd71f6a8344ee4793ca44c476c8d4
-#+ocaml-astring.bd81243b1b11ec0899d680d6f0e88e28e232eaa2cd8fc8cd673f9ab2d349ecf5
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+ocaml.8738588164a4c5b7e02b735a0c61d4d87f5336e730d4efe1c8040038432c5ff1
+#+ocaml-findlib.6b23c25cdd5790aa380d9d657ae88078d2120700cd57876435420bd378042e28
+#+ocamlbuild.8eadc5cf98277a2279f64e690718211d2cc0fc541201a5ab0f37528950f902fb
+#+opam.d07873ddbce157dc3a9f52ce6911d612ba40021d5ff137a22230ff825f70c259
+#+ocaml-topkg.09860bba567bc457c91b0af5a3692beafdf2cd72f091c969d2a557c166e787f7
+#+ocaml-astring.bab409440fe9eebe0ba7f956f279cff0320517246361606b1ab8ac6162d1d99f
 #@untar:-j:sha256:12b08ff192d037d9b6d69e9ca19d1d385184f20b3237c27231e437ac81ace70f:.
 
 
@@ -117,12 +117,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/ocaml-logs b/variants/ccx-x86_64/ocaml-logs
@@ -1,42 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+ocaml.6c95877dd652dc715e10ac739106396e8d90cd5b8bb13cc0a3057c9626542e7c
-#+ocaml-findlib.2957899cdc360d489e0764de0177274873498f4e2ea414f68928b0a9df1700db
-#+ocamlbuild.00f174a924d63448f55a2ddf7d41b2a29997941960f1b4d948aacf929e897c82
-#+opam.94b1e20c9f31acda97cd48ea7bd1bd0e7830f873dfda341fc6fa821c07b65c1d
-#+ocaml-topkg.be338e97e1d7e6c924249997c26913e209ddd71f6a8344ee4793ca44c476c8d4
-#+ocaml-mtime.d749ae7dfca25257012d981c4a5f1af50a40f3641ba160bdd278466deffdfc2a
-#+ocaml-cmdliner.2c590506e58d32f44e341b436249450eeaed858b04544c2139a9418f0e67cdfa
-#+ocaml-fmt.299857f0e077f9cbf1c76884c1a47e0f2ff647aa45b6269125b670166afc2546
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+ocaml.8738588164a4c5b7e02b735a0c61d4d87f5336e730d4efe1c8040038432c5ff1
+#+ocaml-findlib.6b23c25cdd5790aa380d9d657ae88078d2120700cd57876435420bd378042e28
+#+ocamlbuild.8eadc5cf98277a2279f64e690718211d2cc0fc541201a5ab0f37528950f902fb
+#+opam.d07873ddbce157dc3a9f52ce6911d612ba40021d5ff137a22230ff825f70c259
+#+ocaml-topkg.09860bba567bc457c91b0af5a3692beafdf2cd72f091c969d2a557c166e787f7
+#+ocaml-mtime.0707dbc6bd0aa705a5d8f68f670c18c33dd4aa31787bf72662cf6c56694fa9e8
+#+ocaml-cmdliner.9c4bf2a3c88f92c0c464a8fd7fd0ea465afb621b57b8e641b949b458fa5d2a96
+#+ocaml-fmt.0f6bb74b776dfccc7eb2b60e6c87dcd2b87dcbc3beadac65a8ac18e332c3637c
 #@untar:-j:sha256:ee97065ba41ce28f19dea9453c6bec4e0ef26165ad7394c4131ea0c65c0f06d5:.
 
 
@@ -124,12 +124,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/ocaml-lun b/variants/ccx-x86_64/ocaml-lun
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+ocaml.6c95877dd652dc715e10ac739106396e8d90cd5b8bb13cc0a3057c9626542e7c
-#+dune.7f1068eec5b0a405f1821c1e22f52424a1bb0c33e13f0ead999ed646c4ddc119
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+ocaml.8738588164a4c5b7e02b735a0c61d4d87f5336e730d4efe1c8040038432c5ff1
+#+dune.9bdb8020482d2b46df00b4f8b10db6084725949162968bd1640c46504cd952c8
 #@untar:-j:sha256:cca8badff83b470fdcfb1840116f8e8a6f2cb86cde2f44ed28cf26cbf692a793:.
 
 
@@ -122,12 +122,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/ocaml-mtime b/variants/ccx-x86_64/ocaml-mtime
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+ocaml.6c95877dd652dc715e10ac739106396e8d90cd5b8bb13cc0a3057c9626542e7c
-#+ocaml-findlib.2957899cdc360d489e0764de0177274873498f4e2ea414f68928b0a9df1700db
-#+ocamlbuild.00f174a924d63448f55a2ddf7d41b2a29997941960f1b4d948aacf929e897c82
-#+opam.94b1e20c9f31acda97cd48ea7bd1bd0e7830f873dfda341fc6fa821c07b65c1d
-#+ocaml-topkg.be338e97e1d7e6c924249997c26913e209ddd71f6a8344ee4793ca44c476c8d4
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+ocaml.8738588164a4c5b7e02b735a0c61d4d87f5336e730d4efe1c8040038432c5ff1
+#+ocaml-findlib.6b23c25cdd5790aa380d9d657ae88078d2120700cd57876435420bd378042e28
+#+ocamlbuild.8eadc5cf98277a2279f64e690718211d2cc0fc541201a5ab0f37528950f902fb
+#+opam.d07873ddbce157dc3a9f52ce6911d612ba40021d5ff137a22230ff825f70c259
+#+ocaml-topkg.09860bba567bc457c91b0af5a3692beafdf2cd72f091c969d2a557c166e787f7
 #@untar:-j:sha256:097cb2802e3701ead9572e1b483d5a28c6e2f0a39449faaf9b44ad8a89834d88:.
 
 
@@ -116,12 +116,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/ocaml-ppx_derivers b/variants/ccx-x86_64/ocaml-ppx_derivers
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+ocaml.6c95877dd652dc715e10ac739106396e8d90cd5b8bb13cc0a3057c9626542e7c
-#+dune.7f1068eec5b0a405f1821c1e22f52424a1bb0c33e13f0ead999ed646c4ddc119
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+ocaml.8738588164a4c5b7e02b735a0c61d4d87f5336e730d4efe1c8040038432c5ff1
+#+dune.9bdb8020482d2b46df00b4f8b10db6084725949162968bd1640c46504cd952c8
 #@untar:-z:sha256:b6595ee187dea792b31fc54a0e1524ab1e48bc6068d3066c45215a138cc73b95:.
 
 
@@ -124,12 +124,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/ocaml-ppx_deriving b/variants/ccx-x86_64/ocaml-ppx_deriving
@@ -1,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+ocaml.6c95877dd652dc715e10ac739106396e8d90cd5b8bb13cc0a3057c9626542e7c
-#+dune.7f1068eec5b0a405f1821c1e22f52424a1bb0c33e13f0ead999ed646c4ddc119
-#+ocaml-compiler-libs.6db372d56121372c863fbafe52f7e351c31acb6b795110097e373bda8a40e16c
-#+ocaml-cppo.a5d7885bfe73575846e086df275ce1e98e8149325bf2f396f3832ea5a6faf507
-#+ocaml-findlib.2957899cdc360d489e0764de0177274873498f4e2ea414f68928b0a9df1700db
-#+ocaml-ppx_derivers.a54998dc060fce99b7fd793fd171f1a0e739cd31a9ad8d256e6d4796d291d10b
-#+ocaml-ppxlib.d419821552346bc7e944b5f613a538af8211fa2436285da23dfca76bdce89742
-#+ocaml-sexplib0.38673aed01143dd9b0892cab0ffbe5b73db3bc3cdb83c1856f5357308f50ae16
-#+ocaml-stdlib-shims.5fbdfae4276f176c4a54f359c96ba05c9d234ea95f356420e1f159e105b5d56d
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+ocaml.8738588164a4c5b7e02b735a0c61d4d87f5336e730d4efe1c8040038432c5ff1
+#+dune.9bdb8020482d2b46df00b4f8b10db6084725949162968bd1640c46504cd952c8
+#+ocaml-compiler-libs.2b18e67bf5e2a63d856dba93ff4efdc67c8ae8f359e395bc42803ed8c09b2a69
+#+ocaml-cppo.e1e37fdad588832afdac8cc7532b9fe837daa760a5d5493568a50dcdd264ed8a
+#+ocaml-findlib.6b23c25cdd5790aa380d9d657ae88078d2120700cd57876435420bd378042e28
+#+ocaml-ppx_derivers.17da467dcae5be472acfef403cf96ce89d06c0fb19995c327553b48874ef38fe
+#+ocaml-ppxlib.f1f736eca60573b926fa086ff747faa3dc32c2b716155bade116d9c266f4c7fb
+#+ocaml-sexplib0.9d878e46c4aa765d2b95e77a1c4203d9d90a4ea76c07d39d5da86583fba2fbf3
+#+ocaml-stdlib-shims.858f10b36e9a26fd20d17010ed735dfe2ab9ad11424cce039b4596da6c6d7191
 #@untar:-z:sha256:c91d1ea5e15e6928a2f8947dbd135b9f765cc0e2d72be271427981afcd350c24:.
 
 
@@ -126,12 +126,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/ocaml-ppxlib b/variants/ccx-x86_64/ocaml-ppxlib
@@ -1,40 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+ocaml.6c95877dd652dc715e10ac739106396e8d90cd5b8bb13cc0a3057c9626542e7c
-#+dune.7f1068eec5b0a405f1821c1e22f52424a1bb0c33e13f0ead999ed646c4ddc119
-#+ocaml-compiler-libs.6db372d56121372c863fbafe52f7e351c31acb6b795110097e373bda8a40e16c
-#+ocaml-ppx_derivers.a54998dc060fce99b7fd793fd171f1a0e739cd31a9ad8d256e6d4796d291d10b
-#+ocaml-sexplib0.38673aed01143dd9b0892cab0ffbe5b73db3bc3cdb83c1856f5357308f50ae16
-#+ocaml-stdlib-shims.5fbdfae4276f176c4a54f359c96ba05c9d234ea95f356420e1f159e105b5d56d
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+ocaml.8738588164a4c5b7e02b735a0c61d4d87f5336e730d4efe1c8040038432c5ff1
+#+dune.9bdb8020482d2b46df00b4f8b10db6084725949162968bd1640c46504cd952c8
+#+ocaml-compiler-libs.2b18e67bf5e2a63d856dba93ff4efdc67c8ae8f359e395bc42803ed8c09b2a69
+#+ocaml-ppx_derivers.17da467dcae5be472acfef403cf96ce89d06c0fb19995c327553b48874ef38fe
+#+ocaml-sexplib0.9d878e46c4aa765d2b95e77a1c4203d9d90a4ea76c07d39d5da86583fba2fbf3
+#+ocaml-stdlib-shims.858f10b36e9a26fd20d17010ed735dfe2ab9ad11424cce039b4596da6c6d7191
 #@untar:-j:sha256:2e223837e7cecc3bc84a432432c0a72f4e1d5be9165c9c33772f156db85db0b3:.
 
 
@@ -124,12 +124,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/ocaml-rresult b/variants/ccx-x86_64/ocaml-rresult
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+ocaml.6c95877dd652dc715e10ac739106396e8d90cd5b8bb13cc0a3057c9626542e7c
-#+ocaml-findlib.2957899cdc360d489e0764de0177274873498f4e2ea414f68928b0a9df1700db
-#+ocamlbuild.00f174a924d63448f55a2ddf7d41b2a29997941960f1b4d948aacf929e897c82
-#+opam.94b1e20c9f31acda97cd48ea7bd1bd0e7830f873dfda341fc6fa821c07b65c1d
-#+ocaml-topkg.be338e97e1d7e6c924249997c26913e209ddd71f6a8344ee4793ca44c476c8d4
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+ocaml.8738588164a4c5b7e02b735a0c61d4d87f5336e730d4efe1c8040038432c5ff1
+#+ocaml-findlib.6b23c25cdd5790aa380d9d657ae88078d2120700cd57876435420bd378042e28
+#+ocamlbuild.8eadc5cf98277a2279f64e690718211d2cc0fc541201a5ab0f37528950f902fb
+#+opam.d07873ddbce157dc3a9f52ce6911d612ba40021d5ff137a22230ff825f70c259
+#+ocaml-topkg.09860bba567bc457c91b0af5a3692beafdf2cd72f091c969d2a557c166e787f7
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
@@ -116,12 +116,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/ocaml-sexplib0 b/variants/ccx-x86_64/ocaml-sexplib0
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+ocaml.6c95877dd652dc715e10ac739106396e8d90cd5b8bb13cc0a3057c9626542e7c
-#+dune.7f1068eec5b0a405f1821c1e22f52424a1bb0c33e13f0ead999ed646c4ddc119
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+ocaml.8738588164a4c5b7e02b735a0c61d4d87f5336e730d4efe1c8040038432c5ff1
+#+dune.9bdb8020482d2b46df00b4f8b10db6084725949162968bd1640c46504cd952c8
 #@untar:-z:sha256:86dba26468194512f789f2fb709063515a9cb4e5c4461c021c239a369590701d:.
 
 
@@ -119,12 +119,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/ocaml-stdlib-shims b/variants/ccx-x86_64/ocaml-stdlib-shims
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+ocaml.6c95877dd652dc715e10ac739106396e8d90cd5b8bb13cc0a3057c9626542e7c
-#+dune.7f1068eec5b0a405f1821c1e22f52424a1bb0c33e13f0ead999ed646c4ddc119
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+ocaml.8738588164a4c5b7e02b735a0c61d4d87f5336e730d4efe1c8040038432c5ff1
+#+dune.9bdb8020482d2b46df00b4f8b10db6084725949162968bd1640c46504cd952c8
 #@untar:-j:sha256:babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a:.
 
 
@@ -118,12 +118,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/ocaml-topkg b/variants/ccx-x86_64/ocaml-topkg
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+ocaml.6c95877dd652dc715e10ac739106396e8d90cd5b8bb13cc0a3057c9626542e7c
-#+ocaml-findlib.2957899cdc360d489e0764de0177274873498f4e2ea414f68928b0a9df1700db
-#+ocamlbuild.00f174a924d63448f55a2ddf7d41b2a29997941960f1b4d948aacf929e897c82
-#+opam.94b1e20c9f31acda97cd48ea7bd1bd0e7830f873dfda341fc6fa821c07b65c1d
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+ocaml.8738588164a4c5b7e02b735a0c61d4d87f5336e730d4efe1c8040038432c5ff1
+#+ocaml-findlib.6b23c25cdd5790aa380d9d657ae88078d2120700cd57876435420bd378042e28
+#+ocamlbuild.8eadc5cf98277a2279f64e690718211d2cc0fc541201a5ab0f37528950f902fb
+#+opam.d07873ddbce157dc3a9f52ce6911d612ba40021d5ff137a22230ff825f70c259
 #@untar:-j:sha256:452082626e651ac4b1633c2b4ae4cad7abeb1fb6a13046e699f95eec58b5d1c7:.
 
 
@@ -115,12 +115,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
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.6c95877dd652dc715e10ac739106396e8d90cd5b8bb13cc0a3057c9626542e7c
-#+dune.7f1068eec5b0a405f1821c1e22f52424a1bb0c33e13f0ead999ed646c4ddc119
-#+ocamlbuild.00f174a924d63448f55a2ddf7d41b2a29997941960f1b4d948aacf929e897c82
-#+ocaml-base.bf742bf62cac69756568b04c0f3cc0af1b4eb876bea85d6de2eee541f83c1735
-#+opam.94b1e20c9f31acda97cd48ea7bd1bd0e7830f873dfda341fc6fa821c07b65c1d
-#+ocaml-bos.156d1462a66e42654b8a34dca9ec9904e0c82c68e57657eba1e685743460099f
-#+ocaml-lun.e06ea7d120d69b1f912d432dcf20d48b17aea02c6833e08180c7ee677ff21db2
-#+ocaml-ppx_deriving.949b0805b98695b982834c288c6f0bc7fbfe94f559a5dbc9c3e440ff4a95f885-
\ No newline at end of file
+#+ocaml.8738588164a4c5b7e02b735a0c61d4d87f5336e730d4efe1c8040038432c5ff1
+#+dune.9bdb8020482d2b46df00b4f8b10db6084725949162968bd1640c46504cd952c8
+#+ocamlbuild.8eadc5cf98277a2279f64e690718211d2cc0fc541201a5ab0f37528950f902fb
+#+ocaml-base.6639d30d3f651ef573d468754768f47c175e5aaa396c0c4fc3926fa823e94427
+#+opam.d07873ddbce157dc3a9f52ce6911d612ba40021d5ff137a22230ff825f70c259
+#+ocaml-bos.93dbf7fb77fcda96d76224f8fc580f8c41dba751513782db01b9205ed4bfcc6b
+#+ocaml-lun.1326083bccf62672dfac86bc64c1d0612f7dfb1dea692c558c69e7f1f97ffd25
+#+ocaml-ppx_deriving.cd7e7ea61a72d37ca2e5b6968f03132c605c33e570fac7e96996e051b5e4c147+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/ocaml:dynlink b/variants/ccx-x86_64/ocaml:dynlink
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+m4.b8e999c51db94861dd245fb124d0ff26c7c1a0319b5031650bfeea527663afa5
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+m4.35234fd497356ccd3993f8730e6f7097888c37474e62a9b01993b4025ad650f0
 #@untar:-J:sha256:dfaa8a2e11c799bc1765d8bef44911406ee5f4803027190382a939f88c912266:.
 
 
@@ -136,12 +136,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/ocaml_intrinsics_kernel b/variants/ccx-x86_64/ocaml_intrinsics_kernel
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+ocaml.6c95877dd652dc715e10ac739106396e8d90cd5b8bb13cc0a3057c9626542e7c
-#+dune.7f1068eec5b0a405f1821c1e22f52424a1bb0c33e13f0ead999ed646c4ddc119
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+ocaml.8738588164a4c5b7e02b735a0c61d4d87f5336e730d4efe1c8040038432c5ff1
+#+dune.9bdb8020482d2b46df00b4f8b10db6084725949162968bd1640c46504cd952c8
 #@untar:-z:sha256:c988b7769a59749631c3c98ba5edd1d2fe91f5dc380b5e0593c073c92f4bee01:.
 
 
@@ -112,12 +112,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/ocamlbuild b/variants/ccx-x86_64/ocamlbuild
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+m4.b8e999c51db94861dd245fb124d0ff26c7c1a0319b5031650bfeea527663afa5
-#+ocaml.6c95877dd652dc715e10ac739106396e8d90cd5b8bb13cc0a3057c9626542e7c
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+m4.35234fd497356ccd3993f8730e6f7097888c37474e62a9b01993b4025ad650f0
+#+ocaml.8738588164a4c5b7e02b735a0c61d4d87f5336e730d4efe1c8040038432c5ff1
 #@untar:-z:sha256:2ba6857f2991b7f69368e8db818b163d31cf5a367f15f5953bf8f01a77b3d4fc:.
 
 
@@ -51,7 +51,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/home/ccx/versions/musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/home/ccx/versions/musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
 			return 0
 			;;
 		(*)
@@ -75,7 +75,7 @@ make configure \
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
 # workaround ocamlbuild manpage getting installed to stdlib directory
-stdlib="$pthbs_destdir/home/ccx/versions/ocaml.6c95877dd652dc715e10ac739106396e8d90cd5b8bb13cc0a3057c9626542e7c"
+stdlib="$pthbs_destdir/home/ccx/versions/ocaml.8738588164a4c5b7e02b735a0c61d4d87f5336e730d4efe1c8040038432c5ff1"
 mkdir -p "${stdlib%/*}"
 ln -s "$pthbs_package" "$stdlib"
 
@@ -138,12 +138,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/opam b/variants/ccx-x86_64/opam
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+diffutils.3809ea70683c0d0447e0319ee4a07400139d138539da1644f2b9d755ee669ecd
-#+patch.49cd0df84abbc8dbceadbe048372c8f6a53798e563f3b37ae1949b997f2a29b1
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+getconf.ccca4783e40a8887c335db92435a7e1da05121f74d07f155957a21e4f79abb75
-#+ocaml.6c95877dd652dc715e10ac739106396e8d90cd5b8bb13cc0a3057c9626542e7c
-#+dune.7f1068eec5b0a405f1821c1e22f52424a1bb0c33e13f0ead999ed646c4ddc119
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+diffutils.9f2ad07cc1b8bade131a41a10b953be66739dd9170ec580366178c5ebd98e703
+#+patch.22417d3878fcce24877e5285481ba9b8ed3cb4114f01dd35e02b64f6a2ec245e
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+getconf.fad953bc55d9544d2fef4ee39f6c7154b3efb90ecd482632234eb0f63a27aa92
+#+ocaml.8738588164a4c5b7e02b735a0c61d4d87f5336e730d4efe1c8040038432c5ff1
+#+dune.9bdb8020482d2b46df00b4f8b10db6084725949162968bd1640c46504cd952c8
 #@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:.
 
 
@@ -72,7 +72,7 @@ export DUNE_CACHE=disabled
 	--infodir="$prefix/info" \
 	--localedir="$prefix/locale" \
 	--localstatedir='/var/pthbs' \
-	--with-dune='/home/ccx/versions/dune.7f1068eec5b0a405f1821c1e22f52424a1bb0c33e13f0ead999ed646c4ddc119/command/dune' \
+	--with-dune='/home/ccx/versions/dune.9bdb8020482d2b46df00b4f8b10db6084725949162968bd1640c46504cd952c8/command/dune' \
 	--with-mccs \
 	--with-vendored-deps \
 	--enable-static
@@ -143,12 +143,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/patch b/variants/ccx-x86_64/patch
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+m4.b8e999c51db94861dd245fb124d0ff26c7c1a0319b5031650bfeea527663afa5
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+m4.35234fd497356ccd3993f8730e6f7097888c37474e62a9b01993b4025ad650f0
 #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:.
 
 
@@ -147,12 +147,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/pkgconf b/variants/ccx-x86_64/pkgconf
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+m4.b8e999c51db94861dd245fb124d0ff26c7c1a0319b5031650bfeea527663afa5
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+m4.35234fd497356ccd3993f8730e6f7097888c37474e62a9b01993b4025ad650f0
 #@untar:-J:sha256:3a224f2accf091b77a5781316e27b9ee3ba82c083cc2e539e08940b68a44fec5:.
 
 
@@ -152,12 +152,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
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.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+pkgconf.00cc5006a6806ac8ad00407667193b5f16d2e3ba4305e2d5a9bc1d945f1d3c2f
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+pkgconf.56a2a48e7f7ead8e460adabfd774974e284b5ee3fb5b08a0c3b97cfa4553f239
 
 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package"
 cd "$pthbs_destdir/home/ccx/versions/$pthbs_package"
diff --git a/variants/ccx-x86_64/popt b/variants/ccx-x86_64/popt
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+m4.b8e999c51db94861dd245fb124d0ff26c7c1a0319b5031650bfeea527663afa5
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+m4.35234fd497356ccd3993f8730e6f7097888c37474e62a9b01993b4025ad650f0
 #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:.
 
 
@@ -146,12 +146,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
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.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+zsh.7b99d4c89d067b4dbf2b1d80dda11f2d4cf636988ca7037eef5e13ff2aeebb78
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+zsh.d6a0bbc670433d1df6ea77735e63fcd1825782766457dfec5b75fff57ed229a7
 #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall
 
 
@@ -92,12 +92,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/pthbs-sandbox-rootns b/variants/ccx-x86_64/pthbs-sandbox-rootns
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+busybox.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+execline.39644ce8b0585775f1c7615f732017ab362ff1c20b14da4dcee84d64c1ac7b39
-#+lnstools.30c0907dabce74bda561bb3a8564c5ed1075542c6d6bc5be22e8ae4b2c1c25ec
-#+sandbox_rootfs.a182a3fe01040b52965af1683835c371d5b7a15b01542182658dd01c4113b1a7
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+execline.3a98c22077c4df12eae84a7cbc2fc63e0138e056b7590f4bfc52ce25cfa75b9b
+#+lnstools.6285f66b662d1ce2f1795cbb91f501cef987345ffb1a61eb123894026aa0a53a
+#+sandbox_rootfs.17cad6eec2662fb49062a72ef2fe9ebdfcd812492a38f6599d98a0836e5276bd
 #@sha256:b85634a91129f85a5aad5cae51d4084dd7ce62544b5585f0899058576c16451f:abspaths.awk
 #@sha256:df0c24312e4941b1035a6292504fbf569f0f8b81b083835d7df84586decef25c:sandbox-rootns.in
 
diff --git a/variants/ccx-x86_64/rsync b/variants/ccx-x86_64/rsync
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+m4.b8e999c51db94861dd245fb124d0ff26c7c1a0319b5031650bfeea527663afa5
-#+nawk.7a27c857311a384a9b2baadca56e2806a399c6f35aa6f36a79bf2fe5b8774d31
-#+popt.062777f3ea3a3a6600427ebb8ab90df0e173d0f0fbadb4e1379af3670c5dd123
-#+libressl.41ff2305967824c8bc4f745d6f725d1b211ca8784157d40c5e069eb915e14d1e
-#+zstd.95289201da3b17803fbb968db2c2be675cf214dd1c0490928af1c8d50a3ad3ae
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+m4.35234fd497356ccd3993f8730e6f7097888c37474e62a9b01993b4025ad650f0
+#+nawk.38f6c65ae0a08ab3779373229bd7848e11a1e643789b942fae89da61531b7821
+#+popt.44820142e630a8940a5b7d3f1aa187a31a3171732a046597750c1d7e7d6ef80c
+#+libressl.fc2f48e22bfc2eedac1ab7f30203448cf4c4326d27d9884756da5c09983a5b29
+#+zstd.bec5ce685f048b9187b82cddc72366c8c7fc9aea6bb800df58752a71cb8ba898
 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:.
 
 
@@ -156,12 +156,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/s6 b/variants/ccx-x86_64/s6
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+skalibs.a47e9b9b17ff00d9a4992c11aabd7433b94bf76350e76bd86a69ed545862b8e8
-#+execline.376df17984a16a89974061d5186d4aa7613b8b9d3b2ac25399f03f628ec19bed
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+skalibs.7601d35bdf431e184e2d53a86151d2aa572b0036ca689a2a9c59ee22930563d8
+#+execline.e2ffbf13ccce17342289f014e7910f9fc0269270b9551aea5fb85046c63762ef
 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6
 
 
@@ -47,7 +47,7 @@ cd 's6'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.a47e9b9b17ff00d9a4992c11aabd7433b94bf76350e76bd86a69ed545862b8e8/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.7601d35bdf431e184e2d53a86151d2aa572b0036ca689a2a9c59ee22930563d8/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -108,12 +108,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/s6-dns b/variants/ccx-x86_64/s6-dns
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+skalibs.a47e9b9b17ff00d9a4992c11aabd7433b94bf76350e76bd86a69ed545862b8e8
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+skalibs.7601d35bdf431e184e2d53a86151d2aa572b0036ca689a2a9c59ee22930563d8
 #@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns
 
 
@@ -46,7 +46,7 @@ cd 's6-dns'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.a47e9b9b17ff00d9a4992c11aabd7433b94bf76350e76bd86a69ed545862b8e8/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.7601d35bdf431e184e2d53a86151d2aa572b0036ca689a2a9c59ee22930563d8/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -107,12 +107,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/s6-linux-init b/variants/ccx-x86_64/s6-linux-init
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+skalibs.a47e9b9b17ff00d9a4992c11aabd7433b94bf76350e76bd86a69ed545862b8e8
-#+execline.376df17984a16a89974061d5186d4aa7613b8b9d3b2ac25399f03f628ec19bed
-#+s6.ab0c54c542b24a5b8a15009de6962dee7e399a329cf57c6124b323540c68d9b0
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+skalibs.7601d35bdf431e184e2d53a86151d2aa572b0036ca689a2a9c59ee22930563d8
+#+execline.e2ffbf13ccce17342289f014e7910f9fc0269270b9551aea5fb85046c63762ef
+#+s6.cb95971310601341da2f37ab9ec8992b5f290a2272b3b1383ae3535a31e08791
 #@git:b298e515efe16210048e504e3aec89ea1e627b73:s6-linux-init
 
 
@@ -48,7 +48,7 @@ cd 's6-linux-init'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.a47e9b9b17ff00d9a4992c11aabd7433b94bf76350e76bd86a69ed545862b8e8/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.7601d35bdf431e184e2d53a86151d2aa572b0036ca689a2a9c59ee22930563d8/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -109,12 +109,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/s6-linux-utils b/variants/ccx-x86_64/s6-linux-utils
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+skalibs.a47e9b9b17ff00d9a4992c11aabd7433b94bf76350e76bd86a69ed545862b8e8
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+skalibs.7601d35bdf431e184e2d53a86151d2aa572b0036ca689a2a9c59ee22930563d8
 #@git:a9e7acac41a8854546246dd39cb4daee54ead2cb:s6-linux-utils
 
 
@@ -46,7 +46,7 @@ cd 's6-linux-utils'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.a47e9b9b17ff00d9a4992c11aabd7433b94bf76350e76bd86a69ed545862b8e8/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.7601d35bdf431e184e2d53a86151d2aa572b0036ca689a2a9c59ee22930563d8/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -107,12 +107,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/s6-networking b/variants/ccx-x86_64/s6-networking
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+skalibs.a47e9b9b17ff00d9a4992c11aabd7433b94bf76350e76bd86a69ed545862b8e8
-#+execline.376df17984a16a89974061d5186d4aa7613b8b9d3b2ac25399f03f628ec19bed
-#+s6.ab0c54c542b24a5b8a15009de6962dee7e399a329cf57c6124b323540c68d9b0
-#+s6-dns.71e48ca3c840c69047a2e5fedb0a90221129fb03eace405338bd5a233654ffaa
-#+libressl.41ff2305967824c8bc4f745d6f725d1b211ca8784157d40c5e069eb915e14d1e
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+skalibs.7601d35bdf431e184e2d53a86151d2aa572b0036ca689a2a9c59ee22930563d8
+#+execline.e2ffbf13ccce17342289f014e7910f9fc0269270b9551aea5fb85046c63762ef
+#+s6.cb95971310601341da2f37ab9ec8992b5f290a2272b3b1383ae3535a31e08791
+#+s6-dns.e6b7fcc396d5cc8b1b81b681cb47339d742457fac2b3f67027af0b14823d3d71
+#+libressl.fc2f48e22bfc2eedac1ab7f30203448cf4c4326d27d9884756da5c09983a5b29
 #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking
 
 
@@ -50,7 +50,7 @@ cd 's6-networking'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.a47e9b9b17ff00d9a4992c11aabd7433b94bf76350e76bd86a69ed545862b8e8/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.7601d35bdf431e184e2d53a86151d2aa572b0036ca689a2a9c59ee22930563d8/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -116,12 +116,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/s6-portable-utils b/variants/ccx-x86_64/s6-portable-utils
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+skalibs.a47e9b9b17ff00d9a4992c11aabd7433b94bf76350e76bd86a69ed545862b8e8
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+skalibs.7601d35bdf431e184e2d53a86151d2aa572b0036ca689a2a9c59ee22930563d8
 #@git:dc96d8a020e83b16dd7a8bd093bdb00ab2b944c0:s6-portable-utils
 
 
@@ -46,7 +46,7 @@ cd 's6-portable-utils'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.a47e9b9b17ff00d9a4992c11aabd7433b94bf76350e76bd86a69ed545862b8e8/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.7601d35bdf431e184e2d53a86151d2aa572b0036ca689a2a9c59ee22930563d8/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -107,12 +107,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/s6-rc b/variants/ccx-x86_64/s6-rc
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+skalibs.a47e9b9b17ff00d9a4992c11aabd7433b94bf76350e76bd86a69ed545862b8e8
-#+execline.376df17984a16a89974061d5186d4aa7613b8b9d3b2ac25399f03f628ec19bed
-#+s6.ab0c54c542b24a5b8a15009de6962dee7e399a329cf57c6124b323540c68d9b0
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+skalibs.7601d35bdf431e184e2d53a86151d2aa572b0036ca689a2a9c59ee22930563d8
+#+execline.e2ffbf13ccce17342289f014e7910f9fc0269270b9551aea5fb85046c63762ef
+#+s6.cb95971310601341da2f37ab9ec8992b5f290a2272b3b1383ae3535a31e08791
 #@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc
 
 
@@ -48,7 +48,7 @@ cd 's6-rc'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.a47e9b9b17ff00d9a4992c11aabd7433b94bf76350e76bd86a69ed545862b8e8/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.7601d35bdf431e184e2d53a86151d2aa572b0036ca689a2a9c59ee22930563d8/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -109,12 +109,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/sandbox_rootfs b/variants/ccx-x86_64/sandbox_rootfs
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.902ec66224ca84eb656a9710bb00f926d6cdce3cf854ec75d26be51cb93bc9d5
-#+gnu-make.21e5b69f469d66bea208a7d13ef5b5ac12be0321db44a53f95d1a54f5022bb1d
-#+busybox.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
-#+skalibs.5f85dfa9379847a9b23e6fa968ad2b992a441ed79ce0a6cda3b35e426e6820ff
+#+musl-cross-make.2e3da518bf9f90004096c42152f0d72b04a18cf629858bb25c26c765acbf5280
+#+gnu-make.bfc2dfe04b627342ab19a53cabfd38260491d1bbc0bf92da9f567cd22d7669da
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
+#+skalibs.ad7a1b9cb792bea5fac6ebfa87ff93e5073a1f66107102286488937b4061ce78
 #@sha256:8d716caa5ea940bbbb8f68ac0907cea36773c183bd4c1eebad030f6cc7deaec9:argv0exec.c
 
 # - build script start -
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.30c0907dabce74bda561bb3a8564c5ed1075542c6d6bc5be22e8ae4b2c1c25ec
-#+sandbox_rootfs.a182a3fe01040b52965af1683835c371d5b7a15b01542182658dd01c4113b1a7
-#+pthbs-sandbox-rootns.e4999293fa7aa3c7e88209229f5ecff7bf0fe8047907a53045f7eee6c7d782eb-
\ No newline at end of file
+#+lnstools.6285f66b662d1ce2f1795cbb91f501cef987345ffb1a61eb123894026aa0a53a
+#+sandbox_rootfs.17cad6eec2662fb49062a72ef2fe9ebdfcd812492a38f6599d98a0836e5276bd
+#+pthbs-sandbox-rootns.83ac1002838d21f77714ec9fe7a09fe19965c773cce15543b00889a308594b07+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/skalibs b/variants/ccx-x86_64/skalibs
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
 #@git:96b537f42695da1b865588baf591fdfcae76bd41:skalibs
 
 
@@ -109,12 +109,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/skalibs:bootstrap b/variants/ccx-x86_64/skalibs:bootstrap
@@ -1,8 +1,8 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.902ec66224ca84eb656a9710bb00f926d6cdce3cf854ec75d26be51cb93bc9d5
-#+gnu-make.21e5b69f469d66bea208a7d13ef5b5ac12be0321db44a53f95d1a54f5022bb1d
-#+busybox.f04a92e812f5cf790879cd1708a00518ce02bbec00a1e6c7c6dfc04c88163c2f
+#+musl-cross-make.2e3da518bf9f90004096c42152f0d72b04a18cf629858bb25c26c765acbf5280
+#+gnu-make.bfc2dfe04b627342ab19a53cabfd38260491d1bbc0bf92da9f567cd22d7669da
+#+busybox.34b6a55a7b876b89e68c250cf67f5b8c1d8b0efee4b7bd6758cbf6a051464741
 #@git:96b537f42695da1b865588baf591fdfcae76bd41:skalibs
 
 
@@ -82,12 +82,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/snaprep b/variants/ccx-x86_64/snaprep
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+zsh.7b99d4c89d067b4dbf2b1d80dda11f2d4cf636988ca7037eef5e13ff2aeebb78
-#+pthbs-banginstall.5204681c37f6f2b2fc9191fb2755a1e998f05e7d74a7665b5d3926e53a331c16
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+zsh.d6a0bbc670433d1df6ea77735e63fcd1825782766457dfec5b75fff57ed229a7
+#+pthbs-banginstall.107948011aedc6fdcc44097d706a1c77990cdd8a8c72c0911af91a7b88813221
 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep
 
 
@@ -113,12 +113,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/squashfs-tools b/variants/ccx-x86_64/squashfs-tools
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+attr.98984f5c39fd7a746e7d945d7d03278d144f2c778913bb62e0bb89d9e7b10c87
-#+zstd.95289201da3b17803fbb968db2c2be675cf214dd1c0490928af1c8d50a3ad3ae
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+attr.80f325beb7a48d84938ce7dacd69f970a84f7422008b6a1a588c39f6c7f271b1
+#+zstd.bec5ce685f048b9187b82cddc72366c8c7fc9aea6bb800df58752a71cb8ba898
 #@untar:-z:sha256:4672b5c47d9418d3a5ae5b243defc6d9eae8275b9771022247c6a6082c815914:.
 
 
@@ -148,12 +148,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/strace b/variants/ccx-x86_64/strace
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+m4.b8e999c51db94861dd245fb124d0ff26c7c1a0319b5031650bfeea527663afa5
-#+patch.49cd0df84abbc8dbceadbe048372c8f6a53798e563f3b37ae1949b997f2a29b1
-#+libunwind.9064fe1295f4af84eb31843ed45296c094b43735f18f39faace5e45b990db183
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+m4.35234fd497356ccd3993f8730e6f7097888c37474e62a9b01993b4025ad650f0
+#+patch.22417d3878fcce24877e5285481ba9b8ed3cb4114f01dd35e02b64f6a2ec245e
+#+libunwind.39d48dd19cd0b94598e277391ea739a0393ce45dd9e3e10d4450c6848921d00a
 #@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch
 #@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:.
 
@@ -155,12 +155,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
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.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-dosfstools.82766735729433eb0d1bc742540abb0af92ae4b842066d0d756b8944bdfea638
-#+busybox-e2fsprogs.df4d118c75cc1635cb52d3c15e1bc603de9d3d891a81788f84db48de1699f7ef
-#+busybox-iproute2.4c1971d8c98cc94ee3b82b425a0f8df013b7720d924607fcc21632c9f871c565
-#+busybox-iputils.076c2ca8ac141e828d9ebc850641b6798cd6773abeb369d8a93b11c60b73882d
-#+busybox-net-misc.25947c3cfeb357e5e7af36967c3304696e3ec438c9f1f754094a0a97050d89c9
-#+busybox-net-tools.ed5fb79809b146542775f46cde1616f84000bbd627f1980c6d4db7a08fd51106
-#+busybox-traceroute.ce5074fcd0b36c6ce6fad0eddb0f87bbbee721f3d6cb1a8e5c6a4b9aa6bd2622
-#+busybox-wget.a50537704eccdd23746d105408551db3849a3966667f36aa11e8294ffe11e115
-#+busybox-chpst.604a4ac59aa16eb535aeb284e7fce71783892129dba92340865f352a626e0532
-#+busybox-console.3912704751c8ac7dbd8aef1086def399d0057cd46095e114f851c91bde1a259c
-#+busybox-getty.4467f4c6255b8ee3462c53703894360f4221e4b4a5c818764d836eb134355e0a
-#+busybox-i2c-tools.a4c0ad46c9dcfa30227f87e3ebda832f49417684316fa91c12d9f507d09d7388
-#+busybox-linux-extra.48d395f1941956c74f5420ca74da5064d3c913b082bf7f07d2c9d78d3687ebc1
-#+busybox-mtd-utils.35d8cc711ce403d29b8266a5bdb8cd25e2490e87079c95deadd26b3f53ccf460
-#+busybox-shadow.d1773710792709bcf09967920bdea4041e1dddc8d01a018cfd71ff3e778b50d6
-#+busybox-su.90648ac2715b9b85ab120acc65b5ac97f726354d31494fe05f63a1fb7fbbb81a
-#+busybox-util-linux-priv.f5763a3b4dce4895c0e21542c448848b806456f8c4710240059981d8a15c77c0
-#+busybox-logging.3f5e1cc2a8b6894c584f050a719370ed9e415b3ba7403aafb2bb70c3763c1ae9
-#+busybox-cron.bfc04eb7114ade53ae26f3b8ab0e4bf261300b07f5283d5e3cfa01c57150739f
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+nawk.7a27c857311a384a9b2baadca56e2806a399c6f35aa6f36a79bf2fe5b8774d31
-#+diffutils.3809ea70683c0d0447e0319ee4a07400139d138539da1644f2b9d755ee669ecd
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+aat.f7f64d3253bbb353c33b7a1957b4bc44626e1dccf08b93b6236b01b951dbf7a0
-#+fileset.aba852844dc5d95659391f6d454d1f4ec5745bbc70ea1ec6f22c3c922afe5d93
-#+rsync.0e3d7c531e3d8fa3b583cbbcb88710b34ad72dfafc49fa23cf3fcc7aa43bd155
-#+execline.376df17984a16a89974061d5186d4aa7613b8b9d3b2ac25399f03f628ec19bed
-#+kbd.ba742ca57d7d6ba21e19ac70c5aa1d306e8e4a114cf86d6d6ec9ca7debb74506
-#+mdevd.fb1c9b400e79fffc5a212ff41cba797a97d73f179dfb2d271e43adfa37f1d736
-#+s6-linux-utils.06ab7b8fc116f0cfc4ca0ab68096e4abdce1c2567f6cf996af907c0ad3f4f0f7
-#+s6-rc.7d1f71680711f4faf6e09a4f30f99f4fe00966ab2d76610b0f7cfbe9635727f6
-#+s6.ab0c54c542b24a5b8a15009de6962dee7e399a329cf57c6124b323540c68d9b0
-#+zsh.7b99d4c89d067b4dbf2b1d80dda11f2d4cf636988ca7037eef5e13ff2aeebb78
-#+libcgroup.315262da0f740df35a4067692f98de63b7d6a92e133f5decba53def3078e63b1
-#+system-config-scripts.b5f97068b37d530c77ae7381372f5c04eabe3db87dd6347d37b3cb873eddfe43
-#+logincaps.739d410b1b4666beeae28ccff8612b8c48da98f24d6f7940f0a3f919ee3afc2e
-#+busybox.d384a8f5c0be30879980f648903b5d88363a4d20ca3f70a2645bab3bec08a635
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-dosfstools.8f5b1ee38114136cac68bb6f4afae1e07dc56d1b4bc70a1194790781718f3c22
+#+busybox-e2fsprogs.2161e5dbaba77dc468290cd2b337468a51bb66b45800279cec83e6ae539e1383
+#+busybox-iproute2.77bb99af64d279b87e456ef446adb8c6d1fcd82b4a744548985cd4c96ea6462a
+#+busybox-iputils.130cf65c6749d79a78efe5ee862662d29f647609a327e06886c868fefebd352f
+#+busybox-net-misc.b8f85c6672aa212be5c152b32272fd3ec52ce9eca2b08c24ceb9e65ec17a1fd9
+#+busybox-net-tools.e1f372550a56fca9c2f3c7fed774c65bf39551a43d1841303c54168b5de96cf2
+#+busybox-traceroute.d713ce38720b240566caa2ad99f9f4c46a5635ccdab516b005b3c15c28519b57
+#+busybox-wget.c90771f6331074e16a31c2d8bb61c661cd10ae1be8657f5c33f9d2d2ffa26350
+#+busybox-chpst.17dada726c42a5937c7481b53a98ebe3d5a002f9d4192adb2eedee6c16355e82
+#+busybox-console.38bbabc39ee90af57b1aeca68a210ea643acf3d2eb79975e175630c0da2b9fa3
+#+busybox-getty.707a78c7052976fad3c9ca24d2546aaeb9704cd89ce365614de04831c1b687fd
+#+busybox-i2c-tools.e310aff45a96eeca5fa82c88e77b383d5c85616942ffa613e5bc911033b26564
+#+busybox-linux-extra.ba82e9e6e9f1964f6cbb791a9a4f9e9d8b3ce7ecedd94c295c36c8234a19a006
+#+busybox-mtd-utils.477479f60e6c2e5657c84641e34f0665c28c604d2cfc612184fa75fcd40fe326
+#+busybox-shadow.11c79b4faf86969368126c89e34dee72abdddde292f870d38267cf0a2ab37116
+#+busybox-su.82f758f3f28e28635e4308e5328171c1e7089e2564ab6f260bb1f19b4025837a
+#+busybox-util-linux-priv.63bdb15a591612704d66c87da50a109b60be449dcb851789e8550030276a0d99
+#+busybox-logging.cdb603c17dd0d261c341acd290264b329ba98bdc84c7825043e94a9b8097bb08
+#+busybox-cron.38da282721d48a9aa823292b7ce48fe8097ec908fc0ead5c5a6ca17b1d2980e7
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+nawk.38f6c65ae0a08ab3779373229bd7848e11a1e643789b942fae89da61531b7821
+#+diffutils.9f2ad07cc1b8bade131a41a10b953be66739dd9170ec580366178c5ebd98e703
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+aat.097f9629dbaac0913aaae76f4995d516a56af74d2d504f1efd894ccc9c0390f0
+#+fileset.c2b3679be67e2aed59ebcd3d32e7abcfb4cc335580abc7e3fc9064d263d5986b
+#+rsync.041d08a05c60f42f0c5b149f9b0da89f7adaa58221896bb7eef86983974759cf
+#+execline.e2ffbf13ccce17342289f014e7910f9fc0269270b9551aea5fb85046c63762ef
+#+kbd.8008ed70fa905b88212d9b4680501efce621be8cdd3564ced4031051de512339
+#+mdevd.f425bcbcada4f99c20101cddc044bc4d6b316745ad2092f812940f78ff0d995b
+#+s6-linux-utils.f2e3c6d8b41ec40f8bba9b5b256edf58e084205699448906b62a9f8a642281fa
+#+s6-rc.6e5bd0c73f355b8231738da584288d41d26bace1a47b49bb59d4bd692c05ab72
+#+s6.cb95971310601341da2f37ab9ec8992b5f290a2272b3b1383ae3535a31e08791
+#+zsh.d6a0bbc670433d1df6ea77735e63fcd1825782766457dfec5b75fff57ed229a7
+#+libcgroup.504c3d464f8d6cc4fd6d1871b0559950ec577b1c86ce1170e805b93a67eeda8f
+#+system-config-scripts.afe77e39e518735c31bc7e4b5f04b6c77ddaab0585e9ec55c13c6a6e47448f11
+#+logincaps.4510f832af1397b428d0820b89fd56222e202449cea2fd9f283cef4774d1ab55
+#+busybox.d82a2b0dc90b1a28b9e75e730a9685854b99e25c20bd67f46afb801a6b0705f9
 #@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.c8bae81d9aec8d27a45301dbdd042e4d85369f00a3b8090f3509729ce5cb7266' \
-	'pthbs_path_mdevd=/home/ccx/versions/env.951bf5bacc739edd3e502b91892fb1eb6f7643eaf770acd93b434fdd655871ac' \
+	'pthbs_path_containers=/home/ccx/versions/env.0f9035bccadc038e52280ead311216005181a61a4f581b9f6e502c049dc55f1c' \
+	'pthbs_path_mdevd=/home/ccx/versions/env.0a19ba9c1514e2468692ba5549d81194d97cc5e32b0b8670dd6ed5450996a76a' \
 	make -j${JOBS:-1} -l$((1+${JOBS:-1})) all
 
 sort -u build/execfile | while IFS= read exename; do
@@ -176,12 +176,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
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.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-dosfstools.82766735729433eb0d1bc742540abb0af92ae4b842066d0d756b8944bdfea638
-#+busybox-e2fsprogs.df4d118c75cc1635cb52d3c15e1bc603de9d3d891a81788f84db48de1699f7ef
-#+busybox-iproute2.4c1971d8c98cc94ee3b82b425a0f8df013b7720d924607fcc21632c9f871c565
-#+busybox-iputils.076c2ca8ac141e828d9ebc850641b6798cd6773abeb369d8a93b11c60b73882d
-#+busybox-net-misc.25947c3cfeb357e5e7af36967c3304696e3ec438c9f1f754094a0a97050d89c9
-#+busybox-net-tools.ed5fb79809b146542775f46cde1616f84000bbd627f1980c6d4db7a08fd51106
-#+busybox-traceroute.ce5074fcd0b36c6ce6fad0eddb0f87bbbee721f3d6cb1a8e5c6a4b9aa6bd2622
-#+busybox-wget.a50537704eccdd23746d105408551db3849a3966667f36aa11e8294ffe11e115
-#+busybox-chpst.604a4ac59aa16eb535aeb284e7fce71783892129dba92340865f352a626e0532
-#+busybox-console.3912704751c8ac7dbd8aef1086def399d0057cd46095e114f851c91bde1a259c
-#+busybox-getty.4467f4c6255b8ee3462c53703894360f4221e4b4a5c818764d836eb134355e0a
-#+busybox-i2c-tools.a4c0ad46c9dcfa30227f87e3ebda832f49417684316fa91c12d9f507d09d7388
-#+busybox-linux-extra.48d395f1941956c74f5420ca74da5064d3c913b082bf7f07d2c9d78d3687ebc1
-#+busybox-mtd-utils.35d8cc711ce403d29b8266a5bdb8cd25e2490e87079c95deadd26b3f53ccf460
-#+busybox-shadow.d1773710792709bcf09967920bdea4041e1dddc8d01a018cfd71ff3e778b50d6
-#+busybox-su.90648ac2715b9b85ab120acc65b5ac97f726354d31494fe05f63a1fb7fbbb81a
-#+busybox-util-linux-priv.f5763a3b4dce4895c0e21542c448848b806456f8c4710240059981d8a15c77c0
-#+busybox-logging.3f5e1cc2a8b6894c584f050a719370ed9e415b3ba7403aafb2bb70c3763c1ae9
-#+busybox-cron.bfc04eb7114ade53ae26f3b8ab0e4bf261300b07f5283d5e3cfa01c57150739f
-#+s6.ab0c54c542b24a5b8a15009de6962dee7e399a329cf57c6124b323540c68d9b0
-#+s6-rc.7d1f71680711f4faf6e09a4f30f99f4fe00966ab2d76610b0f7cfbe9635727f6
-#+s6-portable-utils.bbda636ba011a5cf8494a0703a67e3ddc63c7f2cb2bfd0f3ed4baa6227a05447
-#+s6-linux-init.7c46cd9db1839a7f63d3c1c299e988f8ed9512c72a8da399427498375b87ddb5
-#+execline.376df17984a16a89974061d5186d4aa7613b8b9d3b2ac25399f03f628ec19bed
-#+system-config-rc.a4d6b68c11b8cebb3359be52ed69f3be7ee530c1e29ba93982083868ac89be32
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-dosfstools.8f5b1ee38114136cac68bb6f4afae1e07dc56d1b4bc70a1194790781718f3c22
+#+busybox-e2fsprogs.2161e5dbaba77dc468290cd2b337468a51bb66b45800279cec83e6ae539e1383
+#+busybox-iproute2.77bb99af64d279b87e456ef446adb8c6d1fcd82b4a744548985cd4c96ea6462a
+#+busybox-iputils.130cf65c6749d79a78efe5ee862662d29f647609a327e06886c868fefebd352f
+#+busybox-net-misc.b8f85c6672aa212be5c152b32272fd3ec52ce9eca2b08c24ceb9e65ec17a1fd9
+#+busybox-net-tools.e1f372550a56fca9c2f3c7fed774c65bf39551a43d1841303c54168b5de96cf2
+#+busybox-traceroute.d713ce38720b240566caa2ad99f9f4c46a5635ccdab516b005b3c15c28519b57
+#+busybox-wget.c90771f6331074e16a31c2d8bb61c661cd10ae1be8657f5c33f9d2d2ffa26350
+#+busybox-chpst.17dada726c42a5937c7481b53a98ebe3d5a002f9d4192adb2eedee6c16355e82
+#+busybox-console.38bbabc39ee90af57b1aeca68a210ea643acf3d2eb79975e175630c0da2b9fa3
+#+busybox-getty.707a78c7052976fad3c9ca24d2546aaeb9704cd89ce365614de04831c1b687fd
+#+busybox-i2c-tools.e310aff45a96eeca5fa82c88e77b383d5c85616942ffa613e5bc911033b26564
+#+busybox-linux-extra.ba82e9e6e9f1964f6cbb791a9a4f9e9d8b3ce7ecedd94c295c36c8234a19a006
+#+busybox-mtd-utils.477479f60e6c2e5657c84641e34f0665c28c604d2cfc612184fa75fcd40fe326
+#+busybox-shadow.11c79b4faf86969368126c89e34dee72abdddde292f870d38267cf0a2ab37116
+#+busybox-su.82f758f3f28e28635e4308e5328171c1e7089e2564ab6f260bb1f19b4025837a
+#+busybox-util-linux-priv.63bdb15a591612704d66c87da50a109b60be449dcb851789e8550030276a0d99
+#+busybox-logging.cdb603c17dd0d261c341acd290264b329ba98bdc84c7825043e94a9b8097bb08
+#+busybox-cron.38da282721d48a9aa823292b7ce48fe8097ec908fc0ead5c5a6ca17b1d2980e7
+#+s6.cb95971310601341da2f37ab9ec8992b5f290a2272b3b1383ae3535a31e08791
+#+s6-rc.6e5bd0c73f355b8231738da584288d41d26bace1a47b49bb59d4bd692c05ab72
+#+s6-portable-utils.f1d75067377bad2900506a54923c4cebadb763a040ed9699e264c52365c62fc0
+#+s6-linux-init.ef02026af87faaad5a57090083ec9be3cb0804a33a3225e369dfe03f76bf7217
+#+execline.e2ffbf13ccce17342289f014e7910f9fc0269270b9551aea5fb85046c63762ef
+#+system-config-rc.fc94897cea38dd560ac29ff627d91987d0b01e9859cc5e1248dd4ae1b2e69018
 
 
 # - build script start -
@@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-s6rcdb=/home/ccx/versions/system-config-rc.a4d6b68c11b8cebb3359be52ed69f3be7ee530c1e29ba93982083868ac89be32/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.fc94897cea38dd560ac29ff627d91987d0b01e9859cc5e1248dd4ae1b2e69018/config/s6-rc-db
 
 # Generate init (${dest} must not exist but parent dir does)
 mkdir -p "$pthbs_destdir//home/ccx/versions"
@@ -219,12 +219,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
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.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+s6-rc.7d1f71680711f4faf6e09a4f30f99f4fe00966ab2d76610b0f7cfbe9635727f6
-#+fileset.aba852844dc5d95659391f6d454d1f4ec5745bbc70ea1ec6f22c3c922afe5d93
-#+system-config.d4ffd6bdba59e125b0b326363f48e7477b51a8579693aa7a94a8f322e9c52d8e
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+s6-rc.6e5bd0c73f355b8231738da584288d41d26bace1a47b49bb59d4bd692c05ab72
+#+fileset.c2b3679be67e2aed59ebcd3d32e7abcfb4cc335580abc7e3fc9064d263d5986b
+#+system-config.7fdb4d4d79a21773ff9734a7df8bb0ec392289f166c006f2cf7909f21516c137
 
 
 # - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-src=/home/ccx/versions/system-config.d4ffd6bdba59e125b0b326363f48e7477b51a8579693aa7a94a8f322e9c52d8e/config/s6-rc-source
+src=/home/ccx/versions/system-config.7fdb4d4d79a21773ff9734a7df8bb0ec392289f166c006f2cf7909f21516c137/config/s6-rc-source
 s6-rc-compile ./s6-rc-db "$src"
 mkdir -p "$dest/config"
 mv -v s6-rc-db "$dest/config/"
@@ -94,12 +94,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
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.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+zsh.7b99d4c89d067b4dbf2b1d80dda11f2d4cf636988ca7037eef5e13ff2aeebb78
-#+pthbs-banginstall.5204681c37f6f2b2fc9191fb2755a1e998f05e7d74a7665b5d3926e53a331c16
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+zsh.d6a0bbc670433d1df6ea77735e63fcd1825782766457dfec5b75fff57ed229a7
+#+pthbs-banginstall.107948011aedc6fdcc44097d706a1c77990cdd8a8c72c0911af91a7b88813221
 #@git:dc793695cc0632a808af9d4415f3b0cf0f4dfba2:system-config-scripts
 
 
@@ -113,12 +113,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
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.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+zsh.7b99d4c89d067b4dbf2b1d80dda11f2d4cf636988ca7037eef5e13ff2aeebb78
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+zsh.d6a0bbc670433d1df6ea77735e63fcd1825782766457dfec5b75fff57ed229a7
 #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh
 
 
@@ -90,12 +90,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/tinyssh b/variants/ccx-x86_64/tinyssh
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
 #@untar:-z:sha256:f3ae622c765db4e0d791ea90a9feba39d7f693ef9cb949a797f7ad6b404a2d61:.
 
 
@@ -128,12 +128,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
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.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+execline.376df17984a16a89974061d5186d4aa7613b8b9d3b2ac25399f03f628ec19bed
-#+pthbs-banginstall.5204681c37f6f2b2fc9191fb2755a1e998f05e7d74a7665b5d3926e53a331c16
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+execline.e2ffbf13ccce17342289f014e7910f9fc0269270b9551aea5fb85046c63762ef
+#+pthbs-banginstall.107948011aedc6fdcc44097d706a1c77990cdd8a8c72c0911af91a7b88813221
 #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env
 
 
@@ -94,12 +94,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment
@@ -1,90 +1,90 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-dosfstools.82766735729433eb0d1bc742540abb0af92ae4b842066d0d756b8944bdfea638
-#+busybox-e2fsprogs.df4d118c75cc1635cb52d3c15e1bc603de9d3d891a81788f84db48de1699f7ef
-#+busybox-iproute2.4c1971d8c98cc94ee3b82b425a0f8df013b7720d924607fcc21632c9f871c565
-#+busybox-iputils.076c2ca8ac141e828d9ebc850641b6798cd6773abeb369d8a93b11c60b73882d
-#+busybox-net-misc.25947c3cfeb357e5e7af36967c3304696e3ec438c9f1f754094a0a97050d89c9
-#+busybox-net-tools.ed5fb79809b146542775f46cde1616f84000bbd627f1980c6d4db7a08fd51106
-#+busybox-traceroute.ce5074fcd0b36c6ce6fad0eddb0f87bbbee721f3d6cb1a8e5c6a4b9aa6bd2622
-#+busybox-wget.a50537704eccdd23746d105408551db3849a3966667f36aa11e8294ffe11e115
-#+busybox-chpst.604a4ac59aa16eb535aeb284e7fce71783892129dba92340865f352a626e0532
-#+busybox-console.3912704751c8ac7dbd8aef1086def399d0057cd46095e114f851c91bde1a259c
-#+busybox-getty.4467f4c6255b8ee3462c53703894360f4221e4b4a5c818764d836eb134355e0a
-#+busybox-i2c-tools.a4c0ad46c9dcfa30227f87e3ebda832f49417684316fa91c12d9f507d09d7388
-#+busybox-linux-extra.48d395f1941956c74f5420ca74da5064d3c913b082bf7f07d2c9d78d3687ebc1
-#+busybox-mtd-utils.35d8cc711ce403d29b8266a5bdb8cd25e2490e87079c95deadd26b3f53ccf460
-#+busybox-shadow.d1773710792709bcf09967920bdea4041e1dddc8d01a018cfd71ff3e778b50d6
-#+busybox-su.90648ac2715b9b85ab120acc65b5ac97f726354d31494fe05f63a1fb7fbbb81a
-#+busybox-util-linux-priv.f5763a3b4dce4895c0e21542c448848b806456f8c4710240059981d8a15c77c0
-#+busybox-logging.3f5e1cc2a8b6894c584f050a719370ed9e415b3ba7403aafb2bb70c3763c1ae9
-#+busybox-cron.bfc04eb7114ade53ae26f3b8ab0e4bf261300b07f5283d5e3cfa01c57150739f
-#+attr.98984f5c39fd7a746e7d945d7d03278d144f2c778913bb62e0bb89d9e7b10c87
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+diffutils.3809ea70683c0d0447e0319ee4a07400139d138539da1644f2b9d755ee669ecd
-#+patch.49cd0df84abbc8dbceadbe048372c8f6a53798e563f3b37ae1949b997f2a29b1
-#+flex.c807deafd5dcf61ab4b56ccc6e344d4534998be335b365a385b15a7a7100132b
-#+bison.8f9a8e6afcc6d49b72dd5a525bb72db0486826be790931f9886b7ea2b18625e7
-#+rsync.0e3d7c531e3d8fa3b583cbbcb88710b34ad72dfafc49fa23cf3fcc7aa43bd155
-#+execline.376df17984a16a89974061d5186d4aa7613b8b9d3b2ac25399f03f628ec19bed
-#+s6.ab0c54c542b24a5b8a15009de6962dee7e399a329cf57c6124b323540c68d9b0
-#+s6-rc.7d1f71680711f4faf6e09a4f30f99f4fe00966ab2d76610b0f7cfbe9635727f6
-#+s6-portable-utils.bbda636ba011a5cf8494a0703a67e3ddc63c7f2cb2bfd0f3ed4baa6227a05447
-#+s6-linux-utils.06ab7b8fc116f0cfc4ca0ab68096e4abdce1c2567f6cf996af907c0ad3f4f0f7
-#+s6-linux-init.7c46cd9db1839a7f63d3c1c299e988f8ed9512c72a8da399427498375b87ddb5
-#+mdevd.fb1c9b400e79fffc5a212ff41cba797a97d73f179dfb2d271e43adfa37f1d736
-#+s6-dns.71e48ca3c840c69047a2e5fedb0a90221129fb03eace405338bd5a233654ffaa
-#+libressl.41ff2305967824c8bc4f745d6f725d1b211ca8784157d40c5e069eb915e14d1e
-#+s6-networking.279d67c48f9d8d76271af99c7c5e1274b4a324f6aad0df53f8cab33abddecb6a
-#+zsh.7b99d4c89d067b4dbf2b1d80dda11f2d4cf636988ca7037eef5e13ff2aeebb78
-#+pthbs-banginstall.5204681c37f6f2b2fc9191fb2755a1e998f05e7d74a7665b5d3926e53a331c16
-#+aat.f7f64d3253bbb353c33b7a1957b4bc44626e1dccf08b93b6236b01b951dbf7a0
-#+confz.7c2060ef43955de74c52a5369ea0f89c377071b46a20654e0c541dc899f9d3be
-#+containers.1960b32d2a595225b1573f0a13acd172a63b94bb05af999f567c6764c344f793
-#+fileset.aba852844dc5d95659391f6d454d1f4ec5745bbc70ea1ec6f22c3c922afe5d93
-#+logincaps.739d410b1b4666beeae28ccff8612b8c48da98f24d6f7940f0a3f919ee3afc2e
-#+snaprep.4695e5b4567d05718ab29801e29092e263534d87a128b32b6f3670591079d202
-#+curl.dac04ccb0022160b1c8505688e963d3b1a2fc8e637d6783c263e07db381d1fa0
-#+git.655b5cbba35586219093f873c345678cbb474b02c9057d10d3d994667ef41b1a
-#+xbps.f6d5aa22c04dad28fdad2cbbba0c70fbaeac816faca5c98a336e428cf3a1fdc4
-#+apk-tools.99525c3d85245706b220b86fbbd0b0da0bae0b75f7d03044ca05a438b17e23cb
-#+getent.2459e727ee129d5d8c04a9fcc4dcb0cb76954700605b6d0e97a57047ee38a3ac
-#+getconf.ccca4783e40a8887c335db92435a7e1da05121f74d07f155957a21e4f79abb75
-#+iconv.dd746237a64560a44192122195d821618fc3c5fc52aba161cf6692bfcc7f5db0
-#+libcap.f7b9e4a8ba271cf8cf9fdd37f118350f1b348b5c3e62b126eb15559af88daba1
-#+applyuidgid-caps.6d88248e983fbabbbd098a0812977524fccc68c65f5a806950083a50ab272d95
-#+ccx-utils.d2d83050e2fbf9670301fa6673055f14b9e575d0c6f983041eaa7335acc40c83
-#+user-env.926c5c38794bdd7b2d90ad40663a5c8c9331168ddd985a55eab231691da50602
-#+strace.62ad38bce9f1a35005c66ea50ea813a3e7a9b2350baca321a7b398d141a47813
-#+mlog.da13da7c97d59cd668e1e7be3582621240cc0eca2679eaabb08b3fb983a049eb
-#+findutils.7a3e2dc070fc3c657de30df99cf0a25b36c15e645594f8788be464c3f8fef348
-#+nawk.7a27c857311a384a9b2baadca56e2806a399c6f35aa6f36a79bf2fe5b8774d31
-#+squashfs-tools.60a1c0daec22d7cadc3eb76f58b80fe11d66918029889f35838d370d5fed311e
-#+mandoc.d837aafee2f13e11f2e54e97dedab43e9b9b8fc21ca02f0eadd8be0cc8270856
-#+tinyssh.7c3bb893d33bbaa9ab9726fab6af134ef0a5f8dc338780c46461e3405956a15e-
\ No newline at end of file
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-dosfstools.8f5b1ee38114136cac68bb6f4afae1e07dc56d1b4bc70a1194790781718f3c22
+#+busybox-e2fsprogs.2161e5dbaba77dc468290cd2b337468a51bb66b45800279cec83e6ae539e1383
+#+busybox-iproute2.77bb99af64d279b87e456ef446adb8c6d1fcd82b4a744548985cd4c96ea6462a
+#+busybox-iputils.130cf65c6749d79a78efe5ee862662d29f647609a327e06886c868fefebd352f
+#+busybox-net-misc.b8f85c6672aa212be5c152b32272fd3ec52ce9eca2b08c24ceb9e65ec17a1fd9
+#+busybox-net-tools.e1f372550a56fca9c2f3c7fed774c65bf39551a43d1841303c54168b5de96cf2
+#+busybox-traceroute.d713ce38720b240566caa2ad99f9f4c46a5635ccdab516b005b3c15c28519b57
+#+busybox-wget.c90771f6331074e16a31c2d8bb61c661cd10ae1be8657f5c33f9d2d2ffa26350
+#+busybox-chpst.17dada726c42a5937c7481b53a98ebe3d5a002f9d4192adb2eedee6c16355e82
+#+busybox-console.38bbabc39ee90af57b1aeca68a210ea643acf3d2eb79975e175630c0da2b9fa3
+#+busybox-getty.707a78c7052976fad3c9ca24d2546aaeb9704cd89ce365614de04831c1b687fd
+#+busybox-i2c-tools.e310aff45a96eeca5fa82c88e77b383d5c85616942ffa613e5bc911033b26564
+#+busybox-linux-extra.ba82e9e6e9f1964f6cbb791a9a4f9e9d8b3ce7ecedd94c295c36c8234a19a006
+#+busybox-mtd-utils.477479f60e6c2e5657c84641e34f0665c28c604d2cfc612184fa75fcd40fe326
+#+busybox-shadow.11c79b4faf86969368126c89e34dee72abdddde292f870d38267cf0a2ab37116
+#+busybox-su.82f758f3f28e28635e4308e5328171c1e7089e2564ab6f260bb1f19b4025837a
+#+busybox-util-linux-priv.63bdb15a591612704d66c87da50a109b60be449dcb851789e8550030276a0d99
+#+busybox-logging.cdb603c17dd0d261c341acd290264b329ba98bdc84c7825043e94a9b8097bb08
+#+busybox-cron.38da282721d48a9aa823292b7ce48fe8097ec908fc0ead5c5a6ca17b1d2980e7
+#+attr.80f325beb7a48d84938ce7dacd69f970a84f7422008b6a1a588c39f6c7f271b1
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+diffutils.9f2ad07cc1b8bade131a41a10b953be66739dd9170ec580366178c5ebd98e703
+#+patch.22417d3878fcce24877e5285481ba9b8ed3cb4114f01dd35e02b64f6a2ec245e
+#+flex.26923b9a97577df9eca703d35dfbdd94ecf9052ff5d696d781be46d0c5a7f137
+#+bison.4f1834363af8931677e08af3ec355d17faa0950dbb0840e4d0d5be4a9d86ff4b
+#+rsync.041d08a05c60f42f0c5b149f9b0da89f7adaa58221896bb7eef86983974759cf
+#+execline.e2ffbf13ccce17342289f014e7910f9fc0269270b9551aea5fb85046c63762ef
+#+s6.cb95971310601341da2f37ab9ec8992b5f290a2272b3b1383ae3535a31e08791
+#+s6-rc.6e5bd0c73f355b8231738da584288d41d26bace1a47b49bb59d4bd692c05ab72
+#+s6-portable-utils.f1d75067377bad2900506a54923c4cebadb763a040ed9699e264c52365c62fc0
+#+s6-linux-utils.f2e3c6d8b41ec40f8bba9b5b256edf58e084205699448906b62a9f8a642281fa
+#+s6-linux-init.ef02026af87faaad5a57090083ec9be3cb0804a33a3225e369dfe03f76bf7217
+#+mdevd.f425bcbcada4f99c20101cddc044bc4d6b316745ad2092f812940f78ff0d995b
+#+s6-dns.e6b7fcc396d5cc8b1b81b681cb47339d742457fac2b3f67027af0b14823d3d71
+#+libressl.fc2f48e22bfc2eedac1ab7f30203448cf4c4326d27d9884756da5c09983a5b29
+#+s6-networking.7762ef69f83dcbb1ae50e69c125a0b0d991aa233b5232178829e4c6a3a41520b
+#+zsh.d6a0bbc670433d1df6ea77735e63fcd1825782766457dfec5b75fff57ed229a7
+#+pthbs-banginstall.107948011aedc6fdcc44097d706a1c77990cdd8a8c72c0911af91a7b88813221
+#+aat.097f9629dbaac0913aaae76f4995d516a56af74d2d504f1efd894ccc9c0390f0
+#+confz.410ad69682b24dee0242bebd26c82422837f91a7cb7e041f4838d2e35711e8c7
+#+containers.f17f94ccb7f8184c097a441c0c69dfa87464478ee6075d08cbc908171dece923
+#+fileset.c2b3679be67e2aed59ebcd3d32e7abcfb4cc335580abc7e3fc9064d263d5986b
+#+logincaps.4510f832af1397b428d0820b89fd56222e202449cea2fd9f283cef4774d1ab55
+#+snaprep.c04876ad6a7d1a1b4a3fd15e68cb88d57984295fd10d3e4f677d4b2d2e956e0b
+#+curl.f035fbbbad6f776f9269d35ed4d43adf4cb54e99d7308178625edc076e80898f
+#+git.00cb06db1e323cff420d4f9f6cbf94e06a1df61f5f216090d8332629fe07b424
+#+xbps.f86d9b9eef39924a39ef19d54d8a8f598b6891bb6b69983e023a39b1a6c0cb1d
+#+apk-tools.562f9315d0e5dc860b56d692a416ec56df37d5dc9572bd34130b4b27b5321416
+#+getent.5e57845ba815b26d6c3e8e279cdebeb2d925b1b4f7c066da8e44b5143efade34
+#+getconf.fad953bc55d9544d2fef4ee39f6c7154b3efb90ecd482632234eb0f63a27aa92
+#+iconv.847f40217bbb0c8153e962cf2d3339ac37a018a5d960b5ec65364221431885d2
+#+libcap.ffb7a2e12924697efeb24ea043793ea32e9f206398d98704943f09fb9bc5ae74
+#+applyuidgid-caps.edaf481f34f0db18970bd8c40b883f0ff1cb6a8c98055cdff810bb6c08d2e8b6
+#+ccx-utils.a55827cd69b17cb0ef9f7e9297464148979c4ae45a8deaf3d633adba99460c17
+#+user-env.22a16bb3b5b8ae5a2cee55d25a665409db780fe54cddce9e81d25b3bf65f0357
+#+strace.dce75a24151b9ae3b4df4f9ad397f1aac5014e7a23ea21548996cae7a8669254
+#+mlog.4d0b86eecfd76f7a916e8591d3f8906fa9b338681b2acfbf8e5cff8f6d6f8fed
+#+findutils.0c5ab165515a83b47f2363de1db3091d87eafbc4f0d979f358f6418989f1ff1c
+#+nawk.38f6c65ae0a08ab3779373229bd7848e11a1e643789b942fae89da61531b7821
+#+squashfs-tools.6d31f13220dc6b46e528a883fe2bea4d9027d96d0fd7adc90bab1cb7230b6416
+#+mandoc.a91ececd912f651acc883d29b3cd0409425597f842bdcf3e57510bfa4ab3aee5
+#+tinyssh.84a1f67aad02fc83710752e790d477371102eb0f2cd0da82e9bca68309764edd+
\ 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.68b61594f2c1eb1505a3822228c0204ba45da2e41a696ee7c39ad4e15dc8a342-
\ No newline at end of file
+#+linux-qemu-guest.1c04cf5b2e76cfbe19debfcb4d99a9858c452a6efc04485a72e1dc71c384418c+
\ No newline at end of file
diff --git a/variants/ccx-x86_64/xbps b/variants/ccx-x86_64/xbps
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+libarchive.ece9c8afe20fcf98233e1c85bd8ad6e1d8ba8532686828e55114b542cb69e1fd
-#+libressl.41ff2305967824c8bc4f745d6f725d1b211ca8784157d40c5e069eb915e14d1e
-#+pkgconf-pkg-config.887274589ed9d8851d242e84e26fd90e8e4cec514a8aa1f1044f4d313ef92096
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+libarchive.2dba9d1eebb27853ee445f8a76000b80703803bba4c2dc90a09530430a338023
+#+libressl.fc2f48e22bfc2eedac1ab7f30203448cf4c4326d27d9884756da5c09983a5b29
+#+pkgconf-pkg-config.4fe10ac5e20e36ea2a64a45fe59107e310ef4c84ebaf98cf5b9670b083150594
 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:.
 
 
@@ -153,12 +153,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/zsh b/variants/ccx-x86_64/zsh
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+m4.b8e999c51db94861dd245fb124d0ff26c7c1a0319b5031650bfeea527663afa5
-#+netbsd-curses.35a41707b68506a7daaf2a344859fa859d122997b9bfd58d6f391d9e1df61db7
-#+libbsd.a4a2659987a05940b78479d1a3e3c1843926d5bcb93f40d28dde59fc2a431762
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+m4.35234fd497356ccd3993f8730e6f7097888c37474e62a9b01993b4025ad650f0
+#+netbsd-curses.81629871857eb22aee7ebf2846f42201dcce7c57944e498ef7c5195afd3a74a6
+#+libbsd.84e2fc492fa42c2284618a3aeb54a1c5464709ae2b54ab8f96581ec7b8074037
 #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config
 #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:.
 
@@ -89,10 +89,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'zsh-5.9'
 
 
-autotools_config_static --enable-static --disable-shared \
-	--enable-libc-musl --disable-locale \
-	--enable-cap \
-	--enable-maildir-support \
+autotools_config \
 	--enable-datadir="${prefix}" \
 	--enable-datarootdir="${prefix}" \
 	--enable-etcdir="${prefix}/etc" \
@@ -101,9 +98,25 @@ autotools_config_static --enable-static --disable-shared \
 	--enable-fndir="${prefix}/zsh/functions" \
 	--enable-site-fndir="${prefix}/zsh/site-functions" \
 	--enable-runhelpdir="${prefix}/zsh/help" \
+	--disable-dynamic \
+	--disable-restricted-r \
+	--enable-locale \
+	--enable-maildir-support \
+	--disable-pcre \
+	--disable-gdbm \
+	--enable-cap \
+	--enable-multibyte \
+	--enable-unicode9 \
+	--enable-libc-musl \
+	--disable-dynamic-nss \
 	--with-tcsetpgrp
 
-
+# consider enabling:
+# name=zsh/attr modfile=Src/Modules/attr.mdd link=no auto=yes load=no
+# name=zsh/cap modfile=Src/Modules/cap.mdd link=no auto=yes load=no
+# name=zsh/curses modfile=Src/Modules/curses.mdd link=no auto=yes load=no
+# name=zsh/mathfunc modfile=Src/Modules/mathfunc.mdd link=no auto=yes load=no
+# name=zsh/zprof modfile=Src/Modules/zprof.mdd link=no auto=yes load=no
 sed -Ee '/name=zsh\/(files|stat|system|zselect|zutil|regex|net\/socket|net\/tcp) /s/link=[^ ]+/link=static/' -i config.modules
 cat config.modules
 
@@ -176,12 +189,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/ccx-x86_64/zstd b/variants/ccx-x86_64/zstd
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.b3acb0e188b3544363b0224e2c72aaaba99699ffed1caf8efc52acac90a3e57a
-#+busybox-bzip2.ec856a153ac4922d8cacb6dfcb9f54dd9bc70cd0dda796aecbdfa7b9ce91b27f
-#+busybox-gzip.cb026ed155d812357ed4117c998aeff644c16248cd07d3b8e9b48aa3f885e229
-#+busybox-lzop.768123686def7332f514ed713e61d15950390cd77f8004926b9c12e72379814d
-#+busybox-unzip.17220a4337e3967ef25f9f348f88308b25d4385597da92200badbf74301b77fe
-#+busybox-xz.8eb1178764f218172f948b0318084080864c5efe03fc82cb8b7c29d9065aa146
-#+busybox-cpio.2d5132a505d205c3943c0440ff74089955e532e19ead0b963d27edefc31c20ec
-#+busybox-dpkg.e7ce40623d509f4f6a9a92aed21d654082fa1aa89edc7002880a5f4b31fafa34
-#+busybox-rpm.08c05412a2b442d7a93cc5fb6017cfd18fe8ae0957aed8c5a3c152dc581f20f1
-#+busybox-tar.99fb3bc7adc8580b84c218bc9cffe26ebba7df84315fe499abd6353271fd1fd0
-#+busybox-ed.1c57c338d90e648e731116a1d2ce8817a68bd5f681412dd8e372fdc81d63a814
-#+busybox-sed.148a5cb0500031e362e3a6ebdfbe84029389f5d5e2c27d14835409d0443fd5a6
-#+busybox-vi.29e5cb0042643e8a4deebe2875ea2bf75b45924d70ddd971b40cbfba749b23b3
-#+busybox-xxd.47a755d487fb47b9a10d55331a278a51ed52fc047cdc7952b673b839cc99a18e
-#+busybox-process-extra.cc0209f91e86a3f82d91906623590e923f9fe6e9f667e289a4e4642c899f70e8
-#+busybox-procps.f972e47e4fa77d65d8e179a510eadbf20d46b2296e59bc8ae15afad2020f1942
-#+busybox-psmisc.a83ad551588bd320334e11eb500a314abcdb541d7f8b9e09c1a82cfe0ebe6018
-#+busybox-ash.08bfddd38e12edc82155043118927dc3904b4ad40f61bcbeb3948720156c3f23
-#+busybox-bc.f0b4a21725ef358082c4c2faad576ccda4443c77e5531eca97e31a422792dec1
-#+busybox-coreutils.9c25519fd6ef9935c2d61c6c99eab232003ae8939805eb87b925591032dcd427
-#+busybox-coreutils-extra.f753341b5b30dad4b965d5fb0252bf4f5afdf615ea3dad6d5f6e2b1916a1f41a
-#+busybox-daemontools.9a659edc60226c64eb8bb2bc827af04e7d2100d38972d85a5f4ded57538a6881
-#+busybox-grep.d6ef1719da3b828c7e0af3b5d74d5b535a0df53d71ec9352a3070bdb5b5bc168
-#+busybox-misc.3b7c676a06fbd735a8079a2c53a93dac8796593b146748b15633e9b9f8d44613
-#+busybox-sh.28de1244e9ccb89608f54156b6cd3949169c4aa7fdbf45b66b4efbd88b78f189
-#+busybox-util-linux-unpriv.3501ecaa8742a4256575ab93e315c43cd08cb00ef98ef8305da95e7de84f392d
-#+busybox-findutils.340d0136cf68dbb9878d3c814a13d29be97d3250fd0b3bcff31b0db27f7070fb
-#+busybox-awk.073ac092978ca917c09407fed3ad7d7cd0f17d0d75e98d732d411d12e285fdf0
-#+musl-cross-make.380b973981716d65331dcde4ef2b317fe28692b99bf809ed94e8dfc8750b739a
-#+gnu-make.c791c1138685019a4b8ec1a4a196ff76da796351f33abf2e36c5447a3b9d3e47
-#+busybox-diffutils.b6e54f5218b7c4219e382f3ebe54f0d0eb421d4893ae03c0e8e56058f955e4a7
+#+busybox.3beab4dafb3cee78d2d364bed989aad43f3ce87a504fd2431d73bb609c2b1a90
+#+busybox-bzip2.dfcd82d6ecb7fa48cc8695343bd4ee98efb7af9f8a645f1dfee56e2b38a55d77
+#+busybox-gzip.54751d2864c5fd877d9b7e56556a2393e812ae6ac09f8309b202d4d7c3f0a0c4
+#+busybox-lzop.cdaf762c7dff0cc60ee560a17dca30f317abfe70cb4ed33dab39eace3b4cce4f
+#+busybox-unzip.c6f9e9636956db4a12f0ae9b2659a6a234920c9f4c9d71a5ce96034536d15e7f
+#+busybox-xz.4213326c40c8d21a14a6409dd883ec2b1f701a5d345aa4578ee224ba26211759
+#+busybox-cpio.e5193e8659523deadd00b49f381660dc1f270f4a0383e5c41c45ba6fa1375913
+#+busybox-dpkg.f8b15f0c10db1351d73498acad23aaf9736e7ded181054cc18a0586b05ca36ef
+#+busybox-rpm.0a4b975f3a4ecd346b5e17337075aff890020602a982f99973cac7a41f5b0d6d
+#+busybox-tar.df7bb4b871252a0d9e54fd84d08e7115f38172c44f7ab71ffeb0f72bc0a6b4fa
+#+busybox-ed.5465e1e2fa98d8f87f3414ab4fc6eef3666a05f72763474b62c06b72cc8d6fe0
+#+busybox-sed.a3945f028a988e6c6c6e35062504c6eddd13919328190cccda801a784218daf9
+#+busybox-vi.acb9b2383b3c9def1e6f8787373df1f3c6b4cc3d1f44947f91b0ed02d5edede8
+#+busybox-xxd.41c4c9777d5aa9eb02b7c812066c59847e60421aab76f695d9df35fabe9c2898
+#+busybox-process-extra.b4e0af415a54e613c5ad2749334ce2df190bfd1101ca24df08f0765c2e678583
+#+busybox-procps.e706f0a2e0e62e4bf002d7ac0342721508e345e3e2afbaa6dd66af753f65bad5
+#+busybox-psmisc.6880168de9a92829165216a318702c59a7e8767149e075e38a96e633e5d426b1
+#+busybox-ash.8b7badd243c301c9564ef56473cbe420333f6d925554896890caa5e7c4c8a0d4
+#+busybox-bc.e5f04f494857f96978ecc6173d0a2fc21860e2b1d245f41b0d77ed4ed66cd4c0
+#+busybox-coreutils.2701d87a1363a92218a4b6cc087614a9ce723555577b8b31c6b5c839b5919046
+#+busybox-coreutils-extra.9e49138a206b33efd7b4830c2cccd0525709b34832d97340f38b404bb2a5ccd2
+#+busybox-daemontools.e861ffc49103919c4737aa53c895d169946b131402fd68832acf7196a0f0893a
+#+busybox-grep.70f700fe8ac13f1fee534e0e0542321a14da04ad6b8b31b2c0afa5c5f3d6dbc1
+#+busybox-misc.dfc6047fd72d4f9a6b3df4ef15b7faa0a17ed1e2a3e1deb021df2c55f908ecb3
+#+busybox-sh.a238f08a6f6f4ceac9b3e28fda90f2a842c31d5a772e34d589b0ee20b6020fc5
+#+busybox-util-linux-unpriv.be82084a22488c1839ae70ca944b4e003344423904cf0f16c58b919e5d2b2a3c
+#+busybox-findutils.c558866b9b47b3336b48f3d0cdc93665f1bff2eb9af42b64a9878d54255cc4a1
+#+busybox-awk.3287706f8d58037f4b16e0a2d6cd4a3080b57392103074afd6c8ec3a9b9ce961
+#+musl-cross-make.58cd3c757721b87eb3b7eef9dc72efda93069488a39a1b38a1b5758eb92f17d2
+#+gnu-make.a30f73fd4ab8cf5450f53bb02eac1896515c206877ab27dc9f04775f0adcb59a
+#+busybox-diffutils.4155a75128f76d7ea335ed5a827580faf65fb754bce78b09be1b59e6a0c3c2ff
 #@untar:-z:sha256:98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1:.
 
 
@@ -126,12 +126,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/aat b/variants/root-x86_64/aat
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+zsh.571047150db750d77921f5142fc610ff289f68e98c7ce1ae26d92c279694924e
-#+pthbs-banginstall.ed4d03e15da05a0615b406c90ed8e7e6e927e7a6173bc2d5306fc221d6b1dcee
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+zsh.79efcaa54bd6da0e331dc9acd6354c12fd73fb7db0b0fd8a6714fb3f09320c98
+#+pthbs-banginstall.53c1cc0fb914a45592217056f1f24cd8aab35f15922c0ed8eef2093603f7ebad
 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat
 
 
@@ -115,12 +115,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/abduco b/variants/root-x86_64/abduco
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
 #@git:8c32909a159aaa9484c82b71f05b7a73321eb491:abduco
 
 
@@ -136,12 +136,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
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.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
 #@git:c7b36ed27103ee3f9aa01905ba1fac2d606079cf:alpine-keys
 
 
@@ -94,12 +94,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/apk-tools b/variants/root-x86_64/apk-tools
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+patch.4b138b6c2ce3c37aee8f3ecdd54af7381ba88828e5c93375dcdbf65e6fe8e6e7
-#+libressl.c8777a86effa1414ee69aa0f4bd7e664db000f1543687ad2ebf08bdd60d0f4ed
-#+zstd.8f0902c53df0843e0cc7e0c7769656eb7c5a664236d549fdd2a25ed1dc3761ff
-#+pkgconf-pkg-config.beeefa0fe9bd588637948829bfcea1b50725d726f323b94c10a4bead578a32a2
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+patch.b94c1791be3a7554e261b831f41b86935a1a71a30996c82abb3ff48c26696322
+#+libressl.a64aa602822d2a7278c27f3a9443c9b66ad5ff7df83fab095b344f1db4598c71
+#+zstd.0cbf996db5ca56ac24ed073774ea0a715d6098f8616b66a843e4d3f43ea51256
+#+pkgconf-pkg-config.372514298b015e24fd4e1bcbb58d5eb49288491ee504cb9c72449a1ad237568f
 #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch
 #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools
 
@@ -134,12 +134,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/applyuidgid-caps b/variants/root-x86_64/applyuidgid-caps
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+skalibs.8a95f938f13c8c9e002c6d584573d29aeb9a66f0b621b957f0d0d3b8994fecde
-#+libcap.9f6d45bb56d57726401683138a9a7939f13d24b6a8eb79639f9ad4489b25a57c
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+skalibs.a8e75cd5bcf5e86791be83aaa61313e4fdae64e216e0e95b64e5f2d51a4f059b
+#+libcap.c0108c8a87ac308db1f5061c380a0b4baa9e9e244bbd74e0509cedf98589b7d9
 #@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c
 
 
@@ -123,12 +123,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/argp-standalone b/variants/root-x86_64/argp-standalone
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+m4.e358494a1ecfd280e744f59b421b66fb94fb9d3500b2177883a9bb654e279519
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+m4.fc418033f7f1a83dae7f43d369b5d9f2ad19c0838ad5731e41acfa6dd16e74b8
 #@untar:-z:sha256:c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6:.
 #@untar::sha256:a4facc0856b512ad8ab5aed7b07e14a9629aaf042b1e92377ba22fcfc4c4205b:argp-standalone-1.5.0
 
@@ -132,12 +132,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/attr b/variants/root-x86_64/attr
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+m4.e358494a1ecfd280e744f59b421b66fb94fb9d3500b2177883a9bb654e279519
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+m4.fc418033f7f1a83dae7f43d369b5d9f2ad19c0838ad5731e41acfa6dd16e74b8
 #@untar:-z:sha256:39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87:.
 
 
@@ -151,12 +151,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/bison b/variants/root-x86_64/bison
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+m4.e358494a1ecfd280e744f59b421b66fb94fb9d3500b2177883a9bb654e279519
-#+flex.6437de0d7ab2256c5cb69b5ab313620be1b56329f6fe4c38441297211bda72d5
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+m4.fc418033f7f1a83dae7f43d369b5d9f2ad19c0838ad5731e41acfa6dd16e74b8
+#+flex.ea6330f51ea3d58adc3a52b992a02f5c4b97c649973ce762c8ae25a5294e1256
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 
@@ -153,12 +153,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+gnu-make.881035ac01f8f90e4c6638ea00315ef51bd39143008cd9d646e79889d6b8f0ad
-#+musl-cross-make.a10740b4d168540b05ff4881969708c04cbb205d81bca01665b6f1d345aac53a-
\ No newline at end of file
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+gnu-make.20bc229dae170475c9ffb6d8396f923b65b019237c868f02cdfe157c22952e06
+#+musl-cross-make.5b57720f5f046b3f5ab6e8fe087c986e88c32db011272a9af8f98f367ecf38d9+
\ No newline at end of file
diff --git a/variants/root-x86_64/busybox b/variants/root-x86_64/busybox
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.881035ac01f8f90e4c6638ea00315ef51bd39143008cd9d646e79889d6b8f0ad
-#+busybox.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.20bc229dae170475c9ffb6d8396f923b65b019237c868f02cdfe157c22952e06
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
 #@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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
 
 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,14 +1,14 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
 #@pragma:nopath
-#+musl-cross-make.a10740b4d168540b05ff4881969708c04cbb205d81bca01665b6f1d345aac53a
-#+gnu-make.881035ac01f8f90e4c6638ea00315ef51bd39143008cd9d646e79889d6b8f0ad
+#+musl-cross-make.5b57720f5f046b3f5ab6e8fe087c986e88c32db011272a9af8f98f367ecf38d9
+#+gnu-make.20bc229dae170475c9ffb6d8396f923b65b019237c868f02cdfe157c22952e06
 #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox
 #@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config
 
 PATH="$pthbs_build_environment:$PATH"
-mcm=/versions/musl-cross-make.a10740b4d168540b05ff4881969708c04cbb205d81bca01665b6f1d345aac53a
-make=/versions/gnu-make.881035ac01f8f90e4c6638ea00315ef51bd39143008cd9d646e79889d6b8f0ad
+mcm=/versions/musl-cross-make.5b57720f5f046b3f5ab6e8fe087c986e88c32db011272a9af8f98f367ecf38d9
+make=/versions/gnu-make.20bc229dae170475c9ffb6d8396f923b65b019237c868f02cdfe157c22952e06
 
 export CC="$mcm/bin/x86_64-linux-musl-gcc"
 export CFLAGS="-D_GNU_SOURCE"
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.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+certdata2pem.508da3cd6e01f9f3568ee3cc0e2a73fdd9c95d932b1849d729362f9695e22d67
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+certdata2pem.bdc212b0517f3fdaf4c539e5c1728ea1613afc04e6ebf49a5a97f7ebc39f8e72
 #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:.
 
 
@@ -103,12 +103,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/ccx-utils b/variants/root-x86_64/ccx-utils
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+skalibs.8a95f938f13c8c9e002c6d584573d29aeb9a66f0b621b957f0d0d3b8994fecde
-#+s6.e15d2bc7adb3cc287b1eb530ffca1a14c09399bfc936e069e7107fc6d37dcd9d
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+skalibs.a8e75cd5bcf5e86791be83aaa61313e4fdae64e216e0e95b64e5f2d51a4f059b
+#+s6.536b1c09130f2a03270f6d9828f57ccf58f19e3bc9a5bad2235273467f1fb7c0
 #@git:461a9ec198c1e2b9c39a34e21786747dbb8671b4:ccx-utils
 
 
@@ -153,12 +153,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/certdata2pem b/variants/root-x86_64/certdata2pem
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
 #@sha256:064f7d41106cd9efa08b9e68cf049f44e3be55666bd2ab96d02c508293b8dce7:certdata2pem.c
 
 
@@ -121,12 +121,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/confz b/variants/root-x86_64/confz
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+zsh.571047150db750d77921f5142fc610ff289f68e98c7ce1ae26d92c279694924e
-#+pthbs-banginstall.ed4d03e15da05a0615b406c90ed8e7e6e927e7a6173bc2d5306fc221d6b1dcee
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+zsh.79efcaa54bd6da0e331dc9acd6354c12fd73fb7db0b0fd8a6714fb3f09320c98
+#+pthbs-banginstall.53c1cc0fb914a45592217056f1f24cd8aab35f15922c0ed8eef2093603f7ebad
 #@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz
 
 
@@ -112,12 +112,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
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.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-dosfstools.7031fd42e6a38b61039587593b2c49b888e5b4185dc3988833b62819519d566f
-#+busybox-e2fsprogs.b80d1814357274460c90397562cd9d8bfff0156ec301627a044a224031e81a0d
-#+busybox-iproute2.8acdc2ee3ff493e1402ceef21d34881f80f3fe4e14dcb505ccf22fc748a51601
-#+busybox-iputils.fced57f0fda2dadd1207d9fc0720950154b69e7f1ff9edd1a1daf24273b810c0
-#+busybox-net-misc.dc51cd8f3babfe1a9dc0e4c8247309f7d1affe48ef3af3bbc30f8f1b225315a9
-#+busybox-net-tools.ce51b186968bfbc461c80f484b86fa1de9da9fa2d53ec81398d6a4cd58aeb2d6
-#+busybox-traceroute.f9a4c85ba6712e44f3ca16e53f0d4034f0d88676b98bb092d75eb9662808aeae
-#+busybox-wget.328bd62d0bcbcb8e130f4681c9a3e580111018286961daba2ead14221de8b17c
-#+busybox-chpst.d530606301ad9b54c47e257fb5d065f901a3749e1d3a90b2f4831d69742f77dc
-#+busybox-console.b8f6a729bf3465c94a66a865c47585558d780a9a3fe949120a4cb354edac1bf0
-#+busybox-getty.1efb31d1e9744a943783b3fc033c407222da88beb97748e854da4c5a463aad04
-#+busybox-i2c-tools.9319d5243539945ae17d0cd7f3fa2dfe88d5f3ed5bf16397b70f963cc1231d6c
-#+busybox-linux-extra.bdfb3edbd4bf64ce6bd62befb48e12fe414f990153b1dbe475fb794c13a8987d
-#+busybox-mtd-utils.8256bf402897bab20b8412d04d2e7c13ee2b817cd4cf5c651a8d7c382c9cf73e
-#+busybox-shadow.149b43344c3ae8ab3a882880480cb54b23caba3ec5199a806b4e9de83c8e6050
-#+busybox-su.edf89124a8436c8c372462e822e41bb2e58af4871029673444c48f94a18c60ef
-#+busybox-util-linux-priv.484ff7a60600781cc65f39f95adcda1cae772875c187af0ebb60cf11ec0f7506
-#+busybox-logging.8dbce7a0bcda8f2a5614b8eeac9794a6cedc3ed69671879ef6500ed1e208e68c
-#+busybox-cron.2e1fde974ccdcf82e34efee75f00b4757c07bc68f21a2d043289965da45e1b13
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-login.1a0d8ee74f5191fc24b75da0f2b03c2b0dc8aa5e62e77e6cd2cab76b2f33e18d
-#+execline.912f56f686362df873d10a2c055d4329f34c336642f043e0dadc7f0c9e6406a7
-#+s6.e15d2bc7adb3cc287b1eb530ffca1a14c09399bfc936e069e7107fc6d37dcd9d
-#+ccx-utils.70a7723fcbfc547e310375e58e423b6c43cc7088e16128bbfb3413c907d81b71
-#+applyuidgid-caps.d332df75d591d7629cda6620780f6509c96914b1409a2f855745048d250c3610
-#+easyseccomp.b9623dc94da34e76b87c586d02aac9d5f17987887c25d47c7f5988bc6ef34905
-#+mlog.43c68c826028fd42d414a6d035749308b308b7ef25f6b88ba50f3b7f7440ea43
-#+abduco.cb3bbf6037191e47ee5d02e9fee738c11ffb8685e15c2a44ba94ccddd6219bdd
-#+nawk.1f83dbd2bab8c050e23262b85ca38f5b55b5a75490f7e73e164f92f1ffc56ee1
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-dosfstools.ff53bc16862746e75cf7cdfd7782e3bc9060d41b863e03239bd4070f297e4c36
+#+busybox-e2fsprogs.86b5fd14348b2166e78221b417e1ba105de0e4f3a8e8c578b7917440fca44ddc
+#+busybox-iproute2.5c9dadcae94634b29387168c6972dfb59af8aba47c405fb85ad5b08ec9aa0fa4
+#+busybox-iputils.cd0332322258b01baca8a75e2451df4137bb73a50b71457a6273b5fcfafa90dd
+#+busybox-net-misc.0e49e082c24d459529517de321f7cc472ddee8747bc263eae0f9ac5f086e005e
+#+busybox-net-tools.46e8fa4978b9b53f5aab7f8337e598de36f69f5a2fc6fc9347ebc843c50529ae
+#+busybox-traceroute.abaa00a0a83b9feda45ae3a6db2203b90b573471e0a3b01ecec5c316f56effc0
+#+busybox-wget.fbf7b42830563a6a316f97077a52c7154b2c660b33d21df78e4a566f5e700d8b
+#+busybox-chpst.bfb32806d90cc939a1fac38262b12d7355832b7a3748652d1fadaa91aab6071d
+#+busybox-console.0c77e4daf48216217c3293c05e740be40d838f8235529dab339ad403b04314ba
+#+busybox-getty.e828c4ac540200683d3c58bb3dc869fc4066d24d42be8d6ea8efa10bec240c59
+#+busybox-i2c-tools.bfba6896dc8262a5ca403c55ede0b13f175109baa403f8e27b371211ae125104
+#+busybox-linux-extra.964adcdbedf8067a2d48f81a2d1f79f9cf1ab3be7be3b6513e0b006bb54730ba
+#+busybox-mtd-utils.b06188ea7c7d5820f5090faf494c12a54864c17a0e5420153fc271f356ecd61b
+#+busybox-shadow.b8c9dbbf7f474e8fd94ae677e1aa720389ac228f89ee746c766643551de7a55a
+#+busybox-su.37c33de457a2ccc2b1088cb43551d04bf38e0a8734616626ba632634e143bbf6
+#+busybox-util-linux-priv.168952f6b78fda2cb71495f09427c073f43b734f4db7b6c0f993e3ca2b5c91fc
+#+busybox-logging.e2804fdf47b651ef3ddc7ea413b01e34a952af0735e2c4b2ccb4109a0effe239
+#+busybox-cron.fc7587f014f13c8157598682e35fed45c18bd70f50a3a69460429d09bea136c4
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-login.afd7f0622cd625b5af9f0b4eb347878f61827829823fc8ea20fd430871a62931
+#+execline.41cb65841ca776bf51e761e3edb1b9c6aa493f153243a2a3c80fbb9e419f1c3c
+#+s6.536b1c09130f2a03270f6d9828f57ccf58f19e3bc9a5bad2235273467f1fb7c0
+#+ccx-utils.79c97ea66b2dd0af18db08675c3503a914631699d9427a0e19671d5a80fef0a5
+#+applyuidgid-caps.2cffed29431e535abe114da90bb5de1a9705e3f045eaf6fbe006a0b8deb8ce55
+#+easyseccomp.7f3f2ad2744b151e66a7590577666ee77c47b7ef8359b0fc2b9ef0f7f6dfa269
+#+mlog.047dee2660eee8ed95d473037b464b784a67f83813f8ace4e917ac0841a7573e
+#+abduco.9d1cde1d23a9c4192f14c9586457a8da8319810fa7a8ff1970237b1b5e5c7d02
+#+nawk.a87fcebcbc9c8e087518e4f8ad55ada1a7fd87e8c60837cd09fe358850edbc7e
 #@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.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+zsh.571047150db750d77921f5142fc610ff289f68e98c7ce1ae26d92c279694924e
-#+pthbs-banginstall.ed4d03e15da05a0615b406c90ed8e7e6e927e7a6173bc2d5306fc221d6b1dcee
-#+execline.912f56f686362df873d10a2c055d4329f34c336642f043e0dadc7f0c9e6406a7
-#+alpine-keys.8213b884742b226c66e84604e43962a2b0cf7fc5fb416f623415e9a74a39943b
-#+apk-tools.b4721eb8ce1f9dfc708ab0ef8e4a9452f5ede745ad9e9f8e72cc2bbcc9a1fba1
-#+xbps.098e01a13a2efa3ed96f5b3f084b463ec43421edba6bbbc1821dc21a8fd6c8a9
-#+container-bin-image.7c8a45449d88bb81881c4a68fc811b8ce87e4bec03a4e933047c7a4fa7164c44
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+zsh.79efcaa54bd6da0e331dc9acd6354c12fd73fb7db0b0fd8a6714fb3f09320c98
+#+pthbs-banginstall.53c1cc0fb914a45592217056f1f24cd8aab35f15922c0ed8eef2093603f7ebad
+#+execline.41cb65841ca776bf51e761e3edb1b9c6aa493f153243a2a3c80fbb9e419f1c3c
+#+alpine-keys.2363bcdd33c00d5eb8b55b7d6be18fe0481eb5b50cb7d7d332f0313a7d4dda77
+#+apk-tools.2b6bb8e89c32fa4ade9cfccbc1e06ced31f8f3d98212f9bd61064b2256087047
+#+xbps.5960efa172f2276e95652d31a064f845234297b51fd0800d104e8f6c6ef88829
+#+container-bin-image.df753accdec5b4aa9a7386b50f21d48f9547f78709306e36c44679ce6a505ac2
 #@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.b4721eb8ce1f9dfc708ab0ef8e4a9452f5ede745ad9e9f8e72cc2bbcc9a1fba1/command/apk.static' "${dest}/deps/command/"
-ln -sf '/versions/xbps.098e01a13a2efa3ed96f5b3f084b463ec43421edba6bbbc1821dc21a8fd6c8a9/command/xbps-install.static' "${dest}/deps/command/"
+ln -sf '/versions/apk-tools.2b6bb8e89c32fa4ade9cfccbc1e06ced31f8f3d98212f9bd61064b2256087047/command/apk.static' "${dest}/deps/command/"
+ln -sf '/versions/xbps.5960efa172f2276e95652d31a064f845234297b51fd0800d104e8f6c6ef88829/command/xbps-install.static' "${dest}/deps/command/"
 
-for f in '/versions/alpine-keys.8213b884742b226c66e84604e43962a2b0cf7fc5fb416f623415e9a74a39943b'/keys/alpine/*/*; do
+for f in '/versions/alpine-keys.2363bcdd33c00d5eb8b55b7d6be18fe0481eb5b50cb7d7d332f0313a7d4dda77'/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.8213b884742b226c66e84604e43962a2b0cf7fc5fb416f62
 done
  
 mkdir -p "${dest}/deps/keys/void"
-for f in '/versions/xbps.098e01a13a2efa3ed96f5b3f084b463ec43421edba6bbbc1821dc21a8fd6c8a9'/keys/void/*; do
+for f in '/versions/xbps.5960efa172f2276e95652d31a064f845234297b51fd0800d104e8f6c6ef88829'/keys/void/*; do
 	ln -sf "$f" "${dest}/deps/keys/void/"
 done
 
-test -d '/versions/container-bin-image.7c8a45449d88bb81881c4a68fc811b8ce87e4bec03a4e933047c7a4fa7164c44/container-bin-image'
-test -f '/versions/container-bin-image.7c8a45449d88bb81881c4a68fc811b8ce87e4bec03a4e933047c7a4fa7164c44/container-bin-image/if'
-ln -sf '/versions/container-bin-image.7c8a45449d88bb81881c4a68fc811b8ce87e4bec03a4e933047c7a4fa7164c44/container-bin-image' "${dest}/deps/"
+test -d '/versions/container-bin-image.df753accdec5b4aa9a7386b50f21d48f9547f78709306e36c44679ce6a505ac2/container-bin-image'
+test -f '/versions/container-bin-image.df753accdec5b4aa9a7386b50f21d48f9547f78709306e36c44679ce6a505ac2/container-bin-image/if'
+ln -sf '/versions/container-bin-image.df753accdec5b4aa9a7386b50f21d48f9547f78709306e36c44679ce6a505ac2/container-bin-image' "${dest}/deps/"
  
 
 
@@ -154,12 +154,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
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.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-dosfstools.7031fd42e6a38b61039587593b2c49b888e5b4185dc3988833b62819519d566f
-#+busybox-e2fsprogs.b80d1814357274460c90397562cd9d8bfff0156ec301627a044a224031e81a0d
-#+busybox-iproute2.8acdc2ee3ff493e1402ceef21d34881f80f3fe4e14dcb505ccf22fc748a51601
-#+busybox-iputils.fced57f0fda2dadd1207d9fc0720950154b69e7f1ff9edd1a1daf24273b810c0
-#+busybox-net-misc.dc51cd8f3babfe1a9dc0e4c8247309f7d1affe48ef3af3bbc30f8f1b225315a9
-#+busybox-net-tools.ce51b186968bfbc461c80f484b86fa1de9da9fa2d53ec81398d6a4cd58aeb2d6
-#+busybox-traceroute.f9a4c85ba6712e44f3ca16e53f0d4034f0d88676b98bb092d75eb9662808aeae
-#+busybox-wget.328bd62d0bcbcb8e130f4681c9a3e580111018286961daba2ead14221de8b17c
-#+busybox-chpst.d530606301ad9b54c47e257fb5d065f901a3749e1d3a90b2f4831d69742f77dc
-#+busybox-console.b8f6a729bf3465c94a66a865c47585558d780a9a3fe949120a4cb354edac1bf0
-#+busybox-getty.1efb31d1e9744a943783b3fc033c407222da88beb97748e854da4c5a463aad04
-#+busybox-i2c-tools.9319d5243539945ae17d0cd7f3fa2dfe88d5f3ed5bf16397b70f963cc1231d6c
-#+busybox-linux-extra.bdfb3edbd4bf64ce6bd62befb48e12fe414f990153b1dbe475fb794c13a8987d
-#+busybox-mtd-utils.8256bf402897bab20b8412d04d2e7c13ee2b817cd4cf5c651a8d7c382c9cf73e
-#+busybox-shadow.149b43344c3ae8ab3a882880480cb54b23caba3ec5199a806b4e9de83c8e6050
-#+busybox-su.edf89124a8436c8c372462e822e41bb2e58af4871029673444c48f94a18c60ef
-#+busybox-util-linux-priv.484ff7a60600781cc65f39f95adcda1cae772875c187af0ebb60cf11ec0f7506
-#+busybox-logging.8dbce7a0bcda8f2a5614b8eeac9794a6cedc3ed69671879ef6500ed1e208e68c
-#+busybox-cron.2e1fde974ccdcf82e34efee75f00b4757c07bc68f21a2d043289965da45e1b13
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+execline.912f56f686362df873d10a2c055d4329f34c336642f043e0dadc7f0c9e6406a7
-#+s6.e15d2bc7adb3cc287b1eb530ffca1a14c09399bfc936e069e7107fc6d37dcd9d
-#+s6-portable-utils.542bcd8ede35d827be45d9e91451ef77e186a1f0c9a3272f220edc2d113e51d6
-#+s6-linux-utils.978122ebf608da833e1e97d09f959f37d09293b7b7fa41bfcda81f4de522c967
-#+zsh.571047150db750d77921f5142fc610ff289f68e98c7ce1ae26d92c279694924e
-#+confz.99682039766f6d2ff92a830afb53b935435f6abcc4ecb799f08c5a768068dc46
-#+containers.f78c7d2d19a36c6cd5e6977fcad74e2a688b907d2ef156d9a4fc9a23bbd8fbad
-#+xbps.098e01a13a2efa3ed96f5b3f084b463ec43421edba6bbbc1821dc21a8fd6c8a9
-#+zstd.8f0902c53df0843e0cc7e0c7769656eb7c5a664236d549fdd2a25ed1dc3761ff
-#+apk-tools.b4721eb8ce1f9dfc708ab0ef8e4a9452f5ede745ad9e9f8e72cc2bbcc9a1fba1
-#+alpine-keys.8213b884742b226c66e84604e43962a2b0cf7fc5fb416f623415e9a74a39943b
-#+getent.987248cc33ef274c8ff22aa3fd196d702d61b07676ed3ef33b529ae7f4631908
-#+fileset.c6011cd6ffe8e89fbb3f5755fc3039b9630bcdfb9925e7bd6c6b997a3d863868
-#+ccx-utils.70a7723fcbfc547e310375e58e423b6c43cc7088e16128bbfb3413c907d81b71
-#+easyseccomp.b9623dc94da34e76b87c586d02aac9d5f17987887c25d47c7f5988bc6ef34905
-#+findutils.4410b8c7a36486ad849c1b63a623d6d95dea6a04335b5c879d2d8c71d62739df
-#+nawk.1f83dbd2bab8c050e23262b85ca38f5b55b5a75490f7e73e164f92f1ffc56ee1-
\ No newline at end of file
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-dosfstools.ff53bc16862746e75cf7cdfd7782e3bc9060d41b863e03239bd4070f297e4c36
+#+busybox-e2fsprogs.86b5fd14348b2166e78221b417e1ba105de0e4f3a8e8c578b7917440fca44ddc
+#+busybox-iproute2.5c9dadcae94634b29387168c6972dfb59af8aba47c405fb85ad5b08ec9aa0fa4
+#+busybox-iputils.cd0332322258b01baca8a75e2451df4137bb73a50b71457a6273b5fcfafa90dd
+#+busybox-net-misc.0e49e082c24d459529517de321f7cc472ddee8747bc263eae0f9ac5f086e005e
+#+busybox-net-tools.46e8fa4978b9b53f5aab7f8337e598de36f69f5a2fc6fc9347ebc843c50529ae
+#+busybox-traceroute.abaa00a0a83b9feda45ae3a6db2203b90b573471e0a3b01ecec5c316f56effc0
+#+busybox-wget.fbf7b42830563a6a316f97077a52c7154b2c660b33d21df78e4a566f5e700d8b
+#+busybox-chpst.bfb32806d90cc939a1fac38262b12d7355832b7a3748652d1fadaa91aab6071d
+#+busybox-console.0c77e4daf48216217c3293c05e740be40d838f8235529dab339ad403b04314ba
+#+busybox-getty.e828c4ac540200683d3c58bb3dc869fc4066d24d42be8d6ea8efa10bec240c59
+#+busybox-i2c-tools.bfba6896dc8262a5ca403c55ede0b13f175109baa403f8e27b371211ae125104
+#+busybox-linux-extra.964adcdbedf8067a2d48f81a2d1f79f9cf1ab3be7be3b6513e0b006bb54730ba
+#+busybox-mtd-utils.b06188ea7c7d5820f5090faf494c12a54864c17a0e5420153fc271f356ecd61b
+#+busybox-shadow.b8c9dbbf7f474e8fd94ae677e1aa720389ac228f89ee746c766643551de7a55a
+#+busybox-su.37c33de457a2ccc2b1088cb43551d04bf38e0a8734616626ba632634e143bbf6
+#+busybox-util-linux-priv.168952f6b78fda2cb71495f09427c073f43b734f4db7b6c0f993e3ca2b5c91fc
+#+busybox-logging.e2804fdf47b651ef3ddc7ea413b01e34a952af0735e2c4b2ccb4109a0effe239
+#+busybox-cron.fc7587f014f13c8157598682e35fed45c18bd70f50a3a69460429d09bea136c4
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+execline.41cb65841ca776bf51e761e3edb1b9c6aa493f153243a2a3c80fbb9e419f1c3c
+#+s6.536b1c09130f2a03270f6d9828f57ccf58f19e3bc9a5bad2235273467f1fb7c0
+#+s6-portable-utils.28f708cc0907e0af5ffd6bf97255e1062fb89d5ffd44755ad3e4db2350cf284e
+#+s6-linux-utils.a0b3d1f521107d8fad67f2fb86bf2ac817615c899e6adf1e9e9b1325b98c7c1b
+#+zsh.79efcaa54bd6da0e331dc9acd6354c12fd73fb7db0b0fd8a6714fb3f09320c98
+#+confz.d6990f08d845a83ba1e3b92dd729c1dc32e5974e3e8be8fa96d3a43122445282
+#+containers.b469c4597231b22ea0bd8f5a8eca2b441b61679ee0adb47285e28b55651d58b0
+#+xbps.5960efa172f2276e95652d31a064f845234297b51fd0800d104e8f6c6ef88829
+#+zstd.0cbf996db5ca56ac24ed073774ea0a715d6098f8616b66a843e4d3f43ea51256
+#+apk-tools.2b6bb8e89c32fa4ade9cfccbc1e06ced31f8f3d98212f9bd61064b2256087047
+#+alpine-keys.2363bcdd33c00d5eb8b55b7d6be18fe0481eb5b50cb7d7d332f0313a7d4dda77
+#+getent.a12f882b028b036f7847ed7db52b774011e6ecb22136b9a1b234bf69a7e34a16
+#+fileset.7deb901ad795c8ca4b7f0d260d14b8e4fd707cb870d49fcfc85f68405431d907
+#+ccx-utils.79c97ea66b2dd0af18db08675c3503a914631699d9427a0e19671d5a80fef0a5
+#+easyseccomp.7f3f2ad2744b151e66a7590577666ee77c47b7ef8359b0fc2b9ef0f7f6dfa269
+#+findutils.498616bba7a0b0e8134135fa0dbee4ec3ca484b1864004c4f481ae30ac26013a
+#+nawk.a87fcebcbc9c8e087518e4f8ad55ada1a7fd87e8c60837cd09fe358850edbc7e+
\ No newline at end of file
diff --git a/variants/root-x86_64/curl b/variants/root-x86_64/curl
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+m4.e358494a1ecfd280e744f59b421b66fb94fb9d3500b2177883a9bb654e279519
-#+libressl.c8777a86effa1414ee69aa0f4bd7e664db000f1543687ad2ebf08bdd60d0f4ed
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+m4.fc418033f7f1a83dae7f43d369b5d9f2ad19c0838ad5731e41acfa6dd16e74b8
+#+libressl.a64aa602822d2a7278c27f3a9443c9b66ad5ff7df83fab095b344f1db4598c71
 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:.
 
 
@@ -172,12 +172,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -1,96 +1,96 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-dosfstools.7031fd42e6a38b61039587593b2c49b888e5b4185dc3988833b62819519d566f
-#+busybox-e2fsprogs.b80d1814357274460c90397562cd9d8bfff0156ec301627a044a224031e81a0d
-#+busybox-iproute2.8acdc2ee3ff493e1402ceef21d34881f80f3fe4e14dcb505ccf22fc748a51601
-#+busybox-iputils.fced57f0fda2dadd1207d9fc0720950154b69e7f1ff9edd1a1daf24273b810c0
-#+busybox-net-misc.dc51cd8f3babfe1a9dc0e4c8247309f7d1affe48ef3af3bbc30f8f1b225315a9
-#+busybox-net-tools.ce51b186968bfbc461c80f484b86fa1de9da9fa2d53ec81398d6a4cd58aeb2d6
-#+busybox-traceroute.f9a4c85ba6712e44f3ca16e53f0d4034f0d88676b98bb092d75eb9662808aeae
-#+busybox-wget.328bd62d0bcbcb8e130f4681c9a3e580111018286961daba2ead14221de8b17c
-#+busybox-chpst.d530606301ad9b54c47e257fb5d065f901a3749e1d3a90b2f4831d69742f77dc
-#+busybox-console.b8f6a729bf3465c94a66a865c47585558d780a9a3fe949120a4cb354edac1bf0
-#+busybox-getty.1efb31d1e9744a943783b3fc033c407222da88beb97748e854da4c5a463aad04
-#+busybox-i2c-tools.9319d5243539945ae17d0cd7f3fa2dfe88d5f3ed5bf16397b70f963cc1231d6c
-#+busybox-linux-extra.bdfb3edbd4bf64ce6bd62befb48e12fe414f990153b1dbe475fb794c13a8987d
-#+busybox-mtd-utils.8256bf402897bab20b8412d04d2e7c13ee2b817cd4cf5c651a8d7c382c9cf73e
-#+busybox-shadow.149b43344c3ae8ab3a882880480cb54b23caba3ec5199a806b4e9de83c8e6050
-#+busybox-su.edf89124a8436c8c372462e822e41bb2e58af4871029673444c48f94a18c60ef
-#+busybox-util-linux-priv.484ff7a60600781cc65f39f95adcda1cae772875c187af0ebb60cf11ec0f7506
-#+busybox-logging.8dbce7a0bcda8f2a5614b8eeac9794a6cedc3ed69671879ef6500ed1e208e68c
-#+busybox-cron.2e1fde974ccdcf82e34efee75f00b4757c07bc68f21a2d043289965da45e1b13
-#+attr.b8fbc9d8505a990214bfe4d599a45b1a030a34569819211f1ab054e19c2e2082
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+diffutils.83a14dd4b514d22f131383c75cd46a3b2b995d9a756614664417f43115894ef9
-#+patch.4b138b6c2ce3c37aee8f3ecdd54af7381ba88828e5c93375dcdbf65e6fe8e6e7
-#+flex.6437de0d7ab2256c5cb69b5ab313620be1b56329f6fe4c38441297211bda72d5
-#+bison.0b6d9127e38a3ba37eeb962761b8e27c532f5fc6e152970625c235d8146c59ab
-#+rsync.fda12f12404b51c5b9365dd20af9406214bb26d245d7fcefe9ec7daa380ae5fb
-#+execline.912f56f686362df873d10a2c055d4329f34c336642f043e0dadc7f0c9e6406a7
-#+s6.e15d2bc7adb3cc287b1eb530ffca1a14c09399bfc936e069e7107fc6d37dcd9d
-#+s6-rc.79bbf3f2bcedc9e5a85afb6ec57aa6c4fb1ee58317d5d60df87504dc69c1da9d
-#+s6-portable-utils.542bcd8ede35d827be45d9e91451ef77e186a1f0c9a3272f220edc2d113e51d6
-#+s6-linux-utils.978122ebf608da833e1e97d09f959f37d09293b7b7fa41bfcda81f4de522c967
-#+s6-linux-init.61eb5bdecbb63fd528cbbd70c6688dd65e394dc9d6683ae185c1087d96f19599
-#+mdevd.93ee473fec0bd9340ed85db564debab76a390d0fa9f37c42df8754831ac7e1be
-#+s6-dns.f11df1f46afb4185e5e5bb4340e7c22a5821c898556c71709c9586cf5f3a712e
-#+libressl.c8777a86effa1414ee69aa0f4bd7e664db000f1543687ad2ebf08bdd60d0f4ed
-#+s6-networking.5ace585a300ab2bf024c54b6779bfb14bdf0ce2556a03710ed247e2ee9d5406e
-#+zsh.571047150db750d77921f5142fc610ff289f68e98c7ce1ae26d92c279694924e
-#+pthbs-banginstall.ed4d03e15da05a0615b406c90ed8e7e6e927e7a6173bc2d5306fc221d6b1dcee
-#+aat.19a8c1fbca3502ecc89f570e51a4379c38ee6f1cbde7d9f372a46d84aae37c0d
-#+confz.99682039766f6d2ff92a830afb53b935435f6abcc4ecb799f08c5a768068dc46
-#+containers.f78c7d2d19a36c6cd5e6977fcad74e2a688b907d2ef156d9a4fc9a23bbd8fbad
-#+fileset.c6011cd6ffe8e89fbb3f5755fc3039b9630bcdfb9925e7bd6c6b997a3d863868
-#+logincaps.af41a0ceafc442cb1b494a3b3da53809b494ea9b305bffb6ae68df475709aa86
-#+snaprep.3e3ca2d7cef51e83a438bb3cb9a5068ba381d9c419019c89c8ed5e32d8ec482e
-#+curl.e62d07a51a07a75e4be12783e94e72e055e2caa324246a2043eb57820d1999e6
-#+git.e06b05f4ac98c19d5bcb4d27e5858219415eaef2e82db9b4e969342663efb72c
-#+xbps.098e01a13a2efa3ed96f5b3f084b463ec43421edba6bbbc1821dc21a8fd6c8a9
-#+apk-tools.b4721eb8ce1f9dfc708ab0ef8e4a9452f5ede745ad9e9f8e72cc2bbcc9a1fba1
-#+getent.987248cc33ef274c8ff22aa3fd196d702d61b07676ed3ef33b529ae7f4631908
-#+getconf.35097a995dd64a94dd10877ac43aa71a91c9e57e6f2ed4a37b2ef38c0e35d447
-#+iconv.23431004486224b761acbc83cac931c8155ef9312a0210f826e1ecb264c146c7
-#+libcap.9f6d45bb56d57726401683138a9a7939f13d24b6a8eb79639f9ad4489b25a57c
-#+applyuidgid-caps.d332df75d591d7629cda6620780f6509c96914b1409a2f855745048d250c3610
-#+ccx-utils.70a7723fcbfc547e310375e58e423b6c43cc7088e16128bbfb3413c907d81b71
-#+user-env.f64e7a8b52b1e6e69d5d635f48900a4ee5895eb16fc271ae78c2a4b92518bf13
-#+strace.3f02709e61ff1d835d1ff49176824d7170032731f670f1d668bb08553c6b5486
-#+mlog.43c68c826028fd42d414a6d035749308b308b7ef25f6b88ba50f3b7f7440ea43
-#+findutils.4410b8c7a36486ad849c1b63a623d6d95dea6a04335b5c879d2d8c71d62739df
-#+nawk.1f83dbd2bab8c050e23262b85ca38f5b55b5a75490f7e73e164f92f1ffc56ee1
-#+squashfs-tools.849bd017362d649017b378e9b1f9d792d60070a0a45a01a240a8cb437972b18c
-#+mandoc.792ed251786dc428a104574df91ec55d3d33f68a66e820632b9d3596e2468434
-#+tinyssh.a9cbfd2de4b1bee2ffed65f4b0b2280423b0ccb7cd623ed28abaa2ec543382ca
-#+system-config.78b2b4dddc8097e463d836efa10875670f85d94e999a3fc009128665d70e7c2a
-#+system-config-rc.3fd9d26431c17b9b4a8777e62ea42b46c0d87c59c6d9aacf091e3e3b5b0391ca
-#+system-config-scripts.c060e180344cc39172ef12da1cac1215e808056d92ccee25775ad72fcede5892
-#+system-config-init.be1f32e810cb88025806a1cf3a3bd27b1e62c62d09697c9854b3325a25b3d8bf
-#+system-config-zsh.307780f550ff02589b93045b1b251efa512e7c6259a0876a820fc17694840acf
-#+busybox-modutils.5c9e493ea0b22edcb7955df21115f482ef7e8ec8b5ebe5f5f9de05e11330567b-
\ No newline at end of file
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-dosfstools.ff53bc16862746e75cf7cdfd7782e3bc9060d41b863e03239bd4070f297e4c36
+#+busybox-e2fsprogs.86b5fd14348b2166e78221b417e1ba105de0e4f3a8e8c578b7917440fca44ddc
+#+busybox-iproute2.5c9dadcae94634b29387168c6972dfb59af8aba47c405fb85ad5b08ec9aa0fa4
+#+busybox-iputils.cd0332322258b01baca8a75e2451df4137bb73a50b71457a6273b5fcfafa90dd
+#+busybox-net-misc.0e49e082c24d459529517de321f7cc472ddee8747bc263eae0f9ac5f086e005e
+#+busybox-net-tools.46e8fa4978b9b53f5aab7f8337e598de36f69f5a2fc6fc9347ebc843c50529ae
+#+busybox-traceroute.abaa00a0a83b9feda45ae3a6db2203b90b573471e0a3b01ecec5c316f56effc0
+#+busybox-wget.fbf7b42830563a6a316f97077a52c7154b2c660b33d21df78e4a566f5e700d8b
+#+busybox-chpst.bfb32806d90cc939a1fac38262b12d7355832b7a3748652d1fadaa91aab6071d
+#+busybox-console.0c77e4daf48216217c3293c05e740be40d838f8235529dab339ad403b04314ba
+#+busybox-getty.e828c4ac540200683d3c58bb3dc869fc4066d24d42be8d6ea8efa10bec240c59
+#+busybox-i2c-tools.bfba6896dc8262a5ca403c55ede0b13f175109baa403f8e27b371211ae125104
+#+busybox-linux-extra.964adcdbedf8067a2d48f81a2d1f79f9cf1ab3be7be3b6513e0b006bb54730ba
+#+busybox-mtd-utils.b06188ea7c7d5820f5090faf494c12a54864c17a0e5420153fc271f356ecd61b
+#+busybox-shadow.b8c9dbbf7f474e8fd94ae677e1aa720389ac228f89ee746c766643551de7a55a
+#+busybox-su.37c33de457a2ccc2b1088cb43551d04bf38e0a8734616626ba632634e143bbf6
+#+busybox-util-linux-priv.168952f6b78fda2cb71495f09427c073f43b734f4db7b6c0f993e3ca2b5c91fc
+#+busybox-logging.e2804fdf47b651ef3ddc7ea413b01e34a952af0735e2c4b2ccb4109a0effe239
+#+busybox-cron.fc7587f014f13c8157598682e35fed45c18bd70f50a3a69460429d09bea136c4
+#+attr.2518d82ab2d5714df3e64b9ce03df7a932cb18167a6bac7377473fa366e16125
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+diffutils.e0bc68a52141be978abd92af880ae1fe0f6eaec0d3546a762236c1bd20d35969
+#+patch.b94c1791be3a7554e261b831f41b86935a1a71a30996c82abb3ff48c26696322
+#+flex.ea6330f51ea3d58adc3a52b992a02f5c4b97c649973ce762c8ae25a5294e1256
+#+bison.2c9225a2177ce3f816b2bf74dc5240128f24d4dc68ada00987b18eb611cf5477
+#+rsync.fb3383c402f9c2a52ab6aabadde6c83ab2232921618701a1d636c48337fdb54d
+#+execline.41cb65841ca776bf51e761e3edb1b9c6aa493f153243a2a3c80fbb9e419f1c3c
+#+s6.536b1c09130f2a03270f6d9828f57ccf58f19e3bc9a5bad2235273467f1fb7c0
+#+s6-rc.3e03ddf887fe038165602b3eda2cb06b6e07a0507e4334b0515ba15376a9a491
+#+s6-portable-utils.28f708cc0907e0af5ffd6bf97255e1062fb89d5ffd44755ad3e4db2350cf284e
+#+s6-linux-utils.a0b3d1f521107d8fad67f2fb86bf2ac817615c899e6adf1e9e9b1325b98c7c1b
+#+s6-linux-init.a7d12b0bbd266e453c16ccba1d8caa5b16f18526a1e26d51a56c86a1fb2ef782
+#+mdevd.08e47963e7c46d091b2f9734398def1079f01de08e6c9a4f143ef6e0936bdea9
+#+s6-dns.2142197f628cfd02567797d06ab9bb45739828b9f6ab02b371c4c338ded185be
+#+libressl.a64aa602822d2a7278c27f3a9443c9b66ad5ff7df83fab095b344f1db4598c71
+#+s6-networking.787b29a9a5d1c213607fa886c55bc1f3be9affcb99e323a50ed0d9706c9ccd71
+#+zsh.79efcaa54bd6da0e331dc9acd6354c12fd73fb7db0b0fd8a6714fb3f09320c98
+#+pthbs-banginstall.53c1cc0fb914a45592217056f1f24cd8aab35f15922c0ed8eef2093603f7ebad
+#+aat.3932afdd65b8bf87058c2c1264234844df917484ee2b874fd1734750cc1a1581
+#+confz.d6990f08d845a83ba1e3b92dd729c1dc32e5974e3e8be8fa96d3a43122445282
+#+containers.b469c4597231b22ea0bd8f5a8eca2b441b61679ee0adb47285e28b55651d58b0
+#+fileset.7deb901ad795c8ca4b7f0d260d14b8e4fd707cb870d49fcfc85f68405431d907
+#+logincaps.2e66526c1a35a7df0407092b8b3629d6c9fe6e7593e0e17d11eb0c089a7c6375
+#+snaprep.60472db313d1c8e002d1416f156e9eeca7f5162e91b202842677000b8c08f187
+#+curl.9f99de0b22d2034becd5d6e323c297e556b8befe83cfaaa32d0505caeba5fbfb
+#+git.8886baa5f668ec6fa255af877c29ea5c43588a90d8fa44d3953df5a84adca67d
+#+xbps.5960efa172f2276e95652d31a064f845234297b51fd0800d104e8f6c6ef88829
+#+apk-tools.2b6bb8e89c32fa4ade9cfccbc1e06ced31f8f3d98212f9bd61064b2256087047
+#+getent.a12f882b028b036f7847ed7db52b774011e6ecb22136b9a1b234bf69a7e34a16
+#+getconf.361c0d85e8a66b9ea2c891296ce2e4187217e3b620621837634c2148b84eb7a2
+#+iconv.fd970229b0ded797161cba53ddbce1fc7251a9576091df74cf4aa0ac7f2b3523
+#+libcap.c0108c8a87ac308db1f5061c380a0b4baa9e9e244bbd74e0509cedf98589b7d9
+#+applyuidgid-caps.2cffed29431e535abe114da90bb5de1a9705e3f045eaf6fbe006a0b8deb8ce55
+#+ccx-utils.79c97ea66b2dd0af18db08675c3503a914631699d9427a0e19671d5a80fef0a5
+#+user-env.38560fd10d9f805163031bdd96e18a3fa13c448549ccb47972e47bba49aa79c2
+#+strace.901ccae6037d0b9ba26f5a92dad27bdf5ed791aa1273a88f21ba3cadb2e6779e
+#+mlog.047dee2660eee8ed95d473037b464b784a67f83813f8ace4e917ac0841a7573e
+#+findutils.498616bba7a0b0e8134135fa0dbee4ec3ca484b1864004c4f481ae30ac26013a
+#+nawk.a87fcebcbc9c8e087518e4f8ad55ada1a7fd87e8c60837cd09fe358850edbc7e
+#+squashfs-tools.92e77769741ae679e5531d6e71bad8c99ee9ed6f4ba8d3af7dc26fea4221e112
+#+mandoc.d6b536d53389d7e694d65f07f43b4eab00874faf4002d5d2d4b2eaa7c7230c3b
+#+tinyssh.217ebd02f888eb734311bc11fe0713047e575681e3759e19d3ea5b219ccfbba6
+#+system-config.86fc600dfe8d30b8eaa455c03df001d4681cbd438e380630d97c14ca98d1c24f
+#+system-config-rc.16da4bb5808c5ed3a87eef8f3f758d696feb8ab6188f862bbc6c6415c44d2fe2
+#+system-config-scripts.99312f8c04f798963aba1cefcad58d578d267436987728cc3cf52518893ed2c0
+#+system-config-init.120cff9d69b5188fe1c2521c1e40d8417224f5a3be53ba9c90bd4c4f8c5d0185
+#+system-config-zsh.579f2df537e7e81138d332e78860b203604aa9ee33d1fefc2054f96c9cc33d68
+#+busybox-modutils.d1eb201f018a26dcf7c947ba4aea495d03226e17c88f6997a43d23df7c345849+
\ No newline at end of file
diff --git a/variants/root-x86_64/diffutils b/variants/root-x86_64/diffutils
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+m4.e358494a1ecfd280e744f59b421b66fb94fb9d3500b2177883a9bb654e279519
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+m4.fc418033f7f1a83dae7f43d369b5d9f2ad19c0838ad5731e41acfa6dd16e74b8
 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:.
 
 
@@ -149,12 +149,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/dune b/variants/root-x86_64/dune
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+ocaml.069c6cc4ab715e5b0deb3bb2772c1cb535c4d9493499d62f0698e93c8d839a8f
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+ocaml.dacec2c58e92d993b290fc5d51fd5368b93d918a21d89c85aa77e9c571f92c84
 #@untar:-z:sha256:579c738f8ca191ba0a9b22dbe78f1377542442c9827cf4939f8964f09f9edb28:.
 
 
@@ -49,7 +49,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/versions/musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/versions/musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
 			return 0
 			;;
 		(*)
@@ -150,12 +150,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/easyseccomp b/variants/root-x86_64/easyseccomp
@@ -1,42 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+m4.e358494a1ecfd280e744f59b421b66fb94fb9d3500b2177883a9bb654e279519
-#+patch.4b138b6c2ce3c37aee8f3ecdd54af7381ba88828e5c93375dcdbf65e6fe8e6e7
-#+flex.6437de0d7ab2256c5cb69b5ab313620be1b56329f6fe4c38441297211bda72d5
-#+bison.0b6d9127e38a3ba37eeb962761b8e27c532f5fc6e152970625c235d8146c59ab
-#+libseccomp.7339ed4130b86d1961a2012f944e153bdf0917f1c1e5c76f5b1c33f842ed7996
-#+error-standalone.8284727d9b52d76604e6db735400bbad1769c339524e83b6e1765106fb2872d0
-#+argp-standalone.9f2d9c257e958e1e062bc3bcdfacb0c87eb7d95000cee10bbcf1449668d96496
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+m4.fc418033f7f1a83dae7f43d369b5d9f2ad19c0838ad5731e41acfa6dd16e74b8
+#+patch.b94c1791be3a7554e261b831f41b86935a1a71a30996c82abb3ff48c26696322
+#+flex.ea6330f51ea3d58adc3a52b992a02f5c4b97c649973ce762c8ae25a5294e1256
+#+bison.2c9225a2177ce3f816b2bf74dc5240128f24d4dc68ada00987b18eb611cf5477
+#+libseccomp.f74b8feef10afe908c490dc37d061451180471e473720a8bebb03b6f1a55c13f
+#+error-standalone.5d01c0be26c5ed86414e16fa7339ab3b84542de9f7c5a0d5a2be4eeac7c4af57
+#+argp-standalone.8fb15ea9ea3fcba336e3c99abc2da07422bf830358466c4f68e61d5092563e1a
 #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp
 #@sha256:eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10:easyseccomp_fix_includes.patch
 #@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
@@ -156,12 +156,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/error-standalone b/variants/root-x86_64/error-standalone
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
 #@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:.
 
 
@@ -105,12 +105,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/execline b/variants/root-x86_64/execline
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+skalibs.8a95f938f13c8c9e002c6d584573d29aeb9a66f0b621b957f0d0d3b8994fecde
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+skalibs.a8e75cd5bcf5e86791be83aaa61313e4fdae64e216e0e95b64e5f2d51a4f059b
 #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline
 
 
@@ -46,7 +46,7 @@ cd 'execline'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.8a95f938f13c8c9e002c6d584573d29aeb9a66f0b621b957f0d0d3b8994fecde/sysdeps' \
+	--with-sysdeps='/versions/skalibs.a8e75cd5bcf5e86791be83aaa61313e4fdae64e216e0e95b64e5f2d51a4f059b/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -115,12 +115,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/execline:bootstrap b/variants/root-x86_64/execline:bootstrap
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.a10740b4d168540b05ff4881969708c04cbb205d81bca01665b6f1d345aac53a
-#+gnu-make.881035ac01f8f90e4c6638ea00315ef51bd39143008cd9d646e79889d6b8f0ad
-#+busybox.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+skalibs.131a0253993040df85ff5a150e2c46a535d0139ec6c7fd6cf7454954714f733e
+#+musl-cross-make.5b57720f5f046b3f5ab6e8fe087c986e88c32db011272a9af8f98f367ecf38d9
+#+gnu-make.20bc229dae170475c9ffb6d8396f923b65b019237c868f02cdfe157c22952e06
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+skalibs.55c40d95d593a76568eb5ba8ae7cb20ddc03b04243188a518041f0b7cb4a12c1
 #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline
 
 
@@ -27,7 +27,7 @@ export CFLAGS="-O2 -ggdb"
 	--dynlibdir="${prefix}/library.so" \
 	--libdir="${prefix}/library" \
 	--includedir="${prefix}/include" \
-	--with-sysdeps='/versions/skalibs.131a0253993040df85ff5a150e2c46a535d0139ec6c7fd6cf7454954714f733e/sysdeps' \
+	--with-sysdeps='/versions/skalibs.55c40d95d593a76568eb5ba8ae7cb20ddc03b04243188a518041f0b7cb4a12c1/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -87,12 +87,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/fileset b/variants/root-x86_64/fileset
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+zsh.571047150db750d77921f5142fc610ff289f68e98c7ce1ae26d92c279694924e
-#+pthbs-banginstall.ed4d03e15da05a0615b406c90ed8e7e6e927e7a6173bc2d5306fc221d6b1dcee
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+zsh.79efcaa54bd6da0e331dc9acd6354c12fd73fb7db0b0fd8a6714fb3f09320c98
+#+pthbs-banginstall.53c1cc0fb914a45592217056f1f24cd8aab35f15922c0ed8eef2093603f7ebad
 #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset
 
 
@@ -114,12 +114,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/findutils b/variants/root-x86_64/findutils
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+m4.e358494a1ecfd280e744f59b421b66fb94fb9d3500b2177883a9bb654e279519
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+m4.fc418033f7f1a83dae7f43d369b5d9f2ad19c0838ad5731e41acfa6dd16e74b8
 #@untar:-J:sha256:1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5:.
 
 
@@ -158,12 +158,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/flex b/variants/root-x86_64/flex
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+m4.e358494a1ecfd280e744f59b421b66fb94fb9d3500b2177883a9bb654e279519
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+m4.fc418033f7f1a83dae7f43d369b5d9f2ad19c0838ad5731e41acfa6dd16e74b8
 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
 
 
@@ -153,12 +153,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/getconf b/variants/root-x86_64/getconf
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
 #@sha256:d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c:getconf.c
 
 
@@ -119,12 +119,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/getent b/variants/root-x86_64/getent
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
 #@sha256:002c1a216f6bed0f816ab1cfebde94a0b127193ef410c36b2190599983e015b8:getent.c
 
 
@@ -119,12 +119,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/git b/variants/root-x86_64/git
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+m4.e358494a1ecfd280e744f59b421b66fb94fb9d3500b2177883a9bb654e279519
-#+libressl.c8777a86effa1414ee69aa0f4bd7e664db000f1543687ad2ebf08bdd60d0f4ed
-#+curl.e62d07a51a07a75e4be12783e94e72e055e2caa324246a2043eb57820d1999e6
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+m4.fc418033f7f1a83dae7f43d369b5d9f2ad19c0838ad5731e41acfa6dd16e74b8
+#+libressl.a64aa602822d2a7278c27f3a9443c9b66ad5ff7df83fab095b344f1db4598c71
+#+curl.9f99de0b22d2034becd5d6e323c297e556b8befe83cfaaa32d0505caeba5fbfb
 #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:.
 
 
@@ -130,12 +130,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/gnu-make b/variants/root-x86_64/gnu-make
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.881035ac01f8f90e4c6638ea00315ef51bd39143008cd9d646e79889d6b8f0ad
-#+busybox.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.20bc229dae170475c9ffb6d8396f923b65b019237c868f02cdfe157c22952e06
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -119,12 +119,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/gnu-make:bootstrap b/variants/root-x86_64/gnu-make:bootstrap
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
 #@pragma:nopath
-#+musl-cross-make.a10740b4d168540b05ff4881969708c04cbb205d81bca01665b6f1d345aac53a
+#+musl-cross-make.5b57720f5f046b3f5ab6e8fe087c986e88c32db011272a9af8f98f367ecf38d9
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -37,7 +37,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'make-4.4.1'
 
 
-mcm=/versions/musl-cross-make.a10740b4d168540b05ff4881969708c04cbb205d81bca01665b6f1d345aac53a
+mcm=/versions/musl-cross-make.5b57720f5f046b3f5ab6e8fe087c986e88c32db011272a9af8f98f367ecf38d9
 
 export CC="$mcm/bin/x86_64-linux-musl-gcc"
 export CXX="$mcm/bin/x86_64-linux-musl-g++"
@@ -104,12 +104,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/gperf b/variants/root-x86_64/gperf
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+m4.e358494a1ecfd280e744f59b421b66fb94fb9d3500b2177883a9bb654e279519
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+m4.fc418033f7f1a83dae7f43d369b5d9f2ad19c0838ad5731e41acfa6dd16e74b8
 #@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:.
 
 
@@ -146,12 +146,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/iconv b/variants/root-x86_64/iconv
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
 #@sha256:f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7:iconv.c
 
 
@@ -119,12 +119,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/kbd b/variants/root-x86_64/kbd
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+m4.e358494a1ecfd280e744f59b421b66fb94fb9d3500b2177883a9bb654e279519
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+m4.fc418033f7f1a83dae7f43d369b5d9f2ad19c0838ad5731e41acfa6dd16e74b8
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 
@@ -152,12 +152,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/libarchive b/variants/root-x86_64/libarchive
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+m4.e358494a1ecfd280e744f59b421b66fb94fb9d3500b2177883a9bb654e279519
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+m4.fc418033f7f1a83dae7f43d369b5d9f2ad19c0838ad5731e41acfa6dd16e74b8
 #@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:.
 
 
@@ -151,12 +151,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/libbsd b/variants/root-x86_64/libbsd
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+m4.e358494a1ecfd280e744f59b421b66fb94fb9d3500b2177883a9bb654e279519
-#+libmd.b386bbdcdb88e348eebb43f6b2765c6f3fda44d4141a14d1f5c3cc47634b461a
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+m4.fc418033f7f1a83dae7f43d369b5d9f2ad19c0838ad5731e41acfa6dd16e74b8
+#+libmd.59118f163f35ac01d336dc269b480be104ca719edbb0985ef90e8fe9e1396cca
 #@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:.
 
 
@@ -147,12 +147,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/libcap b/variants/root-x86_64/libcap
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+pkgconf-pkg-config.beeefa0fe9bd588637948829bfcea1b50725d726f323b94c10a4bead578a32a2
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+pkgconf-pkg-config.372514298b015e24fd4e1bcbb58d5eb49288491ee504cb9c72449a1ad237568f
 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:.
 
 
@@ -145,12 +145,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/libcap:bootstrap b/variants/root-x86_64/libcap:bootstrap
@@ -1,8 +1,8 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.a10740b4d168540b05ff4881969708c04cbb205d81bca01665b6f1d345aac53a
-#+gnu-make.881035ac01f8f90e4c6638ea00315ef51bd39143008cd9d646e79889d6b8f0ad
-#+busybox.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
+#+musl-cross-make.5b57720f5f046b3f5ab6e8fe087c986e88c32db011272a9af8f98f367ecf38d9
+#+gnu-make.20bc229dae170475c9ffb6d8396f923b65b019237c868f02cdfe157c22952e06
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:.
 
 
@@ -94,12 +94,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/libcgroup b/variants/root-x86_64/libcgroup
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+m4.e358494a1ecfd280e744f59b421b66fb94fb9d3500b2177883a9bb654e279519
-#+flex.6437de0d7ab2256c5cb69b5ab313620be1b56329f6fe4c38441297211bda72d5
-#+bison.0b6d9127e38a3ba37eeb962761b8e27c532f5fc6e152970625c235d8146c59ab
-#+musl-fts.4b976b896506fedd68ef1168e6a3bfb195464c13035f78075283119060a614f1
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+m4.fc418033f7f1a83dae7f43d369b5d9f2ad19c0838ad5731e41acfa6dd16e74b8
+#+flex.ea6330f51ea3d58adc3a52b992a02f5c4b97c649973ce762c8ae25a5294e1256
+#+bison.2c9225a2177ce3f816b2bf74dc5240128f24d4dc68ada00987b18eb611cf5477
+#+musl-fts.8edab46073b286121d47f5f5763569b2027ba0056e7bf5b22eeb27c330a5cc58
 #@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:.
 
 
@@ -160,12 +160,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/libelf b/variants/root-x86_64/libelf
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+zstd.8f0902c53df0843e0cc7e0c7769656eb7c5a664236d549fdd2a25ed1dc3761ff
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+zstd.0cbf996db5ca56ac24ed073774ea0a715d6098f8616b66a843e4d3f43ea51256
 #@git:288355d104ff9930520c0283fe82556c6cc5c16f:libelf
 
 
@@ -124,12 +124,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/libmd b/variants/root-x86_64/libmd
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+m4.e358494a1ecfd280e744f59b421b66fb94fb9d3500b2177883a9bb654e279519
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+m4.fc418033f7f1a83dae7f43d369b5d9f2ad19c0838ad5731e41acfa6dd16e74b8
 #@untar:-J:sha256:1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332:.
 
 
@@ -147,12 +147,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/libressl b/variants/root-x86_64/libressl
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+m4.e358494a1ecfd280e744f59b421b66fb94fb9d3500b2177883a9bb654e279519
-#+ca-certificates-wip-donotuse.9865fd977c0ca76da0e41ad6426dd5ad0c490a2ef6498169d56a09998acf405c
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+m4.fc418033f7f1a83dae7f43d369b5d9f2ad19c0838ad5731e41acfa6dd16e74b8
+#+ca-certificates-wip-donotuse.32c58f61c2d7ab964fc138269c74411f0c32eeaf080687d724b5236ccda4178a
 #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c
 #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:.
 
@@ -99,7 +99,7 @@ make DESTDIR="$pthbs_destdir" install
 
 cd ..
 gcc ./c_rehash.c -o c_rehash --static -static -I"$pthbs_destdir/$prefix/include" -L"$pthbs_destdir/$prefix/library" -lssl -lcrypto
-cp -vs '/versions/ca-certificates-wip-donotuse.9865fd977c0ca76da0e41ad6426dd5ad0c490a2ef6498169d56a09998acf405c/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
+cp -vs '/versions/ca-certificates-wip-donotuse.32c58f61c2d7ab964fc138269c74411f0c32eeaf080687d724b5236ccda4178a/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
@@ -174,12 +174,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/libseccomp b/variants/root-x86_64/libseccomp
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+m4.e358494a1ecfd280e744f59b421b66fb94fb9d3500b2177883a9bb654e279519
-#+pkgconf-pkg-config.beeefa0fe9bd588637948829bfcea1b50725d726f323b94c10a4bead578a32a2
-#+gperf.ff3565d900ca64d88607cdbf0f3596d65abff410493851b78f8952d9fb1d8b2c
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+m4.fc418033f7f1a83dae7f43d369b5d9f2ad19c0838ad5731e41acfa6dd16e74b8
+#+pkgconf-pkg-config.372514298b015e24fd4e1bcbb58d5eb49288491ee504cb9c72449a1ad237568f
+#+gperf.ce1d127d54c015f913300f8c6941fae1c2cf0eeb6081a3cb0241a649e3b6895c
 #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:.
 
 
@@ -152,12 +152,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/libunwind b/variants/root-x86_64/libunwind
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+m4.e358494a1ecfd280e744f59b421b66fb94fb9d3500b2177883a9bb654e279519
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+m4.fc418033f7f1a83dae7f43d369b5d9f2ad19c0838ad5731e41acfa6dd16e74b8
 #@untar:-z:sha256:ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157:.
 
 
@@ -152,12 +152,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/linux-qemu-guest b/variants/root-x86_64/linux-qemu-guest
@@ -1,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-modutils.5c9e493ea0b22edcb7955df21115f482ef7e8ec8b5ebe5f5f9de05e11330567b
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+findutils.4410b8c7a36486ad849c1b63a623d6d95dea6a04335b5c879d2d8c71d62739df
-#+diffutils.83a14dd4b514d22f131383c75cd46a3b2b995d9a756614664417f43115894ef9
-#+patch.4b138b6c2ce3c37aee8f3ecdd54af7381ba88828e5c93375dcdbf65e6fe8e6e7
-#+flex.6437de0d7ab2256c5cb69b5ab313620be1b56329f6fe4c38441297211bda72d5
-#+bison.0b6d9127e38a3ba37eeb962761b8e27c532f5fc6e152970625c235d8146c59ab
-#+rsync.fda12f12404b51c5b9365dd20af9406214bb26d245d7fcefe9ec7daa380ae5fb
-#+zstd.8f0902c53df0843e0cc7e0c7769656eb7c5a664236d549fdd2a25ed1dc3761ff
-#+libelf.251e4dbf1eba7eb5d83810c7302879c571c52f1e255363025b581679604b8d4a
-#+pkgconf-pkg-config.beeefa0fe9bd588637948829bfcea1b50725d726f323b94c10a4bead578a32a2
-#+nawk.1f83dbd2bab8c050e23262b85ca38f5b55b5a75490f7e73e164f92f1ffc56ee1
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-modutils.d1eb201f018a26dcf7c947ba4aea495d03226e17c88f6997a43d23df7c345849
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+findutils.498616bba7a0b0e8134135fa0dbee4ec3ca484b1864004c4f481ae30ac26013a
+#+diffutils.e0bc68a52141be978abd92af880ae1fe0f6eaec0d3546a762236c1bd20d35969
+#+patch.b94c1791be3a7554e261b831f41b86935a1a71a30996c82abb3ff48c26696322
+#+flex.ea6330f51ea3d58adc3a52b992a02f5c4b97c649973ce762c8ae25a5294e1256
+#+bison.2c9225a2177ce3f816b2bf74dc5240128f24d4dc68ada00987b18eb611cf5477
+#+rsync.fb3383c402f9c2a52ab6aabadde6c83ab2232921618701a1d636c48337fdb54d
+#+zstd.0cbf996db5ca56ac24ed073774ea0a715d6098f8616b66a843e4d3f43ea51256
+#+libelf.5cb23d1e0468bc6464267f9e50e14b10db622d9c8a7dd0d7fcb1447d74536306
+#+pkgconf-pkg-config.372514298b015e24fd4e1bcbb58d5eb49288491ee504cb9c72449a1ad237568f
+#+nawk.a87fcebcbc9c8e087518e4f8ad55ada1a7fd87e8c60837cd09fe358850edbc7e
 #@untar:-J:sha256:7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764:.
 #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config
 #@sha256:ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417:noobjtool.patch
@@ -148,12 +148,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/lnstools:bootstrap b/variants/root-x86_64/lnstools:bootstrap
@@ -1,11 +1,11 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.a10740b4d168540b05ff4881969708c04cbb205d81bca01665b6f1d345aac53a
-#+gnu-make.881035ac01f8f90e4c6638ea00315ef51bd39143008cd9d646e79889d6b8f0ad
-#+busybox.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+skalibs.131a0253993040df85ff5a150e2c46a535d0139ec6c7fd6cf7454954714f733e
-#+execline.08ea7c28ac53ad27eabb2d95aa5a4885d1a352a758abbe0e898efa15fd22d932
-#+libcap.1e2431645b43a3f12e003914d714533a5338ec19a88bdccd8bee925d8c165a7e
+#+musl-cross-make.5b57720f5f046b3f5ab6e8fe087c986e88c32db011272a9af8f98f367ecf38d9
+#+gnu-make.20bc229dae170475c9ffb6d8396f923b65b019237c868f02cdfe157c22952e06
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+skalibs.55c40d95d593a76568eb5ba8ae7cb20ddc03b04243188a518041f0b7cb4a12c1
+#+execline.e865cb2be2beb2f1d395759dab15505477b997cbf7306a89829bb57d99939213
+#+libcap.a6919f7982b0ac6352dad0fcb61f6176b497fdcb34bd70b9a5968593abb19f54
 #@git:7fbfb934cdaa187a063a4df41498c06c46d4a6a9:lnstools
 
 
@@ -86,12 +86,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/logincaps b/variants/root-x86_64/logincaps
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+zsh.571047150db750d77921f5142fc610ff289f68e98c7ce1ae26d92c279694924e
-#+pthbs-banginstall.ed4d03e15da05a0615b406c90ed8e7e6e927e7a6173bc2d5306fc221d6b1dcee
-#+execline.912f56f686362df873d10a2c055d4329f34c336642f043e0dadc7f0c9e6406a7
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+ccx-utils.70a7723fcbfc547e310375e58e423b6c43cc7088e16128bbfb3413c907d81b71
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+zsh.79efcaa54bd6da0e331dc9acd6354c12fd73fb7db0b0fd8a6714fb3f09320c98
+#+pthbs-banginstall.53c1cc0fb914a45592217056f1f24cd8aab35f15922c0ed8eef2093603f7ebad
+#+execline.41cb65841ca776bf51e761e3edb1b9c6aa493f153243a2a3c80fbb9e419f1c3c
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+ccx-utils.79c97ea66b2dd0af18db08675c3503a914631699d9427a0e19671d5a80fef0a5
 #@git:409db79b3e7e5fc6b73305471d9bbb6ac5c14036:logincaps
 
 
@@ -149,12 +149,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/m4 b/variants/root-x86_64/m4
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
 
 
@@ -146,12 +146,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/mandoc b/variants/root-x86_64/mandoc
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
 #@untar:-z:sha256:8bf0d570f01e70a6e124884088870cbed7537f36328d512909eb10cd53179d9c:.
 
 
@@ -139,12 +139,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
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.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+zsh.571047150db750d77921f5142fc610ff289f68e98c7ce1ae26d92c279694924e
-#+pthbs-banginstall.ed4d03e15da05a0615b406c90ed8e7e6e927e7a6173bc2d5306fc221d6b1dcee
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+zsh.79efcaa54bd6da0e331dc9acd6354c12fd73fb7db0b0fd8a6714fb3f09320c98
+#+pthbs-banginstall.53c1cc0fb914a45592217056f1f24cd8aab35f15922c0ed8eef2093603f7ebad
 #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts
 
 
@@ -94,12 +94,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/mdevd b/variants/root-x86_64/mdevd
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+skalibs.8a95f938f13c8c9e002c6d584573d29aeb9a66f0b621b957f0d0d3b8994fecde
-#+execline.912f56f686362df873d10a2c055d4329f34c336642f043e0dadc7f0c9e6406a7
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+skalibs.a8e75cd5bcf5e86791be83aaa61313e4fdae64e216e0e95b64e5f2d51a4f059b
+#+execline.41cb65841ca776bf51e761e3edb1b9c6aa493f153243a2a3c80fbb9e419f1c3c
 #@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd
 
 
@@ -47,7 +47,7 @@ cd 'mdevd'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.8a95f938f13c8c9e002c6d584573d29aeb9a66f0b621b957f0d0d3b8994fecde/sysdeps' \
+	--with-sysdeps='/versions/skalibs.a8e75cd5bcf5e86791be83aaa61313e4fdae64e216e0e95b64e5f2d51a4f059b/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -108,12 +108,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
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.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-dosfstools.7031fd42e6a38b61039587593b2c49b888e5b4185dc3988833b62819519d566f
-#+busybox-e2fsprogs.b80d1814357274460c90397562cd9d8bfff0156ec301627a044a224031e81a0d
-#+busybox-iproute2.8acdc2ee3ff493e1402ceef21d34881f80f3fe4e14dcb505ccf22fc748a51601
-#+busybox-iputils.fced57f0fda2dadd1207d9fc0720950154b69e7f1ff9edd1a1daf24273b810c0
-#+busybox-net-misc.dc51cd8f3babfe1a9dc0e4c8247309f7d1affe48ef3af3bbc30f8f1b225315a9
-#+busybox-net-tools.ce51b186968bfbc461c80f484b86fa1de9da9fa2d53ec81398d6a4cd58aeb2d6
-#+busybox-traceroute.f9a4c85ba6712e44f3ca16e53f0d4034f0d88676b98bb092d75eb9662808aeae
-#+busybox-wget.328bd62d0bcbcb8e130f4681c9a3e580111018286961daba2ead14221de8b17c
-#+busybox-chpst.d530606301ad9b54c47e257fb5d065f901a3749e1d3a90b2f4831d69742f77dc
-#+busybox-console.b8f6a729bf3465c94a66a865c47585558d780a9a3fe949120a4cb354edac1bf0
-#+busybox-getty.1efb31d1e9744a943783b3fc033c407222da88beb97748e854da4c5a463aad04
-#+busybox-i2c-tools.9319d5243539945ae17d0cd7f3fa2dfe88d5f3ed5bf16397b70f963cc1231d6c
-#+busybox-linux-extra.bdfb3edbd4bf64ce6bd62befb48e12fe414f990153b1dbe475fb794c13a8987d
-#+busybox-mtd-utils.8256bf402897bab20b8412d04d2e7c13ee2b817cd4cf5c651a8d7c382c9cf73e
-#+busybox-shadow.149b43344c3ae8ab3a882880480cb54b23caba3ec5199a806b4e9de83c8e6050
-#+busybox-su.edf89124a8436c8c372462e822e41bb2e58af4871029673444c48f94a18c60ef
-#+busybox-util-linux-priv.484ff7a60600781cc65f39f95adcda1cae772875c187af0ebb60cf11ec0f7506
-#+busybox-logging.8dbce7a0bcda8f2a5614b8eeac9794a6cedc3ed69671879ef6500ed1e208e68c
-#+busybox-cron.2e1fde974ccdcf82e34efee75f00b4757c07bc68f21a2d043289965da45e1b13
-#+execline.912f56f686362df873d10a2c055d4329f34c336642f043e0dadc7f0c9e6406a7
-#+s6.e15d2bc7adb3cc287b1eb530ffca1a14c09399bfc936e069e7107fc6d37dcd9d
-#+mdev-scripts.53436eb11e3e65185046edd87ebc1c11b8b88855ff9d4a22f81ec58b7cc8be02
-#+mdevd.93ee473fec0bd9340ed85db564debab76a390d0fa9f37c42df8754831ac7e1be
-#+busybox-modutils.5c9e493ea0b22edcb7955df21115f482ef7e8ec8b5ebe5f5f9de05e11330567b-
\ No newline at end of file
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-dosfstools.ff53bc16862746e75cf7cdfd7782e3bc9060d41b863e03239bd4070f297e4c36
+#+busybox-e2fsprogs.86b5fd14348b2166e78221b417e1ba105de0e4f3a8e8c578b7917440fca44ddc
+#+busybox-iproute2.5c9dadcae94634b29387168c6972dfb59af8aba47c405fb85ad5b08ec9aa0fa4
+#+busybox-iputils.cd0332322258b01baca8a75e2451df4137bb73a50b71457a6273b5fcfafa90dd
+#+busybox-net-misc.0e49e082c24d459529517de321f7cc472ddee8747bc263eae0f9ac5f086e005e
+#+busybox-net-tools.46e8fa4978b9b53f5aab7f8337e598de36f69f5a2fc6fc9347ebc843c50529ae
+#+busybox-traceroute.abaa00a0a83b9feda45ae3a6db2203b90b573471e0a3b01ecec5c316f56effc0
+#+busybox-wget.fbf7b42830563a6a316f97077a52c7154b2c660b33d21df78e4a566f5e700d8b
+#+busybox-chpst.bfb32806d90cc939a1fac38262b12d7355832b7a3748652d1fadaa91aab6071d
+#+busybox-console.0c77e4daf48216217c3293c05e740be40d838f8235529dab339ad403b04314ba
+#+busybox-getty.e828c4ac540200683d3c58bb3dc869fc4066d24d42be8d6ea8efa10bec240c59
+#+busybox-i2c-tools.bfba6896dc8262a5ca403c55ede0b13f175109baa403f8e27b371211ae125104
+#+busybox-linux-extra.964adcdbedf8067a2d48f81a2d1f79f9cf1ab3be7be3b6513e0b006bb54730ba
+#+busybox-mtd-utils.b06188ea7c7d5820f5090faf494c12a54864c17a0e5420153fc271f356ecd61b
+#+busybox-shadow.b8c9dbbf7f474e8fd94ae677e1aa720389ac228f89ee746c766643551de7a55a
+#+busybox-su.37c33de457a2ccc2b1088cb43551d04bf38e0a8734616626ba632634e143bbf6
+#+busybox-util-linux-priv.168952f6b78fda2cb71495f09427c073f43b734f4db7b6c0f993e3ca2b5c91fc
+#+busybox-logging.e2804fdf47b651ef3ddc7ea413b01e34a952af0735e2c4b2ccb4109a0effe239
+#+busybox-cron.fc7587f014f13c8157598682e35fed45c18bd70f50a3a69460429d09bea136c4
+#+execline.41cb65841ca776bf51e761e3edb1b9c6aa493f153243a2a3c80fbb9e419f1c3c
+#+s6.536b1c09130f2a03270f6d9828f57ccf58f19e3bc9a5bad2235273467f1fb7c0
+#+mdev-scripts.f3312d0eaad8ec33e628845fb51e019e6ce5892bfad72b53b3b10647f7d8d688
+#+mdevd.08e47963e7c46d091b2f9734398def1079f01de08e6c9a4f143ef6e0936bdea9
+#+busybox-modutils.d1eb201f018a26dcf7c947ba4aea495d03226e17c88f6997a43d23df7c345849+
\ No newline at end of file
diff --git a/variants/root-x86_64/mlog b/variants/root-x86_64/mlog
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
 #@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog
 
 
@@ -121,12 +121,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/musl-cross-make b/variants/root-x86_64/musl-cross-make
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
-#+musl-cross-make.a10740b4d168540b05ff4881969708c04cbb205d81bca01665b6f1d345aac53a
-#+gnu-make.881035ac01f8f90e4c6638ea00315ef51bd39143008cd9d646e79889d6b8f0ad
-#+busybox.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
+#+musl-cross-make.5b57720f5f046b3f5ab6e8fe087c986e88c32db011272a9af8f98f367ecf38d9
+#+gnu-make.20bc229dae170475c9ffb6d8396f923b65b019237c868f02cdfe157c22952e06
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
 #@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
@@ -95,36 +95,6 @@ BEGIN {
 	x["./bin/x86_64-linux-musl-g++"]=1
 	x["./bin/x86_64-linux-musl-gcc"]=1
 
-	x["./x86_64-linux-musl/include/assert.h"]=1  # standard headers as per C11
-	x["./x86_64-linux-musl/include/complex.h"]=1
-	x["./x86_64-linux-musl/include/ctype.h"]=1
-	x["./x86_64-linux-musl/include/errno.h"]=1
-	x["./x86_64-linux-musl/include/fenv.h"]=1
-	x["./x86_64-linux-musl/include/float.h"]=1
-	x["./x86_64-linux-musl/include/inttypes.h"]=1
-	x["./x86_64-linux-musl/include/iso646.h"]=1
-	x["./x86_64-linux-musl/include/limits.h"]=1
-	x["./x86_64-linux-musl/include/locale.h"]=1
-	x["./x86_64-linux-musl/include/math.h"]=1
-	x["./x86_64-linux-musl/include/setjmp.h"]=1
-	x["./x86_64-linux-musl/include/signal.h"]=1
-	x["./x86_64-linux-musl/include/stdalign.h"]=1
-	x["./x86_64-linux-musl/include/stdarg.h"]=1
-	# x["./x86_64-linux-musl/include/stdatomic.h"]=1  # in ./lib/gcc/...
-	x["./x86_64-linux-musl/include/stdbool.h"]=1
-	x["./x86_64-linux-musl/include/stddef.h"]=1
-	x["./x86_64-linux-musl/include/stdint.h"]=1
-	x["./x86_64-linux-musl/include/stdio.h"]=1
-	x["./x86_64-linux-musl/include/stdlib.h"]=1
-	x["./x86_64-linux-musl/include/stdnoreturn.h"]=1
-	x["./x86_64-linux-musl/include/string.h"]=1
-	x["./x86_64-linux-musl/include/tgmath.h"]=1
-	x["./x86_64-linux-musl/include/threads.h"]=1
-	x["./x86_64-linux-musl/include/time.h"]=1
-	x["./x86_64-linux-musl/include/uchar.h"]=1
-	x["./x86_64-linux-musl/include/wchar.h"]=1
-	x["./x86_64-linux-musl/include/wctype.h"]=1
-
 	x["./lib/libgmp.a"]=1
 	x["./lib/libmpc.a"]=1
 	x["./lib/libmpfr.a"]=1
@@ -186,12 +156,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/musl-cross-make:bootstrap-0 b/variants/root-x86_64/musl-cross-make:bootstrap-0
@@ -59,36 +59,6 @@ find -type d -o -print | awk -F/ '
 BEGIN {
 	x["./bin/x86_64-linux-musl-g++"]=1
 	x["./bin/x86_64-linux-musl-gcc"]=1
-
-	x["./x86_64-linux-musl/include/assert.h"]=1  # standard headers as per C11
-	x["./x86_64-linux-musl/include/complex.h"]=1
-	x["./x86_64-linux-musl/include/ctype.h"]=1
-	x["./x86_64-linux-musl/include/errno.h"]=1
-	x["./x86_64-linux-musl/include/fenv.h"]=1
-	x["./x86_64-linux-musl/include/float.h"]=1
-	x["./x86_64-linux-musl/include/inttypes.h"]=1
-	x["./x86_64-linux-musl/include/iso646.h"]=1
-	x["./x86_64-linux-musl/include/limits.h"]=1
-	x["./x86_64-linux-musl/include/locale.h"]=1
-	x["./x86_64-linux-musl/include/math.h"]=1
-	x["./x86_64-linux-musl/include/setjmp.h"]=1
-	x["./x86_64-linux-musl/include/signal.h"]=1
-	x["./x86_64-linux-musl/include/stdalign.h"]=1
-	x["./x86_64-linux-musl/include/stdarg.h"]=1
-	# x["./x86_64-linux-musl/include/stdatomic.h"]=1  # in ./lib/gcc/...
-	x["./x86_64-linux-musl/include/stdbool.h"]=1
-	x["./x86_64-linux-musl/include/stddef.h"]=1
-	x["./x86_64-linux-musl/include/stdint.h"]=1
-	x["./x86_64-linux-musl/include/stdio.h"]=1
-	x["./x86_64-linux-musl/include/stdlib.h"]=1
-	x["./x86_64-linux-musl/include/stdnoreturn.h"]=1
-	x["./x86_64-linux-musl/include/string.h"]=1
-	x["./x86_64-linux-musl/include/tgmath.h"]=1
-	x["./x86_64-linux-musl/include/threads.h"]=1
-	x["./x86_64-linux-musl/include/time.h"]=1
-	x["./x86_64-linux-musl/include/uchar.h"]=1
-	x["./x86_64-linux-musl/include/wchar.h"]=1
-	x["./x86_64-linux-musl/include/wctype.h"]=1
 }
 
 function r1(s) {
@@ -137,12 +107,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/musl-cross-make:bootstrap-1 b/variants/root-x86_64/musl-cross-make:bootstrap-1
@@ -1,7 +1,7 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
 #@pragma:nopath
-#+musl-cross-make.981174325c44db66bb95f8f171a4e5a0a8b1be89cd3a37889281c3ac4d7fd9e1
+#+musl-cross-make.e0c88d40f488b74ef741b634910e9481eb382f2527c685faca9fbd97b8adb105
 #@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
@@ -21,7 +21,7 @@ prefix=/versions/$pthbs_package
 dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
-bootstrap=/versions/musl-cross-make.981174325c44db66bb95f8f171a4e5a0a8b1be89cd3a37889281c3ac4d7fd9e1
+bootstrap=/versions/musl-cross-make.e0c88d40f488b74ef741b634910e9481eb382f2527c685faca9fbd97b8adb105
 "$bootstrap/bin/x86_64-linux-musl-gcc" --version
 
 cat >musl-cross-make/config.mak <<EOF
@@ -68,36 +68,6 @@ find -type d -o -print | awk -F/ '
 BEGIN {
 	x["./bin/x86_64-linux-musl-g++"]=1
 	x["./bin/x86_64-linux-musl-gcc"]=1
-
-	x["./x86_64-linux-musl/include/assert.h"]=1  # standard headers as per C11
-	x["./x86_64-linux-musl/include/complex.h"]=1
-	x["./x86_64-linux-musl/include/ctype.h"]=1
-	x["./x86_64-linux-musl/include/errno.h"]=1
-	x["./x86_64-linux-musl/include/fenv.h"]=1
-	x["./x86_64-linux-musl/include/float.h"]=1
-	x["./x86_64-linux-musl/include/inttypes.h"]=1
-	x["./x86_64-linux-musl/include/iso646.h"]=1
-	x["./x86_64-linux-musl/include/limits.h"]=1
-	x["./x86_64-linux-musl/include/locale.h"]=1
-	x["./x86_64-linux-musl/include/math.h"]=1
-	x["./x86_64-linux-musl/include/setjmp.h"]=1
-	x["./x86_64-linux-musl/include/signal.h"]=1
-	x["./x86_64-linux-musl/include/stdalign.h"]=1
-	x["./x86_64-linux-musl/include/stdarg.h"]=1
-	# x["./x86_64-linux-musl/include/stdatomic.h"]=1  # in ./lib/gcc/...
-	x["./x86_64-linux-musl/include/stdbool.h"]=1
-	x["./x86_64-linux-musl/include/stddef.h"]=1
-	x["./x86_64-linux-musl/include/stdint.h"]=1
-	x["./x86_64-linux-musl/include/stdio.h"]=1
-	x["./x86_64-linux-musl/include/stdlib.h"]=1
-	x["./x86_64-linux-musl/include/stdnoreturn.h"]=1
-	x["./x86_64-linux-musl/include/string.h"]=1
-	x["./x86_64-linux-musl/include/tgmath.h"]=1
-	x["./x86_64-linux-musl/include/threads.h"]=1
-	x["./x86_64-linux-musl/include/time.h"]=1
-	x["./x86_64-linux-musl/include/uchar.h"]=1
-	x["./x86_64-linux-musl/include/wchar.h"]=1
-	x["./x86_64-linux-musl/include/wctype.h"]=1
 }
 
 function r1(s) {
@@ -146,12 +116,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/musl-fts b/variants/root-x86_64/musl-fts
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
 #@untar:-z:sha256:49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6:.
 
 
@@ -118,12 +118,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/nawk b/variants/root-x86_64/nawk
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+bison.0b6d9127e38a3ba37eeb962761b8e27c532f5fc6e152970625c235d8146c59ab
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+bison.2c9225a2177ce3f816b2bf74dc5240128f24d4dc68ada00987b18eb611cf5477
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
 #@untar:-z:sha256:e031b1e1d2b230f276f975bffb923f0ea15f798c839d15a3f26a1a39448e32d7:.
 
 
@@ -97,12 +97,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/netbsd-curses b/variants/root-x86_64/netbsd-curses
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
 #@git:51d179dad861640caeb76674b5908ccd79f04fae:netbsd-curses
 
 
@@ -110,12 +110,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/ocaml-astring b/variants/root-x86_64/ocaml-astring
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+ocaml.069c6cc4ab715e5b0deb3bb2772c1cb535c4d9493499d62f0698e93c8d839a8f
-#+ocaml-findlib.9eed0d63e1af96e69ed267641d8d63109590ac43dbe28faede41adf2d61cc4cd
-#+ocamlbuild.8ca3379cd7bae5a484c6df37d181f29cabffff6309827265224c72b6952dff35
-#+opam.1459e5b8754cb083c909c4cf9282076cc7f2e8fb0e6c9561336d8eb8f7c918a9
-#+ocaml-topkg.004d4ed66e63ff120cc37710f3b5f7455da87a4e126d32ef305e012e3169b37d
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+ocaml.dacec2c58e92d993b290fc5d51fd5368b93d918a21d89c85aa77e9c571f92c84
+#+ocaml-findlib.058cbbd7286cfb72ddb0adce92b3d42269c1ebb3e8d119e9df89fef5eaf60fac
+#+ocamlbuild.2c7d6f454dd19a0b48f77898a0a082de00b2d1110ae69a5593ecd2f4c8029b03
+#+opam.129dca875c2b96264a6496522b19ea359852fabc8e2787e3921d4155c3b3e8e2
+#+ocaml-topkg.2b1725df80073d1a50300e43a9613ef8383eb364c7a3529444dc0309f1751d80
 #@untar:-j:sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa:.
 
 
@@ -116,12 +116,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/ocaml-base b/variants/root-x86_64/ocaml-base
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+ocaml.069c6cc4ab715e5b0deb3bb2772c1cb535c4d9493499d62f0698e93c8d839a8f
-#+dune.bc73536d6dc95b4b25ad257c669347e7e92485a1ad4d0cd9251012ffee04fb8d
-#+ocaml_intrinsics_kernel.1da11b37e970e86db91ca6122b8a7f761865188c5e957e2f0edf01ed2d4943af
-#+ocaml-sexplib0.d26b351da38194eba12bb3b90073fc775ccd72ff9a67aa51188387b3b889b888
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+ocaml.dacec2c58e92d993b290fc5d51fd5368b93d918a21d89c85aa77e9c571f92c84
+#+dune.2b3c4851054e618e2c59d068d0e5ffd80c8016df434caae2f9829f4e60b1a995
+#+ocaml_intrinsics_kernel.0ce020f8b3b4dd4091e1b0cda0598ef1fa99c5d32d0294d66e1cfe6d1ce7e198
+#+ocaml-sexplib0.bf92255b9df533d9230b09feae5089ed9ba35fe6b33d95e00bbcbb6482fb42cc
 #@untar:-z:sha256:3f3f64789ab25bb5cb7f5f907dd651dec9cc9440981822fe75df6b94344b7208:.
 
 
@@ -123,12 +123,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/ocaml-bos b/variants/root-x86_64/ocaml-bos
@@ -1,45 +1,45 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+ocaml.069c6cc4ab715e5b0deb3bb2772c1cb535c4d9493499d62f0698e93c8d839a8f
-#+ocaml-findlib.9eed0d63e1af96e69ed267641d8d63109590ac43dbe28faede41adf2d61cc4cd
-#+ocamlbuild.8ca3379cd7bae5a484c6df37d181f29cabffff6309827265224c72b6952dff35
-#+opam.1459e5b8754cb083c909c4cf9282076cc7f2e8fb0e6c9561336d8eb8f7c918a9
-#+ocaml-topkg.004d4ed66e63ff120cc37710f3b5f7455da87a4e126d32ef305e012e3169b37d
-#+ocaml-astring.1db31339540b545d957da9b6e94020f1227f6255c759f78124ba4a5fd46721c2
-#+ocaml-fpath.5ac3e554ea6c2501b7be5fcf32d12ae1256726069da7704ce4338d29bb7e83a2
-#+ocaml-rresult.68a3723b4a4c439887feeab7878ae87c801e4507590a011f5996d8820c13e4c3
-#+ocaml-fmt.2698206f31649a4dc6d73b39d23caf740a4a003a2b5596e11cd5e79b9066da59
-#+ocaml-logs.459776653a4fff8d8593c7e56e8fcb912036eb5928e5588d680079526dda6d81
-#+ocaml-mtime.29c774c015a8d8811306b2f88e34565b6e063052cd6679b635c234d4b7d0c0f6
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+ocaml.dacec2c58e92d993b290fc5d51fd5368b93d918a21d89c85aa77e9c571f92c84
+#+ocaml-findlib.058cbbd7286cfb72ddb0adce92b3d42269c1ebb3e8d119e9df89fef5eaf60fac
+#+ocamlbuild.2c7d6f454dd19a0b48f77898a0a082de00b2d1110ae69a5593ecd2f4c8029b03
+#+opam.129dca875c2b96264a6496522b19ea359852fabc8e2787e3921d4155c3b3e8e2
+#+ocaml-topkg.2b1725df80073d1a50300e43a9613ef8383eb364c7a3529444dc0309f1751d80
+#+ocaml-astring.76f2ad6f44fea02a25328ba7f25849e5dcac7b26a50968dbea7921beebbfa1fd
+#+ocaml-fpath.b74207bf0c7ad868f5cb3dc855e93d68d9b0a979dbf6dc03f7ae6f7af67f2f2d
+#+ocaml-rresult.5438699417e5cf55cc04c5588e773a6fc925ee439d0957893719bcafa9dcca04
+#+ocaml-fmt.54843599508f133d403bd62cf57677575391c4b32ce06cb64c96f84f46ecbdad
+#+ocaml-logs.194e0315bae775922f0a0e054567806d762549e22f6cff32dd123ecca1903dda
+#+ocaml-mtime.3d80294edd6d22ab931551a12ce000d113ebaa8486fee4c9823f5ee204c922a1
 #@untar:-j:sha256:d8d62e786b10d697e0457205a8eedeaa27ebcc90f1855f18df190cac2e3d8f37:.
 
 
@@ -122,12 +122,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/ocaml-cmdliner b/variants/root-x86_64/ocaml-cmdliner
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+ocaml.069c6cc4ab715e5b0deb3bb2772c1cb535c4d9493499d62f0698e93c8d839a8f
-#+ocaml-findlib.9eed0d63e1af96e69ed267641d8d63109590ac43dbe28faede41adf2d61cc4cd
-#+ocamlbuild.8ca3379cd7bae5a484c6df37d181f29cabffff6309827265224c72b6952dff35
-#+opam.1459e5b8754cb083c909c4cf9282076cc7f2e8fb0e6c9561336d8eb8f7c918a9
-#+ocaml-topkg.004d4ed66e63ff120cc37710f3b5f7455da87a4e126d32ef305e012e3169b37d
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+ocaml.dacec2c58e92d993b290fc5d51fd5368b93d918a21d89c85aa77e9c571f92c84
+#+ocaml-findlib.058cbbd7286cfb72ddb0adce92b3d42269c1ebb3e8d119e9df89fef5eaf60fac
+#+ocamlbuild.2c7d6f454dd19a0b48f77898a0a082de00b2d1110ae69a5593ecd2f4c8029b03
+#+opam.129dca875c2b96264a6496522b19ea359852fabc8e2787e3921d4155c3b3e8e2
+#+ocaml-topkg.2b1725df80073d1a50300e43a9613ef8383eb364c7a3529444dc0309f1751d80
 #@untar:-j:sha256:4e547a631c36fbaadff60d3bd7724eb3f83ba274e92fb725950bae7868378582:.
 
 
@@ -116,12 +116,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/ocaml-compiler-libs b/variants/root-x86_64/ocaml-compiler-libs
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+ocaml.069c6cc4ab715e5b0deb3bb2772c1cb535c4d9493499d62f0698e93c8d839a8f
-#+dune.bc73536d6dc95b4b25ad257c669347e7e92485a1ad4d0cd9251012ffee04fb8d
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+ocaml.dacec2c58e92d993b290fc5d51fd5368b93d918a21d89c85aa77e9c571f92c84
+#+dune.2b3c4851054e618e2c59d068d0e5ffd80c8016df434caae2f9829f4e60b1a995
 #@untar:-z:sha256:9b9644d7351db699e57ddba7c767bb4153e6e988ccf45ead2fb238a3bd75cdc7:.
 
 
@@ -119,12 +119,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/ocaml-cppo b/variants/root-x86_64/ocaml-cppo
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+ocaml.069c6cc4ab715e5b0deb3bb2772c1cb535c4d9493499d62f0698e93c8d839a8f
-#+dune.bc73536d6dc95b4b25ad257c669347e7e92485a1ad4d0cd9251012ffee04fb8d
-#+ocamlbuild.8ca3379cd7bae5a484c6df37d181f29cabffff6309827265224c72b6952dff35
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+ocaml.dacec2c58e92d993b290fc5d51fd5368b93d918a21d89c85aa77e9c571f92c84
+#+dune.2b3c4851054e618e2c59d068d0e5ffd80c8016df434caae2f9829f4e60b1a995
+#+ocamlbuild.2c7d6f454dd19a0b48f77898a0a082de00b2d1110ae69a5593ecd2f4c8029b03
 #@untar:-z:sha256:6e62a8ee0217c9cc38d5860110eb18eb8d89c05c420353d298e1431fe8bac00f:.
 
 
@@ -124,12 +124,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/ocaml-findlib b/variants/root-x86_64/ocaml-findlib
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+m4.e358494a1ecfd280e744f59b421b66fb94fb9d3500b2177883a9bb654e279519
-#+netbsd-curses.563ebb997e40ddd17d0805bc058a42cd15fc7cdaf78a4936a6b5a25ee1612852
-#+ocaml.069c6cc4ab715e5b0deb3bb2772c1cb535c4d9493499d62f0698e93c8d839a8f
-#+ocamlbuild.8ca3379cd7bae5a484c6df37d181f29cabffff6309827265224c72b6952dff35
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+m4.fc418033f7f1a83dae7f43d369b5d9f2ad19c0838ad5731e41acfa6dd16e74b8
+#+netbsd-curses.2fe4866b061aa9fbdb83e108a0f3d2c835f87ce192bce40c4aebf1e51c74cd91
+#+ocaml.dacec2c58e92d993b290fc5d51fd5368b93d918a21d89c85aa77e9c571f92c84
+#+ocamlbuild.2c7d6f454dd19a0b48f77898a0a082de00b2d1110ae69a5593ecd2f4c8029b03
 #@untar:-z:sha256:662c910f774e9fee3a19c4e057f380581ab2fc4ee52da4761304ac9c31b8869d:.
 
 
@@ -53,7 +53,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/versions/musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/versions/musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
 			return 0
 			;;
 		(*)
@@ -79,7 +79,7 @@ cd 'findlib-1.9.8'
 make -j1 all opt
 
 # workaround `topfind` getting installed to stdlib directory, this is not configurable
-stdlib="$pthbs_destdir/versions/ocaml.069c6cc4ab715e5b0deb3bb2772c1cb535c4d9493499d62f0698e93c8d839a8f"
+stdlib="$pthbs_destdir/versions/ocaml.dacec2c58e92d993b290fc5d51fd5368b93d918a21d89c85aa77e9c571f92c84"
 mkdir -p "${stdlib%/*}"
 ln -s "$pthbs_package" "$stdlib"
 make install prefix="$pthbs_destdir"
@@ -153,12 +153,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/ocaml-fmt b/variants/root-x86_64/ocaml-fmt
@@ -1,40 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+ocaml.069c6cc4ab715e5b0deb3bb2772c1cb535c4d9493499d62f0698e93c8d839a8f
-#+ocaml-findlib.9eed0d63e1af96e69ed267641d8d63109590ac43dbe28faede41adf2d61cc4cd
-#+ocamlbuild.8ca3379cd7bae5a484c6df37d181f29cabffff6309827265224c72b6952dff35
-#+opam.1459e5b8754cb083c909c4cf9282076cc7f2e8fb0e6c9561336d8eb8f7c918a9
-#+ocaml-topkg.004d4ed66e63ff120cc37710f3b5f7455da87a4e126d32ef305e012e3169b37d
-#+ocaml-cmdliner.f2c02769133a7f7b413b36aaad151482875ee78c2240b1806995a36b6c7da86b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+ocaml.dacec2c58e92d993b290fc5d51fd5368b93d918a21d89c85aa77e9c571f92c84
+#+ocaml-findlib.058cbbd7286cfb72ddb0adce92b3d42269c1ebb3e8d119e9df89fef5eaf60fac
+#+ocamlbuild.2c7d6f454dd19a0b48f77898a0a082de00b2d1110ae69a5593ecd2f4c8029b03
+#+opam.129dca875c2b96264a6496522b19ea359852fabc8e2787e3921d4155c3b3e8e2
+#+ocaml-topkg.2b1725df80073d1a50300e43a9613ef8383eb364c7a3529444dc0309f1751d80
+#+ocaml-cmdliner.3ab95f6ef4d63948c7c51a920bbc00ae938e887a1a0c5217b194804fbffdcc06
 #@untar:-j:sha256:857cfd47a54b52429cd9b3e2665e44173cd1bd3b435bece7172f984ad5376a1b:.
 
 
@@ -117,12 +117,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/ocaml-fpath b/variants/root-x86_64/ocaml-fpath
@@ -1,40 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+ocaml.069c6cc4ab715e5b0deb3bb2772c1cb535c4d9493499d62f0698e93c8d839a8f
-#+ocaml-findlib.9eed0d63e1af96e69ed267641d8d63109590ac43dbe28faede41adf2d61cc4cd
-#+ocamlbuild.8ca3379cd7bae5a484c6df37d181f29cabffff6309827265224c72b6952dff35
-#+opam.1459e5b8754cb083c909c4cf9282076cc7f2e8fb0e6c9561336d8eb8f7c918a9
-#+ocaml-topkg.004d4ed66e63ff120cc37710f3b5f7455da87a4e126d32ef305e012e3169b37d
-#+ocaml-astring.1db31339540b545d957da9b6e94020f1227f6255c759f78124ba4a5fd46721c2
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+ocaml.dacec2c58e92d993b290fc5d51fd5368b93d918a21d89c85aa77e9c571f92c84
+#+ocaml-findlib.058cbbd7286cfb72ddb0adce92b3d42269c1ebb3e8d119e9df89fef5eaf60fac
+#+ocamlbuild.2c7d6f454dd19a0b48f77898a0a082de00b2d1110ae69a5593ecd2f4c8029b03
+#+opam.129dca875c2b96264a6496522b19ea359852fabc8e2787e3921d4155c3b3e8e2
+#+ocaml-topkg.2b1725df80073d1a50300e43a9613ef8383eb364c7a3529444dc0309f1751d80
+#+ocaml-astring.76f2ad6f44fea02a25328ba7f25849e5dcac7b26a50968dbea7921beebbfa1fd
 #@untar:-j:sha256:12b08ff192d037d9b6d69e9ca19d1d385184f20b3237c27231e437ac81ace70f:.
 
 
@@ -117,12 +117,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/ocaml-logs b/variants/root-x86_64/ocaml-logs
@@ -1,42 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+ocaml.069c6cc4ab715e5b0deb3bb2772c1cb535c4d9493499d62f0698e93c8d839a8f
-#+ocaml-findlib.9eed0d63e1af96e69ed267641d8d63109590ac43dbe28faede41adf2d61cc4cd
-#+ocamlbuild.8ca3379cd7bae5a484c6df37d181f29cabffff6309827265224c72b6952dff35
-#+opam.1459e5b8754cb083c909c4cf9282076cc7f2e8fb0e6c9561336d8eb8f7c918a9
-#+ocaml-topkg.004d4ed66e63ff120cc37710f3b5f7455da87a4e126d32ef305e012e3169b37d
-#+ocaml-mtime.29c774c015a8d8811306b2f88e34565b6e063052cd6679b635c234d4b7d0c0f6
-#+ocaml-cmdliner.f2c02769133a7f7b413b36aaad151482875ee78c2240b1806995a36b6c7da86b
-#+ocaml-fmt.2698206f31649a4dc6d73b39d23caf740a4a003a2b5596e11cd5e79b9066da59
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+ocaml.dacec2c58e92d993b290fc5d51fd5368b93d918a21d89c85aa77e9c571f92c84
+#+ocaml-findlib.058cbbd7286cfb72ddb0adce92b3d42269c1ebb3e8d119e9df89fef5eaf60fac
+#+ocamlbuild.2c7d6f454dd19a0b48f77898a0a082de00b2d1110ae69a5593ecd2f4c8029b03
+#+opam.129dca875c2b96264a6496522b19ea359852fabc8e2787e3921d4155c3b3e8e2
+#+ocaml-topkg.2b1725df80073d1a50300e43a9613ef8383eb364c7a3529444dc0309f1751d80
+#+ocaml-mtime.3d80294edd6d22ab931551a12ce000d113ebaa8486fee4c9823f5ee204c922a1
+#+ocaml-cmdliner.3ab95f6ef4d63948c7c51a920bbc00ae938e887a1a0c5217b194804fbffdcc06
+#+ocaml-fmt.54843599508f133d403bd62cf57677575391c4b32ce06cb64c96f84f46ecbdad
 #@untar:-j:sha256:ee97065ba41ce28f19dea9453c6bec4e0ef26165ad7394c4131ea0c65c0f06d5:.
 
 
@@ -124,12 +124,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/ocaml-lun b/variants/root-x86_64/ocaml-lun
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+ocaml.069c6cc4ab715e5b0deb3bb2772c1cb535c4d9493499d62f0698e93c8d839a8f
-#+dune.bc73536d6dc95b4b25ad257c669347e7e92485a1ad4d0cd9251012ffee04fb8d
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+ocaml.dacec2c58e92d993b290fc5d51fd5368b93d918a21d89c85aa77e9c571f92c84
+#+dune.2b3c4851054e618e2c59d068d0e5ffd80c8016df434caae2f9829f4e60b1a995
 #@untar:-j:sha256:cca8badff83b470fdcfb1840116f8e8a6f2cb86cde2f44ed28cf26cbf692a793:.
 
 
@@ -122,12 +122,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/ocaml-mtime b/variants/root-x86_64/ocaml-mtime
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+ocaml.069c6cc4ab715e5b0deb3bb2772c1cb535c4d9493499d62f0698e93c8d839a8f
-#+ocaml-findlib.9eed0d63e1af96e69ed267641d8d63109590ac43dbe28faede41adf2d61cc4cd
-#+ocamlbuild.8ca3379cd7bae5a484c6df37d181f29cabffff6309827265224c72b6952dff35
-#+opam.1459e5b8754cb083c909c4cf9282076cc7f2e8fb0e6c9561336d8eb8f7c918a9
-#+ocaml-topkg.004d4ed66e63ff120cc37710f3b5f7455da87a4e126d32ef305e012e3169b37d
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+ocaml.dacec2c58e92d993b290fc5d51fd5368b93d918a21d89c85aa77e9c571f92c84
+#+ocaml-findlib.058cbbd7286cfb72ddb0adce92b3d42269c1ebb3e8d119e9df89fef5eaf60fac
+#+ocamlbuild.2c7d6f454dd19a0b48f77898a0a082de00b2d1110ae69a5593ecd2f4c8029b03
+#+opam.129dca875c2b96264a6496522b19ea359852fabc8e2787e3921d4155c3b3e8e2
+#+ocaml-topkg.2b1725df80073d1a50300e43a9613ef8383eb364c7a3529444dc0309f1751d80
 #@untar:-j:sha256:097cb2802e3701ead9572e1b483d5a28c6e2f0a39449faaf9b44ad8a89834d88:.
 
 
@@ -116,12 +116,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/ocaml-ppx_derivers b/variants/root-x86_64/ocaml-ppx_derivers
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+ocaml.069c6cc4ab715e5b0deb3bb2772c1cb535c4d9493499d62f0698e93c8d839a8f
-#+dune.bc73536d6dc95b4b25ad257c669347e7e92485a1ad4d0cd9251012ffee04fb8d
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+ocaml.dacec2c58e92d993b290fc5d51fd5368b93d918a21d89c85aa77e9c571f92c84
+#+dune.2b3c4851054e618e2c59d068d0e5ffd80c8016df434caae2f9829f4e60b1a995
 #@untar:-z:sha256:b6595ee187dea792b31fc54a0e1524ab1e48bc6068d3066c45215a138cc73b95:.
 
 
@@ -124,12 +124,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/ocaml-ppx_deriving b/variants/root-x86_64/ocaml-ppx_deriving
@@ -1,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+ocaml.069c6cc4ab715e5b0deb3bb2772c1cb535c4d9493499d62f0698e93c8d839a8f
-#+dune.bc73536d6dc95b4b25ad257c669347e7e92485a1ad4d0cd9251012ffee04fb8d
-#+ocaml-compiler-libs.90baaaf383ee8a10ac851295ddec1c6772d9a55e8b9cea458dbed5e9682478ad
-#+ocaml-cppo.417a8f524d5cb3ea5dc305348999fabf52d11beb4ebb24f9c0ff4489023b6119
-#+ocaml-findlib.9eed0d63e1af96e69ed267641d8d63109590ac43dbe28faede41adf2d61cc4cd
-#+ocaml-ppx_derivers.1a089280feed6f264a77e4ba771cad046097c028162ce68f1c059467b2fe7ae9
-#+ocaml-ppxlib.18f50d639ae4cfef6cab86fb1b23e67d06ff10c9303ccc8e315f8f731b8c3246
-#+ocaml-sexplib0.d26b351da38194eba12bb3b90073fc775ccd72ff9a67aa51188387b3b889b888
-#+ocaml-stdlib-shims.edb9939292039f9c1e67e57f955d57d4cf7cf799881700e6f5b5b2d0f58d6859
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+ocaml.dacec2c58e92d993b290fc5d51fd5368b93d918a21d89c85aa77e9c571f92c84
+#+dune.2b3c4851054e618e2c59d068d0e5ffd80c8016df434caae2f9829f4e60b1a995
+#+ocaml-compiler-libs.b78e67aaa65d4bde02e8611fc524c7db4e7e771128e0335a5b4936c812f0f8e2
+#+ocaml-cppo.d69e26a14adae89076ee79ae911ac8f3e44aa9310a302c74c1c06dc10a19b89f
+#+ocaml-findlib.058cbbd7286cfb72ddb0adce92b3d42269c1ebb3e8d119e9df89fef5eaf60fac
+#+ocaml-ppx_derivers.c3de0abedde163f8e85dfd1a7fc7762d0c46bf3cee957e2f86961538d7b94b80
+#+ocaml-ppxlib.80aad04e2a70c21d6cd43f107a9886d418c027b990ca541d6b0707bbf842ec4d
+#+ocaml-sexplib0.bf92255b9df533d9230b09feae5089ed9ba35fe6b33d95e00bbcbb6482fb42cc
+#+ocaml-stdlib-shims.177094d34f05069a0b4801f23cf8dc0167491aad0154e297b99638a48a5ab7d7
 #@untar:-z:sha256:c91d1ea5e15e6928a2f8947dbd135b9f765cc0e2d72be271427981afcd350c24:.
 
 
@@ -126,12 +126,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/ocaml-ppxlib b/variants/root-x86_64/ocaml-ppxlib
@@ -1,40 +1,40 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+ocaml.069c6cc4ab715e5b0deb3bb2772c1cb535c4d9493499d62f0698e93c8d839a8f
-#+dune.bc73536d6dc95b4b25ad257c669347e7e92485a1ad4d0cd9251012ffee04fb8d
-#+ocaml-compiler-libs.90baaaf383ee8a10ac851295ddec1c6772d9a55e8b9cea458dbed5e9682478ad
-#+ocaml-ppx_derivers.1a089280feed6f264a77e4ba771cad046097c028162ce68f1c059467b2fe7ae9
-#+ocaml-sexplib0.d26b351da38194eba12bb3b90073fc775ccd72ff9a67aa51188387b3b889b888
-#+ocaml-stdlib-shims.edb9939292039f9c1e67e57f955d57d4cf7cf799881700e6f5b5b2d0f58d6859
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+ocaml.dacec2c58e92d993b290fc5d51fd5368b93d918a21d89c85aa77e9c571f92c84
+#+dune.2b3c4851054e618e2c59d068d0e5ffd80c8016df434caae2f9829f4e60b1a995
+#+ocaml-compiler-libs.b78e67aaa65d4bde02e8611fc524c7db4e7e771128e0335a5b4936c812f0f8e2
+#+ocaml-ppx_derivers.c3de0abedde163f8e85dfd1a7fc7762d0c46bf3cee957e2f86961538d7b94b80
+#+ocaml-sexplib0.bf92255b9df533d9230b09feae5089ed9ba35fe6b33d95e00bbcbb6482fb42cc
+#+ocaml-stdlib-shims.177094d34f05069a0b4801f23cf8dc0167491aad0154e297b99638a48a5ab7d7
 #@untar:-j:sha256:2e223837e7cecc3bc84a432432c0a72f4e1d5be9165c9c33772f156db85db0b3:.
 
 
@@ -124,12 +124,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/ocaml-rresult b/variants/root-x86_64/ocaml-rresult
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+ocaml.069c6cc4ab715e5b0deb3bb2772c1cb535c4d9493499d62f0698e93c8d839a8f
-#+ocaml-findlib.9eed0d63e1af96e69ed267641d8d63109590ac43dbe28faede41adf2d61cc4cd
-#+ocamlbuild.8ca3379cd7bae5a484c6df37d181f29cabffff6309827265224c72b6952dff35
-#+opam.1459e5b8754cb083c909c4cf9282076cc7f2e8fb0e6c9561336d8eb8f7c918a9
-#+ocaml-topkg.004d4ed66e63ff120cc37710f3b5f7455da87a4e126d32ef305e012e3169b37d
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+ocaml.dacec2c58e92d993b290fc5d51fd5368b93d918a21d89c85aa77e9c571f92c84
+#+ocaml-findlib.058cbbd7286cfb72ddb0adce92b3d42269c1ebb3e8d119e9df89fef5eaf60fac
+#+ocamlbuild.2c7d6f454dd19a0b48f77898a0a082de00b2d1110ae69a5593ecd2f4c8029b03
+#+opam.129dca875c2b96264a6496522b19ea359852fabc8e2787e3921d4155c3b3e8e2
+#+ocaml-topkg.2b1725df80073d1a50300e43a9613ef8383eb364c7a3529444dc0309f1751d80
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
@@ -116,12 +116,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/ocaml-sexplib0 b/variants/root-x86_64/ocaml-sexplib0
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+ocaml.069c6cc4ab715e5b0deb3bb2772c1cb535c4d9493499d62f0698e93c8d839a8f
-#+dune.bc73536d6dc95b4b25ad257c669347e7e92485a1ad4d0cd9251012ffee04fb8d
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+ocaml.dacec2c58e92d993b290fc5d51fd5368b93d918a21d89c85aa77e9c571f92c84
+#+dune.2b3c4851054e618e2c59d068d0e5ffd80c8016df434caae2f9829f4e60b1a995
 #@untar:-z:sha256:86dba26468194512f789f2fb709063515a9cb4e5c4461c021c239a369590701d:.
 
 
@@ -119,12 +119,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/ocaml-stdlib-shims b/variants/root-x86_64/ocaml-stdlib-shims
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+ocaml.069c6cc4ab715e5b0deb3bb2772c1cb535c4d9493499d62f0698e93c8d839a8f
-#+dune.bc73536d6dc95b4b25ad257c669347e7e92485a1ad4d0cd9251012ffee04fb8d
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+ocaml.dacec2c58e92d993b290fc5d51fd5368b93d918a21d89c85aa77e9c571f92c84
+#+dune.2b3c4851054e618e2c59d068d0e5ffd80c8016df434caae2f9829f4e60b1a995
 #@untar:-j:sha256:babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a:.
 
 
@@ -118,12 +118,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/ocaml-topkg b/variants/root-x86_64/ocaml-topkg
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+ocaml.069c6cc4ab715e5b0deb3bb2772c1cb535c4d9493499d62f0698e93c8d839a8f
-#+ocaml-findlib.9eed0d63e1af96e69ed267641d8d63109590ac43dbe28faede41adf2d61cc4cd
-#+ocamlbuild.8ca3379cd7bae5a484c6df37d181f29cabffff6309827265224c72b6952dff35
-#+opam.1459e5b8754cb083c909c4cf9282076cc7f2e8fb0e6c9561336d8eb8f7c918a9
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+ocaml.dacec2c58e92d993b290fc5d51fd5368b93d918a21d89c85aa77e9c571f92c84
+#+ocaml-findlib.058cbbd7286cfb72ddb0adce92b3d42269c1ebb3e8d119e9df89fef5eaf60fac
+#+ocamlbuild.2c7d6f454dd19a0b48f77898a0a082de00b2d1110ae69a5593ecd2f4c8029b03
+#+opam.129dca875c2b96264a6496522b19ea359852fabc8e2787e3921d4155c3b3e8e2
 #@untar:-j:sha256:452082626e651ac4b1633c2b4ae4cad7abeb1fb6a13046e699f95eec58b5d1c7:.
 
 
@@ -115,12 +115,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
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.069c6cc4ab715e5b0deb3bb2772c1cb535c4d9493499d62f0698e93c8d839a8f
-#+dune.bc73536d6dc95b4b25ad257c669347e7e92485a1ad4d0cd9251012ffee04fb8d
-#+ocamlbuild.8ca3379cd7bae5a484c6df37d181f29cabffff6309827265224c72b6952dff35
-#+ocaml-base.fb06d01759bf3c4d2c44f75d0f306df66269aeccedaf529660fa4d6604d0ab8a
-#+opam.1459e5b8754cb083c909c4cf9282076cc7f2e8fb0e6c9561336d8eb8f7c918a9
-#+ocaml-bos.a889c0b2dfe014ec1db7b33e6b4ad77232e74bcaec879d1c7f2923c550d81b12
-#+ocaml-lun.d303c6c9708ef2681b8ae29f17d230f0809d58d40168dffa4022240fd9e45972
-#+ocaml-ppx_deriving.1cb440bfdd05316d537ee5a3ebcb4ee2a851125365a538d23a991486abeab221-
\ No newline at end of file
+#+ocaml.dacec2c58e92d993b290fc5d51fd5368b93d918a21d89c85aa77e9c571f92c84
+#+dune.2b3c4851054e618e2c59d068d0e5ffd80c8016df434caae2f9829f4e60b1a995
+#+ocamlbuild.2c7d6f454dd19a0b48f77898a0a082de00b2d1110ae69a5593ecd2f4c8029b03
+#+ocaml-base.f62f4fee96459e9be1f94209d1c57ca38015127de10cc97f5bf0978ce94ef19d
+#+opam.129dca875c2b96264a6496522b19ea359852fabc8e2787e3921d4155c3b3e8e2
+#+ocaml-bos.76efc8aa354c94abee5129dcc5d1b90c976bcdeae9db461049534788c22da9ec
+#+ocaml-lun.75ab8a7e703a4d3eef443f98f58abd7f8e6e726cdb2844871dfd2e30e0b9b303
+#+ocaml-ppx_deriving.c4846d943aa2f373b06508e957053be9eafbda1641f21cfe1fb475b6bbf790a8+
\ No newline at end of file
diff --git a/variants/root-x86_64/ocaml:dynlink b/variants/root-x86_64/ocaml:dynlink
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+m4.e358494a1ecfd280e744f59b421b66fb94fb9d3500b2177883a9bb654e279519
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+m4.fc418033f7f1a83dae7f43d369b5d9f2ad19c0838ad5731e41acfa6dd16e74b8
 #@untar:-J:sha256:dfaa8a2e11c799bc1765d8bef44911406ee5f4803027190382a939f88c912266:.
 
 
@@ -136,12 +136,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/ocaml_intrinsics_kernel b/variants/root-x86_64/ocaml_intrinsics_kernel
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+ocaml.069c6cc4ab715e5b0deb3bb2772c1cb535c4d9493499d62f0698e93c8d839a8f
-#+dune.bc73536d6dc95b4b25ad257c669347e7e92485a1ad4d0cd9251012ffee04fb8d
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+ocaml.dacec2c58e92d993b290fc5d51fd5368b93d918a21d89c85aa77e9c571f92c84
+#+dune.2b3c4851054e618e2c59d068d0e5ffd80c8016df434caae2f9829f4e60b1a995
 #@untar:-z:sha256:c988b7769a59749631c3c98ba5edd1d2fe91f5dc380b5e0593c073c92f4bee01:.
 
 
@@ -112,12 +112,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/ocamlbuild b/variants/root-x86_64/ocamlbuild
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+m4.e358494a1ecfd280e744f59b421b66fb94fb9d3500b2177883a9bb654e279519
-#+ocaml.069c6cc4ab715e5b0deb3bb2772c1cb535c4d9493499d62f0698e93c8d839a8f
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+m4.fc418033f7f1a83dae7f43d369b5d9f2ad19c0838ad5731e41acfa6dd16e74b8
+#+ocaml.dacec2c58e92d993b290fc5d51fd5368b93d918a21d89c85aa77e9c571f92c84
 #@untar:-z:sha256:2ba6857f2991b7f69368e8db818b163d31cf5a367f15f5953bf8f01a77b3d4fc:.
 
 
@@ -51,7 +51,7 @@ check_dynamic() {
 			printf '%s\n' "Error: '$1' is not a dynamic binary!"
 			exit 1
 			;;
-		(*'/versions/musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/versions/musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
 			return 0
 			;;
 		(*)
@@ -75,7 +75,7 @@ make configure \
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
 # workaround ocamlbuild manpage getting installed to stdlib directory
-stdlib="$pthbs_destdir/versions/ocaml.069c6cc4ab715e5b0deb3bb2772c1cb535c4d9493499d62f0698e93c8d839a8f"
+stdlib="$pthbs_destdir/versions/ocaml.dacec2c58e92d993b290fc5d51fd5368b93d918a21d89c85aa77e9c571f92c84"
 mkdir -p "${stdlib%/*}"
 ln -s "$pthbs_package" "$stdlib"
 
@@ -138,12 +138,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/opam b/variants/root-x86_64/opam
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+diffutils.83a14dd4b514d22f131383c75cd46a3b2b995d9a756614664417f43115894ef9
-#+patch.4b138b6c2ce3c37aee8f3ecdd54af7381ba88828e5c93375dcdbf65e6fe8e6e7
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+getconf.35097a995dd64a94dd10877ac43aa71a91c9e57e6f2ed4a37b2ef38c0e35d447
-#+ocaml.069c6cc4ab715e5b0deb3bb2772c1cb535c4d9493499d62f0698e93c8d839a8f
-#+dune.bc73536d6dc95b4b25ad257c669347e7e92485a1ad4d0cd9251012ffee04fb8d
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+diffutils.e0bc68a52141be978abd92af880ae1fe0f6eaec0d3546a762236c1bd20d35969
+#+patch.b94c1791be3a7554e261b831f41b86935a1a71a30996c82abb3ff48c26696322
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+getconf.361c0d85e8a66b9ea2c891296ce2e4187217e3b620621837634c2148b84eb7a2
+#+ocaml.dacec2c58e92d993b290fc5d51fd5368b93d918a21d89c85aa77e9c571f92c84
+#+dune.2b3c4851054e618e2c59d068d0e5ffd80c8016df434caae2f9829f4e60b1a995
 #@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:.
 
 
@@ -72,7 +72,7 @@ export DUNE_CACHE=disabled
 	--infodir="$prefix/info" \
 	--localedir="$prefix/locale" \
 	--localstatedir='/var/pthbs' \
-	--with-dune='/versions/dune.bc73536d6dc95b4b25ad257c669347e7e92485a1ad4d0cd9251012ffee04fb8d/command/dune' \
+	--with-dune='/versions/dune.2b3c4851054e618e2c59d068d0e5ffd80c8016df434caae2f9829f4e60b1a995/command/dune' \
 	--with-mccs \
 	--with-vendored-deps \
 	--enable-static
@@ -143,12 +143,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/patch b/variants/root-x86_64/patch
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+m4.e358494a1ecfd280e744f59b421b66fb94fb9d3500b2177883a9bb654e279519
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+m4.fc418033f7f1a83dae7f43d369b5d9f2ad19c0838ad5731e41acfa6dd16e74b8
 #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:.
 
 
@@ -147,12 +147,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/pkgconf b/variants/root-x86_64/pkgconf
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+m4.e358494a1ecfd280e744f59b421b66fb94fb9d3500b2177883a9bb654e279519
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+m4.fc418033f7f1a83dae7f43d369b5d9f2ad19c0838ad5731e41acfa6dd16e74b8
 #@untar:-J:sha256:3a224f2accf091b77a5781316e27b9ee3ba82c083cc2e539e08940b68a44fec5:.
 
 
@@ -152,12 +152,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
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.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+pkgconf.39d511dd303a34bcbf74fbfa8e5b5f3104ebe4d3a6e75b749ccb923cf4dd8b8d
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+pkgconf.f0a5490c44d344a4a62fa10eb19d95ea6e01ead73235c2075630dd04de0898ae
 
 mkdir -p "$pthbs_destdir/versions/$pthbs_package"
 cd "$pthbs_destdir/versions/$pthbs_package"
diff --git a/variants/root-x86_64/popt b/variants/root-x86_64/popt
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+m4.e358494a1ecfd280e744f59b421b66fb94fb9d3500b2177883a9bb654e279519
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+m4.fc418033f7f1a83dae7f43d369b5d9f2ad19c0838ad5731e41acfa6dd16e74b8
 #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:.
 
 
@@ -146,12 +146,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
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.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+zsh.571047150db750d77921f5142fc610ff289f68e98c7ce1ae26d92c279694924e
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+zsh.79efcaa54bd6da0e331dc9acd6354c12fd73fb7db0b0fd8a6714fb3f09320c98
 #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall
 
 
@@ -92,12 +92,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/pthbs-sandbox-rootns b/variants/root-x86_64/pthbs-sandbox-rootns
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+busybox.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+execline.08ea7c28ac53ad27eabb2d95aa5a4885d1a352a758abbe0e898efa15fd22d932
-#+lnstools.7356b08e5ac77eec211e79635b766769557189f35eaac640de802b9ebdbd0dfe
-#+sandbox_rootfs.45808c1700f62c9acc0406db1847d9c4775aa07dd8599ccfb9ee5b7f441b3005
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+execline.e865cb2be2beb2f1d395759dab15505477b997cbf7306a89829bb57d99939213
+#+lnstools.2cb44e61f8aa7cffabf9e84d188e8b8d4719c51f847b1a0f4af5a4a2fdb95e61
+#+sandbox_rootfs.34e4eb2a2204335fae6cfd4dc8a9f25550459c73c5e5052ceb2fa81231fe8999
 #@sha256:b85634a91129f85a5aad5cae51d4084dd7ce62544b5585f0899058576c16451f:abspaths.awk
 #@sha256:df0c24312e4941b1035a6292504fbf569f0f8b81b083835d7df84586decef25c:sandbox-rootns.in
 
diff --git a/variants/root-x86_64/rsync b/variants/root-x86_64/rsync
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+m4.e358494a1ecfd280e744f59b421b66fb94fb9d3500b2177883a9bb654e279519
-#+nawk.1f83dbd2bab8c050e23262b85ca38f5b55b5a75490f7e73e164f92f1ffc56ee1
-#+popt.f65c57cb9df7ec196383bb0f5f132dc6552fd2d41229d652052ab6c7172a7ddd
-#+libressl.c8777a86effa1414ee69aa0f4bd7e664db000f1543687ad2ebf08bdd60d0f4ed
-#+zstd.8f0902c53df0843e0cc7e0c7769656eb7c5a664236d549fdd2a25ed1dc3761ff
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+m4.fc418033f7f1a83dae7f43d369b5d9f2ad19c0838ad5731e41acfa6dd16e74b8
+#+nawk.a87fcebcbc9c8e087518e4f8ad55ada1a7fd87e8c60837cd09fe358850edbc7e
+#+popt.b52410af3d11962ad4765a3caea63a8af911007a62d2c9f228f632e0676fe798
+#+libressl.a64aa602822d2a7278c27f3a9443c9b66ad5ff7df83fab095b344f1db4598c71
+#+zstd.0cbf996db5ca56ac24ed073774ea0a715d6098f8616b66a843e4d3f43ea51256
 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:.
 
 
@@ -156,12 +156,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/s6 b/variants/root-x86_64/s6
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+skalibs.8a95f938f13c8c9e002c6d584573d29aeb9a66f0b621b957f0d0d3b8994fecde
-#+execline.912f56f686362df873d10a2c055d4329f34c336642f043e0dadc7f0c9e6406a7
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+skalibs.a8e75cd5bcf5e86791be83aaa61313e4fdae64e216e0e95b64e5f2d51a4f059b
+#+execline.41cb65841ca776bf51e761e3edb1b9c6aa493f153243a2a3c80fbb9e419f1c3c
 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6
 
 
@@ -47,7 +47,7 @@ cd 's6'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.8a95f938f13c8c9e002c6d584573d29aeb9a66f0b621b957f0d0d3b8994fecde/sysdeps' \
+	--with-sysdeps='/versions/skalibs.a8e75cd5bcf5e86791be83aaa61313e4fdae64e216e0e95b64e5f2d51a4f059b/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -108,12 +108,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/s6-dns b/variants/root-x86_64/s6-dns
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+skalibs.8a95f938f13c8c9e002c6d584573d29aeb9a66f0b621b957f0d0d3b8994fecde
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+skalibs.a8e75cd5bcf5e86791be83aaa61313e4fdae64e216e0e95b64e5f2d51a4f059b
 #@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns
 
 
@@ -46,7 +46,7 @@ cd 's6-dns'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.8a95f938f13c8c9e002c6d584573d29aeb9a66f0b621b957f0d0d3b8994fecde/sysdeps' \
+	--with-sysdeps='/versions/skalibs.a8e75cd5bcf5e86791be83aaa61313e4fdae64e216e0e95b64e5f2d51a4f059b/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -107,12 +107,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/s6-linux-init b/variants/root-x86_64/s6-linux-init
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+skalibs.8a95f938f13c8c9e002c6d584573d29aeb9a66f0b621b957f0d0d3b8994fecde
-#+execline.912f56f686362df873d10a2c055d4329f34c336642f043e0dadc7f0c9e6406a7
-#+s6.e15d2bc7adb3cc287b1eb530ffca1a14c09399bfc936e069e7107fc6d37dcd9d
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+skalibs.a8e75cd5bcf5e86791be83aaa61313e4fdae64e216e0e95b64e5f2d51a4f059b
+#+execline.41cb65841ca776bf51e761e3edb1b9c6aa493f153243a2a3c80fbb9e419f1c3c
+#+s6.536b1c09130f2a03270f6d9828f57ccf58f19e3bc9a5bad2235273467f1fb7c0
 #@git:b298e515efe16210048e504e3aec89ea1e627b73:s6-linux-init
 
 
@@ -48,7 +48,7 @@ cd 's6-linux-init'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.8a95f938f13c8c9e002c6d584573d29aeb9a66f0b621b957f0d0d3b8994fecde/sysdeps' \
+	--with-sysdeps='/versions/skalibs.a8e75cd5bcf5e86791be83aaa61313e4fdae64e216e0e95b64e5f2d51a4f059b/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -109,12 +109,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/s6-linux-utils b/variants/root-x86_64/s6-linux-utils
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+skalibs.8a95f938f13c8c9e002c6d584573d29aeb9a66f0b621b957f0d0d3b8994fecde
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+skalibs.a8e75cd5bcf5e86791be83aaa61313e4fdae64e216e0e95b64e5f2d51a4f059b
 #@git:a9e7acac41a8854546246dd39cb4daee54ead2cb:s6-linux-utils
 
 
@@ -46,7 +46,7 @@ cd 's6-linux-utils'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.8a95f938f13c8c9e002c6d584573d29aeb9a66f0b621b957f0d0d3b8994fecde/sysdeps' \
+	--with-sysdeps='/versions/skalibs.a8e75cd5bcf5e86791be83aaa61313e4fdae64e216e0e95b64e5f2d51a4f059b/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -107,12 +107,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/s6-networking b/variants/root-x86_64/s6-networking
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+skalibs.8a95f938f13c8c9e002c6d584573d29aeb9a66f0b621b957f0d0d3b8994fecde
-#+execline.912f56f686362df873d10a2c055d4329f34c336642f043e0dadc7f0c9e6406a7
-#+s6.e15d2bc7adb3cc287b1eb530ffca1a14c09399bfc936e069e7107fc6d37dcd9d
-#+s6-dns.f11df1f46afb4185e5e5bb4340e7c22a5821c898556c71709c9586cf5f3a712e
-#+libressl.c8777a86effa1414ee69aa0f4bd7e664db000f1543687ad2ebf08bdd60d0f4ed
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+skalibs.a8e75cd5bcf5e86791be83aaa61313e4fdae64e216e0e95b64e5f2d51a4f059b
+#+execline.41cb65841ca776bf51e761e3edb1b9c6aa493f153243a2a3c80fbb9e419f1c3c
+#+s6.536b1c09130f2a03270f6d9828f57ccf58f19e3bc9a5bad2235273467f1fb7c0
+#+s6-dns.2142197f628cfd02567797d06ab9bb45739828b9f6ab02b371c4c338ded185be
+#+libressl.a64aa602822d2a7278c27f3a9443c9b66ad5ff7df83fab095b344f1db4598c71
 #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking
 
 
@@ -50,7 +50,7 @@ cd 's6-networking'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.8a95f938f13c8c9e002c6d584573d29aeb9a66f0b621b957f0d0d3b8994fecde/sysdeps' \
+	--with-sysdeps='/versions/skalibs.a8e75cd5bcf5e86791be83aaa61313e4fdae64e216e0e95b64e5f2d51a4f059b/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -116,12 +116,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/s6-portable-utils b/variants/root-x86_64/s6-portable-utils
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+skalibs.8a95f938f13c8c9e002c6d584573d29aeb9a66f0b621b957f0d0d3b8994fecde
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+skalibs.a8e75cd5bcf5e86791be83aaa61313e4fdae64e216e0e95b64e5f2d51a4f059b
 #@git:dc96d8a020e83b16dd7a8bd093bdb00ab2b944c0:s6-portable-utils
 
 
@@ -46,7 +46,7 @@ cd 's6-portable-utils'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.8a95f938f13c8c9e002c6d584573d29aeb9a66f0b621b957f0d0d3b8994fecde/sysdeps' \
+	--with-sysdeps='/versions/skalibs.a8e75cd5bcf5e86791be83aaa61313e4fdae64e216e0e95b64e5f2d51a4f059b/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -107,12 +107,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/s6-rc b/variants/root-x86_64/s6-rc
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+skalibs.8a95f938f13c8c9e002c6d584573d29aeb9a66f0b621b957f0d0d3b8994fecde
-#+execline.912f56f686362df873d10a2c055d4329f34c336642f043e0dadc7f0c9e6406a7
-#+s6.e15d2bc7adb3cc287b1eb530ffca1a14c09399bfc936e069e7107fc6d37dcd9d
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+skalibs.a8e75cd5bcf5e86791be83aaa61313e4fdae64e216e0e95b64e5f2d51a4f059b
+#+execline.41cb65841ca776bf51e761e3edb1b9c6aa493f153243a2a3c80fbb9e419f1c3c
+#+s6.536b1c09130f2a03270f6d9828f57ccf58f19e3bc9a5bad2235273467f1fb7c0
 #@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc
 
 
@@ -48,7 +48,7 @@ cd 's6-rc'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.8a95f938f13c8c9e002c6d584573d29aeb9a66f0b621b957f0d0d3b8994fecde/sysdeps' \
+	--with-sysdeps='/versions/skalibs.a8e75cd5bcf5e86791be83aaa61313e4fdae64e216e0e95b64e5f2d51a4f059b/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -109,12 +109,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/sandbox_rootfs b/variants/root-x86_64/sandbox_rootfs
@@ -1,9 +1,9 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.a10740b4d168540b05ff4881969708c04cbb205d81bca01665b6f1d345aac53a
-#+gnu-make.881035ac01f8f90e4c6638ea00315ef51bd39143008cd9d646e79889d6b8f0ad
-#+busybox.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
-#+skalibs.131a0253993040df85ff5a150e2c46a535d0139ec6c7fd6cf7454954714f733e
+#+musl-cross-make.5b57720f5f046b3f5ab6e8fe087c986e88c32db011272a9af8f98f367ecf38d9
+#+gnu-make.20bc229dae170475c9ffb6d8396f923b65b019237c868f02cdfe157c22952e06
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
+#+skalibs.55c40d95d593a76568eb5ba8ae7cb20ddc03b04243188a518041f0b7cb4a12c1
 #@sha256:8d716caa5ea940bbbb8f68ac0907cea36773c183bd4c1eebad030f6cc7deaec9:argv0exec.c
 
 # - build script start -
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.7356b08e5ac77eec211e79635b766769557189f35eaac640de802b9ebdbd0dfe
-#+sandbox_rootfs.45808c1700f62c9acc0406db1847d9c4775aa07dd8599ccfb9ee5b7f441b3005
-#+pthbs-sandbox-rootns.fc18d1b9be0f02988dbe1b5338c3bffda3ca6b3e3ef396de02de2f052067d177-
\ No newline at end of file
+#+lnstools.2cb44e61f8aa7cffabf9e84d188e8b8d4719c51f847b1a0f4af5a4a2fdb95e61
+#+sandbox_rootfs.34e4eb2a2204335fae6cfd4dc8a9f25550459c73c5e5052ceb2fa81231fe8999
+#+pthbs-sandbox-rootns.909815b8319912d90a8970215e28f78d6c105a93cdee41cdb973495efa3c1c01+
\ No newline at end of file
diff --git a/variants/root-x86_64/skalibs b/variants/root-x86_64/skalibs
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
 #@git:96b537f42695da1b865588baf591fdfcae76bd41:skalibs
 
 
@@ -109,12 +109,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/skalibs:bootstrap b/variants/root-x86_64/skalibs:bootstrap
@@ -1,8 +1,8 @@
 #!/usr/bin/env pthbs-build
 #@pragma:nosandbox
-#+musl-cross-make.a10740b4d168540b05ff4881969708c04cbb205d81bca01665b6f1d345aac53a
-#+gnu-make.881035ac01f8f90e4c6638ea00315ef51bd39143008cd9d646e79889d6b8f0ad
-#+busybox.27ebed3717c090c5f403d5b4b2a1d036e5abdb0a95bc7d9390f7db787970f886
+#+musl-cross-make.5b57720f5f046b3f5ab6e8fe087c986e88c32db011272a9af8f98f367ecf38d9
+#+gnu-make.20bc229dae170475c9ffb6d8396f923b65b019237c868f02cdfe157c22952e06
+#+busybox.47d508b6654a379652de4fdeb42f1f466c6b09e0a8a0cae41fdfdfeefcb73d5b
 #@git:96b537f42695da1b865588baf591fdfcae76bd41:skalibs
 
 
@@ -82,12 +82,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/snaprep b/variants/root-x86_64/snaprep
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+zsh.571047150db750d77921f5142fc610ff289f68e98c7ce1ae26d92c279694924e
-#+pthbs-banginstall.ed4d03e15da05a0615b406c90ed8e7e6e927e7a6173bc2d5306fc221d6b1dcee
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+zsh.79efcaa54bd6da0e331dc9acd6354c12fd73fb7db0b0fd8a6714fb3f09320c98
+#+pthbs-banginstall.53c1cc0fb914a45592217056f1f24cd8aab35f15922c0ed8eef2093603f7ebad
 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep
 
 
@@ -113,12 +113,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/squashfs-tools b/variants/root-x86_64/squashfs-tools
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+attr.b8fbc9d8505a990214bfe4d599a45b1a030a34569819211f1ab054e19c2e2082
-#+zstd.8f0902c53df0843e0cc7e0c7769656eb7c5a664236d549fdd2a25ed1dc3761ff
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+attr.2518d82ab2d5714df3e64b9ce03df7a932cb18167a6bac7377473fa366e16125
+#+zstd.0cbf996db5ca56ac24ed073774ea0a715d6098f8616b66a843e4d3f43ea51256
 #@untar:-z:sha256:4672b5c47d9418d3a5ae5b243defc6d9eae8275b9771022247c6a6082c815914:.
 
 
@@ -148,12 +148,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/strace b/variants/root-x86_64/strace
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+m4.e358494a1ecfd280e744f59b421b66fb94fb9d3500b2177883a9bb654e279519
-#+patch.4b138b6c2ce3c37aee8f3ecdd54af7381ba88828e5c93375dcdbf65e6fe8e6e7
-#+libunwind.16a935d0f12e4407bf36cafc26ea1530fa4e405182efd0932cbebbbdd1e0f449
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+m4.fc418033f7f1a83dae7f43d369b5d9f2ad19c0838ad5731e41acfa6dd16e74b8
+#+patch.b94c1791be3a7554e261b831f41b86935a1a71a30996c82abb3ff48c26696322
+#+libunwind.7c486c201559274aec2344b2247d7538f3865beb5eec6f5a5415ed536e49cc19
 #@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch
 #@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:.
 
@@ -155,12 +155,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
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.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-dosfstools.7031fd42e6a38b61039587593b2c49b888e5b4185dc3988833b62819519d566f
-#+busybox-e2fsprogs.b80d1814357274460c90397562cd9d8bfff0156ec301627a044a224031e81a0d
-#+busybox-iproute2.8acdc2ee3ff493e1402ceef21d34881f80f3fe4e14dcb505ccf22fc748a51601
-#+busybox-iputils.fced57f0fda2dadd1207d9fc0720950154b69e7f1ff9edd1a1daf24273b810c0
-#+busybox-net-misc.dc51cd8f3babfe1a9dc0e4c8247309f7d1affe48ef3af3bbc30f8f1b225315a9
-#+busybox-net-tools.ce51b186968bfbc461c80f484b86fa1de9da9fa2d53ec81398d6a4cd58aeb2d6
-#+busybox-traceroute.f9a4c85ba6712e44f3ca16e53f0d4034f0d88676b98bb092d75eb9662808aeae
-#+busybox-wget.328bd62d0bcbcb8e130f4681c9a3e580111018286961daba2ead14221de8b17c
-#+busybox-chpst.d530606301ad9b54c47e257fb5d065f901a3749e1d3a90b2f4831d69742f77dc
-#+busybox-console.b8f6a729bf3465c94a66a865c47585558d780a9a3fe949120a4cb354edac1bf0
-#+busybox-getty.1efb31d1e9744a943783b3fc033c407222da88beb97748e854da4c5a463aad04
-#+busybox-i2c-tools.9319d5243539945ae17d0cd7f3fa2dfe88d5f3ed5bf16397b70f963cc1231d6c
-#+busybox-linux-extra.bdfb3edbd4bf64ce6bd62befb48e12fe414f990153b1dbe475fb794c13a8987d
-#+busybox-mtd-utils.8256bf402897bab20b8412d04d2e7c13ee2b817cd4cf5c651a8d7c382c9cf73e
-#+busybox-shadow.149b43344c3ae8ab3a882880480cb54b23caba3ec5199a806b4e9de83c8e6050
-#+busybox-su.edf89124a8436c8c372462e822e41bb2e58af4871029673444c48f94a18c60ef
-#+busybox-util-linux-priv.484ff7a60600781cc65f39f95adcda1cae772875c187af0ebb60cf11ec0f7506
-#+busybox-logging.8dbce7a0bcda8f2a5614b8eeac9794a6cedc3ed69671879ef6500ed1e208e68c
-#+busybox-cron.2e1fde974ccdcf82e34efee75f00b4757c07bc68f21a2d043289965da45e1b13
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+nawk.1f83dbd2bab8c050e23262b85ca38f5b55b5a75490f7e73e164f92f1ffc56ee1
-#+diffutils.83a14dd4b514d22f131383c75cd46a3b2b995d9a756614664417f43115894ef9
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+aat.19a8c1fbca3502ecc89f570e51a4379c38ee6f1cbde7d9f372a46d84aae37c0d
-#+fileset.c6011cd6ffe8e89fbb3f5755fc3039b9630bcdfb9925e7bd6c6b997a3d863868
-#+rsync.fda12f12404b51c5b9365dd20af9406214bb26d245d7fcefe9ec7daa380ae5fb
-#+execline.912f56f686362df873d10a2c055d4329f34c336642f043e0dadc7f0c9e6406a7
-#+kbd.4327bf1043311fd0a3f680436d0277caf745d3cfd4fe2283e0cb513fbca7e42f
-#+mdevd.93ee473fec0bd9340ed85db564debab76a390d0fa9f37c42df8754831ac7e1be
-#+s6-linux-utils.978122ebf608da833e1e97d09f959f37d09293b7b7fa41bfcda81f4de522c967
-#+s6-rc.79bbf3f2bcedc9e5a85afb6ec57aa6c4fb1ee58317d5d60df87504dc69c1da9d
-#+s6.e15d2bc7adb3cc287b1eb530ffca1a14c09399bfc936e069e7107fc6d37dcd9d
-#+zsh.571047150db750d77921f5142fc610ff289f68e98c7ce1ae26d92c279694924e
-#+libcgroup.39a4f5eb75ba6489bfa09850a859375acee75493c46e5771324d2723859cddd8
-#+system-config-scripts.c060e180344cc39172ef12da1cac1215e808056d92ccee25775ad72fcede5892
-#+logincaps.af41a0ceafc442cb1b494a3b3da53809b494ea9b305bffb6ae68df475709aa86
-#+busybox-modutils.5c9e493ea0b22edcb7955df21115f482ef7e8ec8b5ebe5f5f9de05e11330567b
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-dosfstools.ff53bc16862746e75cf7cdfd7782e3bc9060d41b863e03239bd4070f297e4c36
+#+busybox-e2fsprogs.86b5fd14348b2166e78221b417e1ba105de0e4f3a8e8c578b7917440fca44ddc
+#+busybox-iproute2.5c9dadcae94634b29387168c6972dfb59af8aba47c405fb85ad5b08ec9aa0fa4
+#+busybox-iputils.cd0332322258b01baca8a75e2451df4137bb73a50b71457a6273b5fcfafa90dd
+#+busybox-net-misc.0e49e082c24d459529517de321f7cc472ddee8747bc263eae0f9ac5f086e005e
+#+busybox-net-tools.46e8fa4978b9b53f5aab7f8337e598de36f69f5a2fc6fc9347ebc843c50529ae
+#+busybox-traceroute.abaa00a0a83b9feda45ae3a6db2203b90b573471e0a3b01ecec5c316f56effc0
+#+busybox-wget.fbf7b42830563a6a316f97077a52c7154b2c660b33d21df78e4a566f5e700d8b
+#+busybox-chpst.bfb32806d90cc939a1fac38262b12d7355832b7a3748652d1fadaa91aab6071d
+#+busybox-console.0c77e4daf48216217c3293c05e740be40d838f8235529dab339ad403b04314ba
+#+busybox-getty.e828c4ac540200683d3c58bb3dc869fc4066d24d42be8d6ea8efa10bec240c59
+#+busybox-i2c-tools.bfba6896dc8262a5ca403c55ede0b13f175109baa403f8e27b371211ae125104
+#+busybox-linux-extra.964adcdbedf8067a2d48f81a2d1f79f9cf1ab3be7be3b6513e0b006bb54730ba
+#+busybox-mtd-utils.b06188ea7c7d5820f5090faf494c12a54864c17a0e5420153fc271f356ecd61b
+#+busybox-shadow.b8c9dbbf7f474e8fd94ae677e1aa720389ac228f89ee746c766643551de7a55a
+#+busybox-su.37c33de457a2ccc2b1088cb43551d04bf38e0a8734616626ba632634e143bbf6
+#+busybox-util-linux-priv.168952f6b78fda2cb71495f09427c073f43b734f4db7b6c0f993e3ca2b5c91fc
+#+busybox-logging.e2804fdf47b651ef3ddc7ea413b01e34a952af0735e2c4b2ccb4109a0effe239
+#+busybox-cron.fc7587f014f13c8157598682e35fed45c18bd70f50a3a69460429d09bea136c4
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+nawk.a87fcebcbc9c8e087518e4f8ad55ada1a7fd87e8c60837cd09fe358850edbc7e
+#+diffutils.e0bc68a52141be978abd92af880ae1fe0f6eaec0d3546a762236c1bd20d35969
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+aat.3932afdd65b8bf87058c2c1264234844df917484ee2b874fd1734750cc1a1581
+#+fileset.7deb901ad795c8ca4b7f0d260d14b8e4fd707cb870d49fcfc85f68405431d907
+#+rsync.fb3383c402f9c2a52ab6aabadde6c83ab2232921618701a1d636c48337fdb54d
+#+execline.41cb65841ca776bf51e761e3edb1b9c6aa493f153243a2a3c80fbb9e419f1c3c
+#+kbd.17c6ccc57c574bcd5f17c97558f151cce8cd9343409b3a194df427430cd36b4d
+#+mdevd.08e47963e7c46d091b2f9734398def1079f01de08e6c9a4f143ef6e0936bdea9
+#+s6-linux-utils.a0b3d1f521107d8fad67f2fb86bf2ac817615c899e6adf1e9e9b1325b98c7c1b
+#+s6-rc.3e03ddf887fe038165602b3eda2cb06b6e07a0507e4334b0515ba15376a9a491
+#+s6.536b1c09130f2a03270f6d9828f57ccf58f19e3bc9a5bad2235273467f1fb7c0
+#+zsh.79efcaa54bd6da0e331dc9acd6354c12fd73fb7db0b0fd8a6714fb3f09320c98
+#+libcgroup.c1eac6a2d5a1a627279728b3b43daa321190555f36c3cbdc97e802155aafe790
+#+system-config-scripts.99312f8c04f798963aba1cefcad58d578d267436987728cc3cf52518893ed2c0
+#+logincaps.2e66526c1a35a7df0407092b8b3629d6c9fe6e7593e0e17d11eb0c089a7c6375
+#+busybox-modutils.d1eb201f018a26dcf7c947ba4aea495d03226e17c88f6997a43d23df7c345849
 #@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.019a450d1241153209cf6f41eb5de263146dd437320b87f379460ba96ff72979' \
-	'pthbs_path_mdevd=/versions/env.29a4b21f2845dd417eb629f09c8aa214ea16b3854ba22cdcf58826f1037b1612' \
+	'pthbs_path_containers=/versions/env.da826192aa63a47f803f55b395b7f24e9ffc5188b9d1ac760ce67e2858e77acd' \
+	'pthbs_path_mdevd=/versions/env.a712c1c5d54492e09b6b0e74e55ff5c37aa561caab98c836da173f304cacbc80' \
 	make -j${JOBS:-1} -l$((1+${JOBS:-1})) all
 
 sort -u build/execfile | while IFS= read exename; do
@@ -176,12 +176,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
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.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-dosfstools.7031fd42e6a38b61039587593b2c49b888e5b4185dc3988833b62819519d566f
-#+busybox-e2fsprogs.b80d1814357274460c90397562cd9d8bfff0156ec301627a044a224031e81a0d
-#+busybox-iproute2.8acdc2ee3ff493e1402ceef21d34881f80f3fe4e14dcb505ccf22fc748a51601
-#+busybox-iputils.fced57f0fda2dadd1207d9fc0720950154b69e7f1ff9edd1a1daf24273b810c0
-#+busybox-net-misc.dc51cd8f3babfe1a9dc0e4c8247309f7d1affe48ef3af3bbc30f8f1b225315a9
-#+busybox-net-tools.ce51b186968bfbc461c80f484b86fa1de9da9fa2d53ec81398d6a4cd58aeb2d6
-#+busybox-traceroute.f9a4c85ba6712e44f3ca16e53f0d4034f0d88676b98bb092d75eb9662808aeae
-#+busybox-wget.328bd62d0bcbcb8e130f4681c9a3e580111018286961daba2ead14221de8b17c
-#+busybox-chpst.d530606301ad9b54c47e257fb5d065f901a3749e1d3a90b2f4831d69742f77dc
-#+busybox-console.b8f6a729bf3465c94a66a865c47585558d780a9a3fe949120a4cb354edac1bf0
-#+busybox-getty.1efb31d1e9744a943783b3fc033c407222da88beb97748e854da4c5a463aad04
-#+busybox-i2c-tools.9319d5243539945ae17d0cd7f3fa2dfe88d5f3ed5bf16397b70f963cc1231d6c
-#+busybox-linux-extra.bdfb3edbd4bf64ce6bd62befb48e12fe414f990153b1dbe475fb794c13a8987d
-#+busybox-mtd-utils.8256bf402897bab20b8412d04d2e7c13ee2b817cd4cf5c651a8d7c382c9cf73e
-#+busybox-shadow.149b43344c3ae8ab3a882880480cb54b23caba3ec5199a806b4e9de83c8e6050
-#+busybox-su.edf89124a8436c8c372462e822e41bb2e58af4871029673444c48f94a18c60ef
-#+busybox-util-linux-priv.484ff7a60600781cc65f39f95adcda1cae772875c187af0ebb60cf11ec0f7506
-#+busybox-logging.8dbce7a0bcda8f2a5614b8eeac9794a6cedc3ed69671879ef6500ed1e208e68c
-#+busybox-cron.2e1fde974ccdcf82e34efee75f00b4757c07bc68f21a2d043289965da45e1b13
-#+s6.e15d2bc7adb3cc287b1eb530ffca1a14c09399bfc936e069e7107fc6d37dcd9d
-#+s6-rc.79bbf3f2bcedc9e5a85afb6ec57aa6c4fb1ee58317d5d60df87504dc69c1da9d
-#+s6-portable-utils.542bcd8ede35d827be45d9e91451ef77e186a1f0c9a3272f220edc2d113e51d6
-#+s6-linux-init.61eb5bdecbb63fd528cbbd70c6688dd65e394dc9d6683ae185c1087d96f19599
-#+execline.912f56f686362df873d10a2c055d4329f34c336642f043e0dadc7f0c9e6406a7
-#+system-config-rc.3fd9d26431c17b9b4a8777e62ea42b46c0d87c59c6d9aacf091e3e3b5b0391ca
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-dosfstools.ff53bc16862746e75cf7cdfd7782e3bc9060d41b863e03239bd4070f297e4c36
+#+busybox-e2fsprogs.86b5fd14348b2166e78221b417e1ba105de0e4f3a8e8c578b7917440fca44ddc
+#+busybox-iproute2.5c9dadcae94634b29387168c6972dfb59af8aba47c405fb85ad5b08ec9aa0fa4
+#+busybox-iputils.cd0332322258b01baca8a75e2451df4137bb73a50b71457a6273b5fcfafa90dd
+#+busybox-net-misc.0e49e082c24d459529517de321f7cc472ddee8747bc263eae0f9ac5f086e005e
+#+busybox-net-tools.46e8fa4978b9b53f5aab7f8337e598de36f69f5a2fc6fc9347ebc843c50529ae
+#+busybox-traceroute.abaa00a0a83b9feda45ae3a6db2203b90b573471e0a3b01ecec5c316f56effc0
+#+busybox-wget.fbf7b42830563a6a316f97077a52c7154b2c660b33d21df78e4a566f5e700d8b
+#+busybox-chpst.bfb32806d90cc939a1fac38262b12d7355832b7a3748652d1fadaa91aab6071d
+#+busybox-console.0c77e4daf48216217c3293c05e740be40d838f8235529dab339ad403b04314ba
+#+busybox-getty.e828c4ac540200683d3c58bb3dc869fc4066d24d42be8d6ea8efa10bec240c59
+#+busybox-i2c-tools.bfba6896dc8262a5ca403c55ede0b13f175109baa403f8e27b371211ae125104
+#+busybox-linux-extra.964adcdbedf8067a2d48f81a2d1f79f9cf1ab3be7be3b6513e0b006bb54730ba
+#+busybox-mtd-utils.b06188ea7c7d5820f5090faf494c12a54864c17a0e5420153fc271f356ecd61b
+#+busybox-shadow.b8c9dbbf7f474e8fd94ae677e1aa720389ac228f89ee746c766643551de7a55a
+#+busybox-su.37c33de457a2ccc2b1088cb43551d04bf38e0a8734616626ba632634e143bbf6
+#+busybox-util-linux-priv.168952f6b78fda2cb71495f09427c073f43b734f4db7b6c0f993e3ca2b5c91fc
+#+busybox-logging.e2804fdf47b651ef3ddc7ea413b01e34a952af0735e2c4b2ccb4109a0effe239
+#+busybox-cron.fc7587f014f13c8157598682e35fed45c18bd70f50a3a69460429d09bea136c4
+#+s6.536b1c09130f2a03270f6d9828f57ccf58f19e3bc9a5bad2235273467f1fb7c0
+#+s6-rc.3e03ddf887fe038165602b3eda2cb06b6e07a0507e4334b0515ba15376a9a491
+#+s6-portable-utils.28f708cc0907e0af5ffd6bf97255e1062fb89d5ffd44755ad3e4db2350cf284e
+#+s6-linux-init.a7d12b0bbd266e453c16ccba1d8caa5b16f18526a1e26d51a56c86a1fb2ef782
+#+execline.41cb65841ca776bf51e761e3edb1b9c6aa493f153243a2a3c80fbb9e419f1c3c
+#+system-config-rc.16da4bb5808c5ed3a87eef8f3f758d696feb8ab6188f862bbc6c6415c44d2fe2
 
 
 # - build script start -
@@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-s6rcdb=/versions/system-config-rc.3fd9d26431c17b9b4a8777e62ea42b46c0d87c59c6d9aacf091e3e3b5b0391ca/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.16da4bb5808c5ed3a87eef8f3f758d696feb8ab6188f862bbc6c6415c44d2fe2/config/s6-rc-db
 
 # Generate init (${dest} must not exist but parent dir does)
 mkdir -p "$pthbs_destdir//versions"
@@ -219,12 +219,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
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.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+s6-rc.79bbf3f2bcedc9e5a85afb6ec57aa6c4fb1ee58317d5d60df87504dc69c1da9d
-#+fileset.c6011cd6ffe8e89fbb3f5755fc3039b9630bcdfb9925e7bd6c6b997a3d863868
-#+system-config.78b2b4dddc8097e463d836efa10875670f85d94e999a3fc009128665d70e7c2a
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+s6-rc.3e03ddf887fe038165602b3eda2cb06b6e07a0507e4334b0515ba15376a9a491
+#+fileset.7deb901ad795c8ca4b7f0d260d14b8e4fd707cb870d49fcfc85f68405431d907
+#+system-config.86fc600dfe8d30b8eaa455c03df001d4681cbd438e380630d97c14ca98d1c24f
 
 
 # - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-src=/versions/system-config.78b2b4dddc8097e463d836efa10875670f85d94e999a3fc009128665d70e7c2a/config/s6-rc-source
+src=/versions/system-config.86fc600dfe8d30b8eaa455c03df001d4681cbd438e380630d97c14ca98d1c24f/config/s6-rc-source
 s6-rc-compile ./s6-rc-db "$src"
 mkdir -p "$dest/config"
 mv -v s6-rc-db "$dest/config/"
@@ -94,12 +94,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
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.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+zsh.571047150db750d77921f5142fc610ff289f68e98c7ce1ae26d92c279694924e
-#+pthbs-banginstall.ed4d03e15da05a0615b406c90ed8e7e6e927e7a6173bc2d5306fc221d6b1dcee
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+zsh.79efcaa54bd6da0e331dc9acd6354c12fd73fb7db0b0fd8a6714fb3f09320c98
+#+pthbs-banginstall.53c1cc0fb914a45592217056f1f24cd8aab35f15922c0ed8eef2093603f7ebad
 #@git:dc793695cc0632a808af9d4415f3b0cf0f4dfba2:system-config-scripts
 
 
@@ -113,12 +113,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
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.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+zsh.571047150db750d77921f5142fc610ff289f68e98c7ce1ae26d92c279694924e
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+zsh.79efcaa54bd6da0e331dc9acd6354c12fd73fb7db0b0fd8a6714fb3f09320c98
 #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh
 
 
@@ -90,12 +90,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/tinyssh b/variants/root-x86_64/tinyssh
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
 #@untar:-z:sha256:f3ae622c765db4e0d791ea90a9feba39d7f693ef9cb949a797f7ad6b404a2d61:.
 
 
@@ -128,12 +128,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
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.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+execline.912f56f686362df873d10a2c055d4329f34c336642f043e0dadc7f0c9e6406a7
-#+pthbs-banginstall.ed4d03e15da05a0615b406c90ed8e7e6e927e7a6173bc2d5306fc221d6b1dcee
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+execline.41cb65841ca776bf51e761e3edb1b9c6aa493f153243a2a3c80fbb9e419f1c3c
+#+pthbs-banginstall.53c1cc0fb914a45592217056f1f24cd8aab35f15922c0ed8eef2093603f7ebad
 #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env
 
 
@@ -94,12 +94,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment
@@ -1,90 +1,90 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-dosfstools.7031fd42e6a38b61039587593b2c49b888e5b4185dc3988833b62819519d566f
-#+busybox-e2fsprogs.b80d1814357274460c90397562cd9d8bfff0156ec301627a044a224031e81a0d
-#+busybox-iproute2.8acdc2ee3ff493e1402ceef21d34881f80f3fe4e14dcb505ccf22fc748a51601
-#+busybox-iputils.fced57f0fda2dadd1207d9fc0720950154b69e7f1ff9edd1a1daf24273b810c0
-#+busybox-net-misc.dc51cd8f3babfe1a9dc0e4c8247309f7d1affe48ef3af3bbc30f8f1b225315a9
-#+busybox-net-tools.ce51b186968bfbc461c80f484b86fa1de9da9fa2d53ec81398d6a4cd58aeb2d6
-#+busybox-traceroute.f9a4c85ba6712e44f3ca16e53f0d4034f0d88676b98bb092d75eb9662808aeae
-#+busybox-wget.328bd62d0bcbcb8e130f4681c9a3e580111018286961daba2ead14221de8b17c
-#+busybox-chpst.d530606301ad9b54c47e257fb5d065f901a3749e1d3a90b2f4831d69742f77dc
-#+busybox-console.b8f6a729bf3465c94a66a865c47585558d780a9a3fe949120a4cb354edac1bf0
-#+busybox-getty.1efb31d1e9744a943783b3fc033c407222da88beb97748e854da4c5a463aad04
-#+busybox-i2c-tools.9319d5243539945ae17d0cd7f3fa2dfe88d5f3ed5bf16397b70f963cc1231d6c
-#+busybox-linux-extra.bdfb3edbd4bf64ce6bd62befb48e12fe414f990153b1dbe475fb794c13a8987d
-#+busybox-mtd-utils.8256bf402897bab20b8412d04d2e7c13ee2b817cd4cf5c651a8d7c382c9cf73e
-#+busybox-shadow.149b43344c3ae8ab3a882880480cb54b23caba3ec5199a806b4e9de83c8e6050
-#+busybox-su.edf89124a8436c8c372462e822e41bb2e58af4871029673444c48f94a18c60ef
-#+busybox-util-linux-priv.484ff7a60600781cc65f39f95adcda1cae772875c187af0ebb60cf11ec0f7506
-#+busybox-logging.8dbce7a0bcda8f2a5614b8eeac9794a6cedc3ed69671879ef6500ed1e208e68c
-#+busybox-cron.2e1fde974ccdcf82e34efee75f00b4757c07bc68f21a2d043289965da45e1b13
-#+attr.b8fbc9d8505a990214bfe4d599a45b1a030a34569819211f1ab054e19c2e2082
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+diffutils.83a14dd4b514d22f131383c75cd46a3b2b995d9a756614664417f43115894ef9
-#+patch.4b138b6c2ce3c37aee8f3ecdd54af7381ba88828e5c93375dcdbf65e6fe8e6e7
-#+flex.6437de0d7ab2256c5cb69b5ab313620be1b56329f6fe4c38441297211bda72d5
-#+bison.0b6d9127e38a3ba37eeb962761b8e27c532f5fc6e152970625c235d8146c59ab
-#+rsync.fda12f12404b51c5b9365dd20af9406214bb26d245d7fcefe9ec7daa380ae5fb
-#+execline.912f56f686362df873d10a2c055d4329f34c336642f043e0dadc7f0c9e6406a7
-#+s6.e15d2bc7adb3cc287b1eb530ffca1a14c09399bfc936e069e7107fc6d37dcd9d
-#+s6-rc.79bbf3f2bcedc9e5a85afb6ec57aa6c4fb1ee58317d5d60df87504dc69c1da9d
-#+s6-portable-utils.542bcd8ede35d827be45d9e91451ef77e186a1f0c9a3272f220edc2d113e51d6
-#+s6-linux-utils.978122ebf608da833e1e97d09f959f37d09293b7b7fa41bfcda81f4de522c967
-#+s6-linux-init.61eb5bdecbb63fd528cbbd70c6688dd65e394dc9d6683ae185c1087d96f19599
-#+mdevd.93ee473fec0bd9340ed85db564debab76a390d0fa9f37c42df8754831ac7e1be
-#+s6-dns.f11df1f46afb4185e5e5bb4340e7c22a5821c898556c71709c9586cf5f3a712e
-#+libressl.c8777a86effa1414ee69aa0f4bd7e664db000f1543687ad2ebf08bdd60d0f4ed
-#+s6-networking.5ace585a300ab2bf024c54b6779bfb14bdf0ce2556a03710ed247e2ee9d5406e
-#+zsh.571047150db750d77921f5142fc610ff289f68e98c7ce1ae26d92c279694924e
-#+pthbs-banginstall.ed4d03e15da05a0615b406c90ed8e7e6e927e7a6173bc2d5306fc221d6b1dcee
-#+aat.19a8c1fbca3502ecc89f570e51a4379c38ee6f1cbde7d9f372a46d84aae37c0d
-#+confz.99682039766f6d2ff92a830afb53b935435f6abcc4ecb799f08c5a768068dc46
-#+containers.f78c7d2d19a36c6cd5e6977fcad74e2a688b907d2ef156d9a4fc9a23bbd8fbad
-#+fileset.c6011cd6ffe8e89fbb3f5755fc3039b9630bcdfb9925e7bd6c6b997a3d863868
-#+logincaps.af41a0ceafc442cb1b494a3b3da53809b494ea9b305bffb6ae68df475709aa86
-#+snaprep.3e3ca2d7cef51e83a438bb3cb9a5068ba381d9c419019c89c8ed5e32d8ec482e
-#+curl.e62d07a51a07a75e4be12783e94e72e055e2caa324246a2043eb57820d1999e6
-#+git.e06b05f4ac98c19d5bcb4d27e5858219415eaef2e82db9b4e969342663efb72c
-#+xbps.098e01a13a2efa3ed96f5b3f084b463ec43421edba6bbbc1821dc21a8fd6c8a9
-#+apk-tools.b4721eb8ce1f9dfc708ab0ef8e4a9452f5ede745ad9e9f8e72cc2bbcc9a1fba1
-#+getent.987248cc33ef274c8ff22aa3fd196d702d61b07676ed3ef33b529ae7f4631908
-#+getconf.35097a995dd64a94dd10877ac43aa71a91c9e57e6f2ed4a37b2ef38c0e35d447
-#+iconv.23431004486224b761acbc83cac931c8155ef9312a0210f826e1ecb264c146c7
-#+libcap.9f6d45bb56d57726401683138a9a7939f13d24b6a8eb79639f9ad4489b25a57c
-#+applyuidgid-caps.d332df75d591d7629cda6620780f6509c96914b1409a2f855745048d250c3610
-#+ccx-utils.70a7723fcbfc547e310375e58e423b6c43cc7088e16128bbfb3413c907d81b71
-#+user-env.f64e7a8b52b1e6e69d5d635f48900a4ee5895eb16fc271ae78c2a4b92518bf13
-#+strace.3f02709e61ff1d835d1ff49176824d7170032731f670f1d668bb08553c6b5486
-#+mlog.43c68c826028fd42d414a6d035749308b308b7ef25f6b88ba50f3b7f7440ea43
-#+findutils.4410b8c7a36486ad849c1b63a623d6d95dea6a04335b5c879d2d8c71d62739df
-#+nawk.1f83dbd2bab8c050e23262b85ca38f5b55b5a75490f7e73e164f92f1ffc56ee1
-#+squashfs-tools.849bd017362d649017b378e9b1f9d792d60070a0a45a01a240a8cb437972b18c
-#+mandoc.792ed251786dc428a104574df91ec55d3d33f68a66e820632b9d3596e2468434
-#+tinyssh.a9cbfd2de4b1bee2ffed65f4b0b2280423b0ccb7cd623ed28abaa2ec543382ca-
\ No newline at end of file
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-dosfstools.ff53bc16862746e75cf7cdfd7782e3bc9060d41b863e03239bd4070f297e4c36
+#+busybox-e2fsprogs.86b5fd14348b2166e78221b417e1ba105de0e4f3a8e8c578b7917440fca44ddc
+#+busybox-iproute2.5c9dadcae94634b29387168c6972dfb59af8aba47c405fb85ad5b08ec9aa0fa4
+#+busybox-iputils.cd0332322258b01baca8a75e2451df4137bb73a50b71457a6273b5fcfafa90dd
+#+busybox-net-misc.0e49e082c24d459529517de321f7cc472ddee8747bc263eae0f9ac5f086e005e
+#+busybox-net-tools.46e8fa4978b9b53f5aab7f8337e598de36f69f5a2fc6fc9347ebc843c50529ae
+#+busybox-traceroute.abaa00a0a83b9feda45ae3a6db2203b90b573471e0a3b01ecec5c316f56effc0
+#+busybox-wget.fbf7b42830563a6a316f97077a52c7154b2c660b33d21df78e4a566f5e700d8b
+#+busybox-chpst.bfb32806d90cc939a1fac38262b12d7355832b7a3748652d1fadaa91aab6071d
+#+busybox-console.0c77e4daf48216217c3293c05e740be40d838f8235529dab339ad403b04314ba
+#+busybox-getty.e828c4ac540200683d3c58bb3dc869fc4066d24d42be8d6ea8efa10bec240c59
+#+busybox-i2c-tools.bfba6896dc8262a5ca403c55ede0b13f175109baa403f8e27b371211ae125104
+#+busybox-linux-extra.964adcdbedf8067a2d48f81a2d1f79f9cf1ab3be7be3b6513e0b006bb54730ba
+#+busybox-mtd-utils.b06188ea7c7d5820f5090faf494c12a54864c17a0e5420153fc271f356ecd61b
+#+busybox-shadow.b8c9dbbf7f474e8fd94ae677e1aa720389ac228f89ee746c766643551de7a55a
+#+busybox-su.37c33de457a2ccc2b1088cb43551d04bf38e0a8734616626ba632634e143bbf6
+#+busybox-util-linux-priv.168952f6b78fda2cb71495f09427c073f43b734f4db7b6c0f993e3ca2b5c91fc
+#+busybox-logging.e2804fdf47b651ef3ddc7ea413b01e34a952af0735e2c4b2ccb4109a0effe239
+#+busybox-cron.fc7587f014f13c8157598682e35fed45c18bd70f50a3a69460429d09bea136c4
+#+attr.2518d82ab2d5714df3e64b9ce03df7a932cb18167a6bac7377473fa366e16125
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+diffutils.e0bc68a52141be978abd92af880ae1fe0f6eaec0d3546a762236c1bd20d35969
+#+patch.b94c1791be3a7554e261b831f41b86935a1a71a30996c82abb3ff48c26696322
+#+flex.ea6330f51ea3d58adc3a52b992a02f5c4b97c649973ce762c8ae25a5294e1256
+#+bison.2c9225a2177ce3f816b2bf74dc5240128f24d4dc68ada00987b18eb611cf5477
+#+rsync.fb3383c402f9c2a52ab6aabadde6c83ab2232921618701a1d636c48337fdb54d
+#+execline.41cb65841ca776bf51e761e3edb1b9c6aa493f153243a2a3c80fbb9e419f1c3c
+#+s6.536b1c09130f2a03270f6d9828f57ccf58f19e3bc9a5bad2235273467f1fb7c0
+#+s6-rc.3e03ddf887fe038165602b3eda2cb06b6e07a0507e4334b0515ba15376a9a491
+#+s6-portable-utils.28f708cc0907e0af5ffd6bf97255e1062fb89d5ffd44755ad3e4db2350cf284e
+#+s6-linux-utils.a0b3d1f521107d8fad67f2fb86bf2ac817615c899e6adf1e9e9b1325b98c7c1b
+#+s6-linux-init.a7d12b0bbd266e453c16ccba1d8caa5b16f18526a1e26d51a56c86a1fb2ef782
+#+mdevd.08e47963e7c46d091b2f9734398def1079f01de08e6c9a4f143ef6e0936bdea9
+#+s6-dns.2142197f628cfd02567797d06ab9bb45739828b9f6ab02b371c4c338ded185be
+#+libressl.a64aa602822d2a7278c27f3a9443c9b66ad5ff7df83fab095b344f1db4598c71
+#+s6-networking.787b29a9a5d1c213607fa886c55bc1f3be9affcb99e323a50ed0d9706c9ccd71
+#+zsh.79efcaa54bd6da0e331dc9acd6354c12fd73fb7db0b0fd8a6714fb3f09320c98
+#+pthbs-banginstall.53c1cc0fb914a45592217056f1f24cd8aab35f15922c0ed8eef2093603f7ebad
+#+aat.3932afdd65b8bf87058c2c1264234844df917484ee2b874fd1734750cc1a1581
+#+confz.d6990f08d845a83ba1e3b92dd729c1dc32e5974e3e8be8fa96d3a43122445282
+#+containers.b469c4597231b22ea0bd8f5a8eca2b441b61679ee0adb47285e28b55651d58b0
+#+fileset.7deb901ad795c8ca4b7f0d260d14b8e4fd707cb870d49fcfc85f68405431d907
+#+logincaps.2e66526c1a35a7df0407092b8b3629d6c9fe6e7593e0e17d11eb0c089a7c6375
+#+snaprep.60472db313d1c8e002d1416f156e9eeca7f5162e91b202842677000b8c08f187
+#+curl.9f99de0b22d2034becd5d6e323c297e556b8befe83cfaaa32d0505caeba5fbfb
+#+git.8886baa5f668ec6fa255af877c29ea5c43588a90d8fa44d3953df5a84adca67d
+#+xbps.5960efa172f2276e95652d31a064f845234297b51fd0800d104e8f6c6ef88829
+#+apk-tools.2b6bb8e89c32fa4ade9cfccbc1e06ced31f8f3d98212f9bd61064b2256087047
+#+getent.a12f882b028b036f7847ed7db52b774011e6ecb22136b9a1b234bf69a7e34a16
+#+getconf.361c0d85e8a66b9ea2c891296ce2e4187217e3b620621837634c2148b84eb7a2
+#+iconv.fd970229b0ded797161cba53ddbce1fc7251a9576091df74cf4aa0ac7f2b3523
+#+libcap.c0108c8a87ac308db1f5061c380a0b4baa9e9e244bbd74e0509cedf98589b7d9
+#+applyuidgid-caps.2cffed29431e535abe114da90bb5de1a9705e3f045eaf6fbe006a0b8deb8ce55
+#+ccx-utils.79c97ea66b2dd0af18db08675c3503a914631699d9427a0e19671d5a80fef0a5
+#+user-env.38560fd10d9f805163031bdd96e18a3fa13c448549ccb47972e47bba49aa79c2
+#+strace.901ccae6037d0b9ba26f5a92dad27bdf5ed791aa1273a88f21ba3cadb2e6779e
+#+mlog.047dee2660eee8ed95d473037b464b784a67f83813f8ace4e917ac0841a7573e
+#+findutils.498616bba7a0b0e8134135fa0dbee4ec3ca484b1864004c4f481ae30ac26013a
+#+nawk.a87fcebcbc9c8e087518e4f8ad55ada1a7fd87e8c60837cd09fe358850edbc7e
+#+squashfs-tools.92e77769741ae679e5531d6e71bad8c99ee9ed6f4ba8d3af7dc26fea4221e112
+#+mandoc.d6b536d53389d7e694d65f07f43b4eab00874faf4002d5d2d4b2eaa7c7230c3b
+#+tinyssh.217ebd02f888eb734311bc11fe0713047e575681e3759e19d3ea5b219ccfbba6+
\ 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.d3374d4dfd8f919f92179b40cb0afff8725788c9637259859060e26684053444-
\ No newline at end of file
+#+linux-qemu-guest.3897de084640ee653f32796e9311ffb4b2b44c87de228ea229470ff87222fb18+
\ No newline at end of file
diff --git a/variants/root-x86_64/xbps b/variants/root-x86_64/xbps
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+libarchive.1d4648aca6184362e42877f24a6ebd8d34d5683b8f1d0a35193ba824809dac09
-#+libressl.c8777a86effa1414ee69aa0f4bd7e664db000f1543687ad2ebf08bdd60d0f4ed
-#+pkgconf-pkg-config.beeefa0fe9bd588637948829bfcea1b50725d726f323b94c10a4bead578a32a2
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+libarchive.8fabc55f19724f5f916f750d42a6c8ebde9e29d34a2f37dc9861dadbb67d7a54
+#+libressl.a64aa602822d2a7278c27f3a9443c9b66ad5ff7df83fab095b344f1db4598c71
+#+pkgconf-pkg-config.372514298b015e24fd4e1bcbb58d5eb49288491ee504cb9c72449a1ad237568f
 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:.
 
 
@@ -153,12 +153,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/zsh b/variants/root-x86_64/zsh
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+m4.e358494a1ecfd280e744f59b421b66fb94fb9d3500b2177883a9bb654e279519
-#+netbsd-curses.563ebb997e40ddd17d0805bc058a42cd15fc7cdaf78a4936a6b5a25ee1612852
-#+libbsd.aed95c50ea3dc0032c39c452305760f65eb3cf29f2cdabb3e3f53cc683ffeac3
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+m4.fc418033f7f1a83dae7f43d369b5d9f2ad19c0838ad5731e41acfa6dd16e74b8
+#+netbsd-curses.2fe4866b061aa9fbdb83e108a0f3d2c835f87ce192bce40c4aebf1e51c74cd91
+#+libbsd.ea3976df6b12512a6fbb3af9fd7a451554e4f594f1f68a8a2c8d7e1b39b5dc34
 #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config
 #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:.
 
@@ -89,10 +89,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'zsh-5.9'
 
 
-autotools_config_static --enable-static --disable-shared \
-	--enable-libc-musl --disable-locale \
-	--enable-cap \
-	--enable-maildir-support \
+autotools_config \
 	--enable-datadir="${prefix}" \
 	--enable-datarootdir="${prefix}" \
 	--enable-etcdir="${prefix}/etc" \
@@ -101,9 +98,25 @@ autotools_config_static --enable-static --disable-shared \
 	--enable-fndir="${prefix}/zsh/functions" \
 	--enable-site-fndir="${prefix}/zsh/site-functions" \
 	--enable-runhelpdir="${prefix}/zsh/help" \
+	--disable-dynamic \
+	--disable-restricted-r \
+	--enable-locale \
+	--enable-maildir-support \
+	--disable-pcre \
+	--disable-gdbm \
+	--enable-cap \
+	--enable-multibyte \
+	--enable-unicode9 \
+	--enable-libc-musl \
+	--disable-dynamic-nss \
 	--with-tcsetpgrp
 
-
+# consider enabling:
+# name=zsh/attr modfile=Src/Modules/attr.mdd link=no auto=yes load=no
+# name=zsh/cap modfile=Src/Modules/cap.mdd link=no auto=yes load=no
+# name=zsh/curses modfile=Src/Modules/curses.mdd link=no auto=yes load=no
+# name=zsh/mathfunc modfile=Src/Modules/mathfunc.mdd link=no auto=yes load=no
+# name=zsh/zprof modfile=Src/Modules/zprof.mdd link=no auto=yes load=no
 sed -Ee '/name=zsh\/(files|stat|system|zselect|zutil|regex|net\/socket|net\/tcp) /s/link=[^ ]+/link=static/' -i config.modules
 cat config.modules
 
@@ -176,12 +189,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links
 
diff --git a/variants/root-x86_64/zstd b/variants/root-x86_64/zstd
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e8f2ec51542bf4b54102b451921e0a93c63facaafda22354e78ea3a0af9a7ff5
-#+busybox-bzip2.551855d93436cb00b0d9f1a6d8c2e068b95ce9ab16cc69d32d1ad78f8e5d948c
-#+busybox-gzip.dca98998927bb5fcc5dc3f424022f351911a69dbc3ba7425f7fbdc39bc5e1b5f
-#+busybox-lzop.dca4787833e7688e889894404c3fbc4a8692752835531132ad8794ddc105d41e
-#+busybox-unzip.19d9ef12492e1d489b8f8ed9ef3a54d53fc4e6cf30bf867de3b77d2990a39d89
-#+busybox-xz.a4d362f15540ddc2855ffc42e35de8ff3ad531b0152c493fc40b8b676409bff7
-#+busybox-cpio.452f0101381b3ab1107417794c02610e8ea712c5b46eee7390e13e503dc1d255
-#+busybox-dpkg.8d351eb5b80e4beec4506d4a4340439557c6ef721d3d26b9b379cf7243001637
-#+busybox-rpm.b9c0385bb6d455d39064e690ce3676c7483357c6c65b92e473c6e96304bfad08
-#+busybox-tar.df9b4790ec4a0d0b64be9663639367fb703571027f1397bdb5dc6b99e937f24e
-#+busybox-ed.b32ed734fbccb5117f9ba9e7939f8acd08f02d737cdb7e8e455ac5ad59e1eea7
-#+busybox-sed.dbcb9a30466a7b9380de37e18d597353458101cdcead09d7c348577b8d1f8220
-#+busybox-vi.42e5726f349876ab73d1cb386eacb1687a6951182ea7a0a66d5f7282be7e0c66
-#+busybox-xxd.40c8f835f87c4621bc8d7e3c848dd1af6d234ff504977f66ebca3f88a41af9b3
-#+busybox-process-extra.0c05d79449bcbbf25bb2ede99c767a4f2f26954965db7bfa9f3ce77de8990cf8
-#+busybox-procps.de6328275cc20f4ab71ac6e4841120df685ac2b3beeb406afa1a392f1a9cf60f
-#+busybox-psmisc.489eefe198e541f2c669f4578d69f2083940659e062bf6ab79774bd90ef6fe85
-#+busybox-ash.81f3f0a66451e1c209a8adcc9794dd77f33f25f42b15021eda11c1326d28ad8e
-#+busybox-bc.97c4de4d1140c25f65088f120224364e5fc2f38fb2a0df2e70c9b1e85eb1a086
-#+busybox-coreutils.1b98dce6f7f50be8a72d91cf214dccdc1507948df7e113422ccc551152fa4707
-#+busybox-coreutils-extra.114b508964c2981e6e7409cc9122236169e3eed724778766d23c9b68e0689399
-#+busybox-daemontools.7967d12213b6b6f5786346278bc35b49924d94108a72614d631f47a8fbdb981b
-#+busybox-grep.13680978ad0609516866d977f7b9c07c0ed0e0fb904a732b0c85205800cc84d1
-#+busybox-misc.02e368c0b9c63078efc366375561cbf9aca762a893d9ee127b3d7e28d79dea4a
-#+busybox-sh.4d9baf39bb72497b665c4e841d79a266f5faecad8a8561e27fade72037d5ef13
-#+busybox-util-linux-unpriv.48c9abd95ee7c7c83e51b9a3a9cbd6736ac85bc468ccaa866726acad58e7a4ed
-#+busybox-findutils.67122b425b2316c9e384151a46ce0b38eb498afbad05cb446e09a3299f75832e
-#+busybox-awk.8932434a676dd2848fa07800811e340afd031821a9ffe85555c09314335900d5
-#+musl-cross-make.1ca74cf52364d05abc266cb9959aa24944f9ac61c8cd8efb7335ceaa73dab585
-#+gnu-make.00d33361b153c81dbdc68d56d6804f67ba0f07d16a8eaee59367265833e4a333
-#+busybox-diffutils.ca2b4e0d6b86fa634c40d6726f2255a43a0e2f768c462d522c3303cb5f6a679a
+#+busybox.ff9c6862b5dda999a1e87be03976fca3458f6bf6f279d37ad12f65dbf64a78c2
+#+busybox-bzip2.0239a82ce9596bcc9a66be87df5f51e0877faabae4599c8d55916c79021366f6
+#+busybox-gzip.4cf0e59fe04bd1ef1d749b46eec6b9d1d365f4ff619e5371dd854d180d54c7ae
+#+busybox-lzop.2c241dcc8745e9ce8ba7cd4e8cec871dee22ad1edcf04ed883dccb105163298b
+#+busybox-unzip.673c6c2dde4cef8e4ae3f7fe1408849b5ab854951616aacc402102a2bb0563d7
+#+busybox-xz.b2d648e83ba3b2727057ca5811b03a883a12f966496f076aeab67b6b573af939
+#+busybox-cpio.041e1f83e94bc8b252f71a81076f44b7973245a707c521a9b182e1ac7d9cb44d
+#+busybox-dpkg.f24b5def750df91a481c01a5cac6283137af9e1be4d6bd98fd6e754362ea8a90
+#+busybox-rpm.5289874ef0cd2c85972b3afe055afaed82f7a9a47439d5aa53fa9f9f09d020e0
+#+busybox-tar.01a7a67f252351630d1f589ea127bcbb05e093f83f5acb70902f89fe117b5d18
+#+busybox-ed.c53989e3e8ef45858069a52d9b215ded8a432f285d42b2f7a9c6d93d0e6304c0
+#+busybox-sed.2cfee31fd7b25cfe6405a6096a11362eb80a069875664f5649f639463243e5a2
+#+busybox-vi.29bee0217e5d263338e24dfecc28b62ed9a6a3392689536d3eeae746487991c1
+#+busybox-xxd.eeb6cf68dcb84f58a0d2e3e7dcc97853fcc985fca26374961248bd447aad2413
+#+busybox-process-extra.241c79e106e645d900e8101f3f3dafcc9fa672795caf7759097cf75e19a25986
+#+busybox-procps.e980866ac18249e4e8b4fd19b2ba0c4f27e3f8d48f9cf295404746683d696eb8
+#+busybox-psmisc.2a25fb7feefb2ae86bebbdc93414271d1d7ec5c4a04913d40bd33e1b8a956d86
+#+busybox-ash.047d68a763bf271b25d836092775c5dfb608f488d3405d25f625194862fdffd7
+#+busybox-bc.3efea5e45382792c0790c9ef9be4136caec2a1f964ad995583124a20661c2160
+#+busybox-coreutils.869be1cdc8c2e3638af9ba4a00650040b71d44b8fe3681eb837bbac46dc5449f
+#+busybox-coreutils-extra.0c4bef82c403396f4d41a764aa0f466f996e7d34144cbcf2f4be12bd6cf9a7b9
+#+busybox-daemontools.9cd2b596a8ffc4ac630b41bca6f179751543dc64e84012f9a7b0b26df83402f2
+#+busybox-grep.b1688b0f5cd70ac0d561888013f141125f62c1d0bc063c52316bec2c13dbbe37
+#+busybox-misc.3be09e463c593df65902812f63a19d71fc1860b1c9d7a343e7cb4a62a3ebea68
+#+busybox-sh.9cfe061619c03c7a47bbf17fb506992eb3dfb0c5e73e3f9ade8ef300db28660f
+#+busybox-util-linux-unpriv.2e077d488652bcf954a082519e76ba25061cc4825dbdf50437f380e1a401a18f
+#+busybox-findutils.084cbb0916e4e5f856be25a03e56ac4a81fed63f720d4748e9f37a407d70bd4f
+#+busybox-awk.22d479b57d1c06e32d0cea3b0a270effa55e9ea74e22f92e0d59107054c4d63e
+#+musl-cross-make.4f1d5fa009010016f478462a629416a80fdb40e017a1951a6a2cc6a4d2d6ea6e
+#+gnu-make.7dab527c7b15600bc1a6875466abf226106e1a9ddc686e0ed4e9375709df2e77
+#+busybox-diffutils.4584ea17e56c3945dfa23b1f8a43ff36a2ae56e23fdb2b2a1e9ee4c2352dacf1
 #@untar:-z:sha256:98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1:.
 
 
@@ -126,12 +126,14 @@ $2 == "include" { link($0); next }
 
 END {
 	for(fname in x) { printf "DEBUG: x[\"%s\"]=\"%s\"\n", fname, x[fname] >"/dev/stderr" }
+	retcode = 0
 	for(fname in x) {
 		if(x[fname]) {
 			printf "ERROR: missing expected file \"%s\"\n", fname >"/dev/stderr"
-			exit 3
+			retcode = 3
 		}
 	}
+	exit retcode
 }' >.install-links.new
 mv .install-links.new .install-links