mrrl

commit 939fe60a09e26f619b5b47f13089dc3ac6c3b161
parent 3e9fe534993257c47b8fc0b58ac536cf932c38bf
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Sat, 29 Nov 2025 15:53:42 +0000

Fix AWK syntax in genlinks

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

362 files changed, 8244 insertions(+), 8584 deletions(-)
diff --git a/templates/genlinks_mini b/templates/genlinks_mini
@@ -45,9 +45,9 @@ $2 == "{{libdir}}" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("{{libdir}}", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("{{dynlibdir}}", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "{{infodir}}"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "{{mandir}}"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "{{docdir}}"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "{{infodir}}")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "{{mandir}}")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "{{docdir}}")); next }
 
 $2 == "{{configdir}}" { link($0); next }
 $2 == "{{mandir}}" { link($0); next }
diff --git a/templates/pkg/acl b/templates/pkg/acl
@@ -1,7 +1,7 @@
 {%- set pkg_source="tar.gz" -%}
 {% do skip("TODO: use this package") %}
 {%- set pkg_version="2.3.2" -%}
-{% extends "autotools_static" %}
+{% extends "autotools_static_mini" %}
 {%- block package_deps -%}
 #+{{pkg_install_name("attr")}}
 {% endblock %}
diff --git a/templates/pkg/attr b/templates/pkg/attr
@@ -1,6 +1,6 @@
 {%- set pkg_version="2.5.2" -%}
 {%- set pkg_source="tar.gz" -%}
-{% extends "autotools_static" %}
+{% extends "autotools_static_mini" %}
 {% block configure %}
 LDFLAGS=--static
 {{ super() -}}
diff --git a/templates/pkg/bison b/templates/pkg/bison
@@ -1,6 +1,6 @@
 {%- set pkg_version="3.8.2" -%}
 {%- set pkg_source="tar.xz" -%}
-{% extends "autotools_static" %}
+{% extends "autotools_static_mini" %}
 {% block package_deps -%}
 #+{{pkg_install_name("flex")}}
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
diff --git a/templates/pkg/diffutils b/templates/pkg/diffutils
@@ -1,6 +1,6 @@
 {%- set pkg_version="3.10" -%}
 {%- set pkg_source="tar.xz" -%}
-{% extends "autotools_static" %}
+{% extends "autotools_static_mini" %}
 {% block configure_args %}--disable-nls{% endblock %}
 {% block check -%}
 check_static command/diff
diff --git a/templates/pkg/findutils b/templates/pkg/findutils
@@ -1,6 +1,6 @@
 {%- set pkg_version="4.10.0" -%}
 {%- set pkg_source="tar.xz" -%}
-{% extends "autotools_static" %}
+{% extends "autotools_static_mini" %}
 {% block configure_args %}--disable-nls{% endblock %}
 {% block check -%}
 check_static command/find
diff --git a/templates/pkg/flex b/templates/pkg/flex
@@ -1,6 +1,6 @@
 {%- set pkg_version="2.6.4" -%}
 {%- set pkg_source="tar.gz" -%}
-{% extends "autotools_static" %}
+{% extends "autotools_static_mini" %}
 {% block configure -%}
 export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS"
 export LDFLAGS="--static"
diff --git a/templates/pkg/gnu-make b/templates/pkg/gnu-make
@@ -1,6 +1,6 @@
 {%- set pkg_version="4.4.1" -%}
 {%- set src_dir="make-"+pkg_version -%}
-{% extends "autotools_static" %}
+{% extends "autotools_static_mini" %}
 {%- block template_deps %}{% endblock %}
 {% block package_deps -%}
 #+{{pkg_install_name("musl-cross-make")}}
diff --git a/templates/pkg/gperf b/templates/pkg/gperf
@@ -1,6 +1,6 @@
 {%- set pkg_version="3.1" -%}
 {%- set pkg_source="tar.gz" -%}
-{% extends "autotools_static" %}
+{% extends "autotools_static_mini" %}
 {% block check -%}
 check_static command/gperf
 {% endblock %}
diff --git a/templates/pkg/libarchive b/templates/pkg/libarchive
@@ -1,6 +1,6 @@
 {%- set pkg_version="3.7.2" -%}
 {%- set pkg_source="tar.xz" -%}
-{% extends "autotools_static" %}
+{% extends "autotools_static_mini" %}
 {% block configure -%}
 export LDFLAGS=--static
 {{ super() -}}
diff --git a/templates/pkg/libbsd b/templates/pkg/libbsd
@@ -1,6 +1,6 @@
 {%- set pkg_version="0.11.8" -%}
 {%- set pkg_source="tar.xz" -%}
-{% extends "autotools_static" %}
+{% extends "autotools_static_mini" %}
 {% block package_deps -%}
 #+{{pkg_install_name("libmd")}}
 {% endblock %}
diff --git a/templates/pkg/libmd b/templates/pkg/libmd
@@ -1,6 +1,6 @@
 {%- set pkg_version="1.1.0" -%}
 {%- set pkg_source="tar.xz" -%}
-{% extends "autotools_static" %}
+{% extends "autotools_static_mini" %}
 {% block genlinks_begin %}
 	x["./{{libdir}}/libmd.a"]=1
 	x["./{{includedir}}/rmd160.h"]=1
diff --git a/templates/pkg/libseccomp b/templates/pkg/libseccomp
@@ -1,6 +1,6 @@
 {%- set pkg_version="2.6.0" -%}
 {%- set pkg_source="tar.gz" -%}
-{% extends "autotools_static" %}
+{% extends "autotools_static_mini" %}
 {% block package_deps -%}
 #+{{pkg_install_name("pkgconf-pkg-config")}}
 #+{{pkg_install_name("gperf")}}
diff --git a/templates/pkg/libunwind b/templates/pkg/libunwind
@@ -1,6 +1,6 @@
 {%- set pkg_version="1.8.1" -%}
 {%- set pkg_source="tar.gz" -%}
-{% extends "autotools_static" %}
+{% extends "autotools_static_mini" %}
 {% block configure_args -%}
 	--enable-cxx-exceptions \
 	--enable-coredump \
diff --git a/templates/pkg/m4 b/templates/pkg/m4
@@ -1,6 +1,6 @@
 {%- set pkg_version="1.4.19" -%}
 {%- set pkg_source="tar.gz" -%}
-{% extends "autotools_static" %}
+{% extends "autotools_static_mini" %}
 {%- block template_deps %}{% endblock %}
 {% block package_deps -%}
 {%- import "package_sets" as ps -%}
diff --git a/templates/pkg/patch b/templates/pkg/patch
@@ -1,6 +1,6 @@
 {%- set pkg_version="2.7.6" -%}
 {%- set pkg_source="tar.xz" -%}
-{% extends "autotools_static" %}
+{% extends "autotools_static_mini" %}
 {% block configure_args %}--disable-nls{% endblock %}
 {% block check -%}
 check_static command/patch
diff --git a/templates/pkg/popt b/templates/pkg/popt
@@ -1,6 +1,6 @@
 {%- set pkg_version="1.19" -%}
 {%- set pkg_source="tar.gz" -%}
-{% extends "autotools_static" %}
+{% extends "autotools_static_mini" %}
 {% block configure_args %}--disable-nls{% endblock %}
 {% block genlinks_begin %}
 	x["./{{includedir}}/popt.h"]=1
diff --git a/templates/pkg/rsync b/templates/pkg/rsync
@@ -1,6 +1,6 @@
 {%- set pkg_version="3.2.7" -%}
 {%- set pkg_source="tar.gz" -%}
-{% extends "autotools_static" %}
+{% extends "autotools_static_mini" %}
 {%- import "package_sets" as ps -%}
 {%- block template_deps -%}
 {{ ps.busybox_common() }}
diff --git a/templates/pkg/strace b/templates/pkg/strace
@@ -1,6 +1,6 @@
 {%- set pkg_version="6.13" -%}
 {%- set pkg_source="tar.xz" -%}
-{% extends "autotools_static" %}
+{% extends "autotools_static_mini" %}
 {% block package_deps -%}
 #+{{pkg_install_name("patch")}}
 #+{{pkg_install_name("libunwind")}}
diff --git a/variants/ccx-x86_64/aat b/variants/ccx-x86_64/aat
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+zsh.82e514e97a46638444fd2c4cd350f06448bc0e420106837798f816e61f93a8d8
-#+pthbs-banginstall.dfcc9f95868b03f9f1bc27775713d0cf9f38ba973030e0a886e1c34c0c72f413
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+zsh.314f09fa72addc628a39be341df4fd6a05c86508e74427114ee8ecfad3aa0daf
+#+pthbs-banginstall.4b928bbc9f1757434da2b45fab5a8959939348bf367170eaabd97c836be9e43e
 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat
 
 
@@ -98,9 +98,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/abduco b/variants/ccx-x86_64/abduco
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
 #@git:8c32909a159aaa9484c82b71f05b7a73321eb491:abduco
 
 
@@ -121,9 +121,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
 #@git:c7b36ed27103ee3f9aa01905ba1fac2d606079cf:alpine-keys
 
 
@@ -79,9 +79,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+patch.06e45503237afc561db0492a9dd6e348344308340d6ba563d670031e4f008894
-#+libressl.17d14a88243c1e6ab03ace6cc1c4b09f44c45ebefb8170d0e0c5c598ac08840a
-#+zstd.5aaee80eaa2961048e0584df375f3adbc65332729f1082bca4ec6a8b61fb6062
-#+pkgconf-pkg-config.18dceaa29083112da146e7686701eb2035a024bee88b0ef7e4f3d640ee1af9b1
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+patch.0e3975ff5b4a302fb8f415e49b4e0a756cd29bca495ef34d9aa1ec23149d0d4a
+#+libressl.0d257c1736931d70bd42eb2ce09e01a2b608544628a476871207cf9567e49bef
+#+zstd.d8e56d84c51ce4a2c66001746564a47ef314f7cbdf7c30250f527d89d9f1a5d1
+#+pkgconf-pkg-config.bb0e5a13e9d6d3816f435974a779c013297e262c7fe5a5f9f3325df5dff64e8d
 #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch
 #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools
 
@@ -119,9 +119,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+skalibs.213f85d2881fae1744f8870a18f06179e3ad33b6f22c98df2f0f48a201270f22
-#+libcap.59bd3a6538e3e979c913eea22d0c51181ffebd01441f1d6ede9c4849a4e22414
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+skalibs.8261b51ea57569b4b9b73580d7d818bb048f30c489e5204b0b4e2507214a1d97
+#+libcap.60b73785fae3ea4320bec2661ca30f89feab8325a75639079e2e0c62ca57eb87
 #@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c
 
 
@@ -108,9 +108,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+m4.71b0fceb1252909ac3e136c647ee97b6885ebb27cdbd4fb02d14a429f474ffac
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+m4.ebe5f39b4a169f768e6ba99d26ff9d39d314f936b14fe49b228a08742e5730b1
 #@untar:-z:sha256:c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6:.
 #@untar::sha256:a4facc0856b512ad8ab5aed7b07e14a9629aaf042b1e92377ba22fcfc4c4205b:argp-standalone-1.5.0
 
@@ -116,9 +116,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/attr b/variants/ccx-x86_64/attr
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+m4.71b0fceb1252909ac3e136c647ee97b6885ebb27cdbd4fb02d14a429f474ffac
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+m4.ebe5f39b4a169f768e6ba99d26ff9d39d314f936b14fe49b228a08742e5730b1
 #@untar:-z:sha256:39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87:.
 
 
@@ -89,7 +89,7 @@ LDFLAGS=--static
 
 build_env_static
 autotools_config_static 
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -136,9 +136,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -147,16 +147,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
diff --git a/variants/ccx-x86_64/bison b/variants/ccx-x86_64/bison
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+m4.71b0fceb1252909ac3e136c647ee97b6885ebb27cdbd4fb02d14a429f474ffac
-#+flex.ecbd2bdcc5abd25d4ef923652fc6c158befdda7084b087db3ab7dda51308afbc
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+m4.ebe5f39b4a169f768e6ba99d26ff9d39d314f936b14fe49b228a08742e5730b1
+#+flex.a8e6330e37a5b68ddcdd60c751957aef251a394ae0293a895274445fc7c4d472
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 
@@ -91,7 +91,7 @@ export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS"
 
 build_env_static
 autotools_config_static --disable-nls
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -138,9 +138,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -149,16 +149,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+gnu-make.8318da17e38f9a12733fa1e2242bfaae80b595b20a53f789ecc91850f0f433cd
-#+musl-cross-make.cda5fd3e4f154e21e775b5b2f723f9c57872b16cdef270ff556c7a6960cdbb1b-
\ No newline at end of file
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+gnu-make.e7a4a6e3ee24dee37e06f6aec6ab7d82bb405aeba9b7f07f4efd222033e8a538
+#+musl-cross-make.43fb9dd4736189f7d854bf020f902893965e273641ceac80991bf9070179564b+
\ 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.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.8318da17e38f9a12733fa1e2242bfaae80b595b20a53f789ecc91850f0f433cd
-#+busybox.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.e7a4a6e3ee24dee37e06f6aec6ab7d82bb405aeba9b7f07f4efd222033e8a538
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
 #@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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
 
 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.cda5fd3e4f154e21e775b5b2f723f9c57872b16cdef270ff556c7a6960cdbb1b
-#+gnu-make.8318da17e38f9a12733fa1e2242bfaae80b595b20a53f789ecc91850f0f433cd
+#+musl-cross-make.43fb9dd4736189f7d854bf020f902893965e273641ceac80991bf9070179564b
+#+gnu-make.e7a4a6e3ee24dee37e06f6aec6ab7d82bb405aeba9b7f07f4efd222033e8a538
 #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox
 #@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config
 
 PATH="$pthbs_build_environment:$PATH"
-mcm=/home/ccx/versions/musl-cross-make.cda5fd3e4f154e21e775b5b2f723f9c57872b16cdef270ff556c7a6960cdbb1b
-make=/home/ccx/versions/gnu-make.8318da17e38f9a12733fa1e2242bfaae80b595b20a53f789ecc91850f0f433cd
+mcm=/home/ccx/versions/musl-cross-make.43fb9dd4736189f7d854bf020f902893965e273641ceac80991bf9070179564b
+make=/home/ccx/versions/gnu-make.e7a4a6e3ee24dee37e06f6aec6ab7d82bb405aeba9b7f07f4efd222033e8a538
 
 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.eadd5356d3a3f62875ef56a11c9f0293937cbe67c91318cac4efcd5aa095f202
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
+#+linux-qemu-guest.0b87e50abd2e72f360d3a14350ab6456b6ba7f4d4fae36e48fdff6d8612dfd94
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
 #@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.eadd5356d3a3f62875ef56a11c9f0293937cbe67c91318cac4efcd5aa095f202"
+CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux-qemu-guest.0b87e50abd2e72f360d3a14350ab6456b6ba7f4d4fae36e48fdff6d8612dfd94"
 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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+certdata2pem.b40c0cadb121e94bebdb1ace8da1078b7efde65241035c1702a431edc49482b6
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+certdata2pem.576dd5436cf57e0e8b85ad99a27922109793a552414e2179e1b6ad942b9f7303
 #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:.
 
 
@@ -89,9 +89,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+skalibs.213f85d2881fae1744f8870a18f06179e3ad33b6f22c98df2f0f48a201270f22
-#+s6.e35b9ef84fcf9a69e9ef04fd22da5e72b2a917eb341bdbd1e7fb0bfbe641b481
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+skalibs.8261b51ea57569b4b9b73580d7d818bb048f30c489e5204b0b4e2507214a1d97
+#+s6.ce7acb6925fe79da8e6e25e0b035488c63c601433054d2910b2eaada965b4589
 #@git:461a9ec198c1e2b9c39a34e21786747dbb8671b4:ccx-utils
 
 
@@ -138,9 +138,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/certdata2pem b/variants/ccx-x86_64/certdata2pem
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
 #@sha256:064f7d41106cd9efa08b9e68cf049f44e3be55666bd2ab96d02c508293b8dce7:certdata2pem.c
 
 
@@ -106,9 +106,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/confz b/variants/ccx-x86_64/confz
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+zsh.82e514e97a46638444fd2c4cd350f06448bc0e420106837798f816e61f93a8d8
-#+pthbs-banginstall.dfcc9f95868b03f9f1bc27775713d0cf9f38ba973030e0a886e1c34c0c72f413
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+zsh.314f09fa72addc628a39be341df4fd6a05c86508e74427114ee8ecfad3aa0daf
+#+pthbs-banginstall.4b928bbc9f1757434da2b45fab5a8959939348bf367170eaabd97c836be9e43e
 #@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz
 
 
@@ -95,9 +95,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-dosfstools.082c8505e8504856b248b6f39de79296ab9f7f967c98b907a135abde5e9ff599
-#+busybox-e2fsprogs.586024943410c8938b26e4af2fa01c93c77e95a8e3c727a88feee8763fdf5cd6
-#+busybox-iproute2.c9df1a1c5f61b29ecb0f9ebca71fddde5df330ac45e8aa6b8819c6daf6ed8de7
-#+busybox-iputils.c633b75e059a06fdb639f6e4d51b573b83aa2dbc7db478353a74a4fe16df7954
-#+busybox-net-misc.c82a713ab1239dff7b68347bef7d213c3743fafc70bd2a11a491614a2e70d52b
-#+busybox-net-tools.5a9d16c694cef26b7f17bdde44569e39ed2d9ec848445b728a90058e604cd855
-#+busybox-traceroute.10632edaaec631fed7f3decbf3f1d9432fed3a9d7b22e57de8fdff31f473175f
-#+busybox-wget.55d68755e7797658bd3adbf233e25158d90796da4ffc8f99b813b886c31e9dd9
-#+busybox-chpst.4cd94e4d27a87c4e620a1837eaaa0e60dceef843c7b57bba9be3ccc27c24aad1
-#+busybox-console.d454b6b84deb72034002d720d75ddcef97cb35ddf85fa36226991207319b5fb9
-#+busybox-getty.0d5f3d0cf3b3c7045b8593d17e3fc3f31d3b67a4c8c3351c5bd4e3350f981558
-#+busybox-i2c-tools.503a91d91b19266a775b52d057d92be9fbb0ccab21fe90b8413b829fbd3d44ab
-#+busybox-linux-extra.7d0bbeb541ea411ffb8e4ad2829834036dc10a467b1efba187a3640dd3076dc4
-#+busybox-mtd-utils.8b058942d5aaeacfb96d16df3ef7a2a62e88e1f9ba3fb4cec2f110f48fb333d5
-#+busybox-shadow.73ac712af837e5e783d9e762de8e12721605d8a085665ba2057483119345d4a5
-#+busybox-su.302cb68f398a32d2b353a959dc87d10dda8ca8585992c1f771af3a2c9709421f
-#+busybox-util-linux-priv.28d5d124181aad8bf03d02a88b837cec959833bf6c527962b3f61f9660faaf1e
-#+busybox-logging.0f3de914920894615b7cf2fc1da575e11daef613db4934bd7c0a5eb9ce1f97af
-#+busybox-cron.20f7b5919c276f669ceed33eac256a6ee548e2efc729150c83fb5b3375405ca6
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-login.b45ab3307485f8d4347cd4cf56089efc5dca00ed89396744377fcdcd4ddca512
-#+execline.c021cb4fd44c364d09d3d581b5453eba7ac539af8fcaa45911e9e98e0e3cc3cc
-#+s6.e35b9ef84fcf9a69e9ef04fd22da5e72b2a917eb341bdbd1e7fb0bfbe641b481
-#+ccx-utils.8e0c384e96ad914f904a592857d5ef3f71d870d86fe4a23a2c32cfb1312b1d20
-#+applyuidgid-caps.e2777d9ba79100a8419f5aace207d1fcfe421e02e7dd958d4cd1b71e4339941f
-#+easyseccomp.65da631e6e6c0a24e9300b7c30b4251cd57c7c1460fe3ba5b7db2869b5491e97
-#+mlog.72367cff481701d635fae9c6071760ddf98f1965bc0018580ec65d7680239367
-#+abduco.8c9e679a25370f447e09e02b596dac397f85ad0eae0121b8640730f144f0b8f4
-#+nawk.f13d31fe21bc47400c4a8a33b8c33fdfa9e1a5f0c4fcc5f3e6dd460b368cd5c2
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-dosfstools.eefacf4063a74017ec25edb809e640575e2b39d7b7f9bc64a3b4ab5cff7a7d50
+#+busybox-e2fsprogs.a9a59754385df808bc52f94c0398cbfadaa178600868b8c9f00f4382413e0fc3
+#+busybox-iproute2.4ee9949367b50e9740dc8a72bae9a24448824b40a1d9d26870f816309d1e9ee6
+#+busybox-iputils.8a9de0c1dd9d0aff24e2d61efac1a7a5d0347a8f6bf96ffbaf05f1f741c2f783
+#+busybox-net-misc.635041820b01e5b954b4b9b8210100a82deb8ac763d37542bd20d5a313704fb7
+#+busybox-net-tools.a628d4b7a55aba902488d5d6778fa9ffbb78b6a9f25fff0f37dcd7caf0851a87
+#+busybox-traceroute.90adc3de774bd17af9446c7de7e02e4489866b874dc51519e6855b6fbe8fc573
+#+busybox-wget.eaadf77299148256e47638216c04006c62040940bb73a6c263332d8d8f2a296b
+#+busybox-chpst.ae97b6fb2bade6747667ed6cc67c363a3f24182901c31ada75e998a7b19ea52f
+#+busybox-console.d27cf965d89adf6024676ed416d70991ff5dd7f9ad3d51aeb2598b5357872821
+#+busybox-getty.b90bfb9248f996d6fb13cd2d94b5fca329d085e623fa8a3ed0e86a17d1cc2ea1
+#+busybox-i2c-tools.d146e54f37a421f6ba49bdf7c55c4c8a28c1a97e361cebdc051f4df3050aac11
+#+busybox-linux-extra.b283dc30c75d08daa117331a37e80960edf3f8ab4decabda0af1ac60a0630b90
+#+busybox-mtd-utils.704c58cda7a76ef359e5b11df087b7f8dbfbec536b554a256dc740e079db3bf2
+#+busybox-shadow.752a003fb021d4c38452a64617f5ddfd73322f6fe150bedd3a14663aea3172e6
+#+busybox-su.141ddd2babe7ade8f25c357e3417f63d471522e7e5a7cf36067e1df485c39173
+#+busybox-util-linux-priv.1402e2f690ad55db68f2514075a3a95c96a884a82d1f49cf991172896ccecb39
+#+busybox-logging.63b435942c4ef9b98eb1c52ce009fd765221bd5f2f5f19d5b2bcc878f241d535
+#+busybox-cron.d4aaecca250d5376a54ebf2b7ff4d09263ffdf9ba201e871776afa8d0ff37d48
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-login.4235311f4cb342c326a731b4e64dddf08b6753ceb258751ca1b91d91d6a8928b
+#+execline.62aa9ddd636b6441ef0e28b1f9d71c135187616424d693b978ddff0c05cf3529
+#+s6.ce7acb6925fe79da8e6e25e0b035488c63c601433054d2910b2eaada965b4589
+#+ccx-utils.5b15d51d4178ffe7503552397b42a33e979f4a3d7e38d4491d16bbbd53aa7e9d
+#+applyuidgid-caps.8eb31ae0e7020b3704f7a62b4e0036ab576bf0bf6e01fc7b146af97337b49b61
+#+easyseccomp.63026f36979d51a690bb929473259461d7f1df3b09184fa4d43594e2bf582e7b
+#+mlog.734033e8a7d9428adde6cb2328b9ac1e71a66327d2f3081422c02c9d1e8623e7
+#+abduco.d9d7f92576222893545c23c94bf172a2b23c4bddfa59d253c1ebb616f6384ce6
+#+nawk.e1e0ceecd0021f5f6bfad9bd942b5ad4ffc87bc3d1d3784b7491e9ad888e8e52
 #@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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+zsh.82e514e97a46638444fd2c4cd350f06448bc0e420106837798f816e61f93a8d8
-#+pthbs-banginstall.dfcc9f95868b03f9f1bc27775713d0cf9f38ba973030e0a886e1c34c0c72f413
-#+execline.c021cb4fd44c364d09d3d581b5453eba7ac539af8fcaa45911e9e98e0e3cc3cc
-#+alpine-keys.7c1fcf8df1183d020cbc9cd02af7191e2e3c9f2a83a43c0c022de4bc30f9b332
-#+apk-tools.9709db335cd8154b09a6ac605f9b847aaa65d3e0f5eb5306ec2a5f6e62747b5d
-#+xbps.7fb65cd5079b8846fe45be14f871af716a5a9bda5077995fb8a60403a6a3b9fb
-#+container-bin-image.9d01a45931ea43b53908e131bd225e417218badcf208a6e7e76fe20beb4df61e
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+zsh.314f09fa72addc628a39be341df4fd6a05c86508e74427114ee8ecfad3aa0daf
+#+pthbs-banginstall.4b928bbc9f1757434da2b45fab5a8959939348bf367170eaabd97c836be9e43e
+#+execline.62aa9ddd636b6441ef0e28b1f9d71c135187616424d693b978ddff0c05cf3529
+#+alpine-keys.b69be0462f992a165e9c051911070a16bc72f6d04c5f2c4d5583e8c7dce60650
+#+apk-tools.f5e6eb2c996e52880a4f3ed48eb4c3c4b0f55dfea8c0e9f73442d8f4be272656
+#+xbps.beb27d692aab5937397886d5dae02bb9ae4cde1b38116393419a0f4139c390ec
+#+container-bin-image.a6295db6240878f34b9bdd0270008274e3d4a8a126a152851b7d53f2c2a7efbe
 #@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.9709db335cd8154b09a6ac605f9b847aaa65d3e0f5eb5306ec2a5f6e62747b5d/command/apk.static' "${dest}/deps/command/"
-ln -sf '/home/ccx/versions/xbps.7fb65cd5079b8846fe45be14f871af716a5a9bda5077995fb8a60403a6a3b9fb/command/xbps-install.static' "${dest}/deps/command/"
+ln -sf '/home/ccx/versions/apk-tools.f5e6eb2c996e52880a4f3ed48eb4c3c4b0f55dfea8c0e9f73442d8f4be272656/command/apk.static' "${dest}/deps/command/"
+ln -sf '/home/ccx/versions/xbps.beb27d692aab5937397886d5dae02bb9ae4cde1b38116393419a0f4139c390ec/command/xbps-install.static' "${dest}/deps/command/"
 
-for f in '/home/ccx/versions/alpine-keys.7c1fcf8df1183d020cbc9cd02af7191e2e3c9f2a83a43c0c022de4bc30f9b332'/keys/alpine/*/*; do
+for f in '/home/ccx/versions/alpine-keys.b69be0462f992a165e9c051911070a16bc72f6d04c5f2c4d5583e8c7dce60650'/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.7c1fcf8df1183d020cbc9cd02af7191e2e3c9f2
 done
  
 mkdir -p "${dest}/deps/keys/void"
-for f in '/home/ccx/versions/xbps.7fb65cd5079b8846fe45be14f871af716a5a9bda5077995fb8a60403a6a3b9fb'/keys/void/*; do
+for f in '/home/ccx/versions/xbps.beb27d692aab5937397886d5dae02bb9ae4cde1b38116393419a0f4139c390ec'/keys/void/*; do
 	ln -sf "$f" "${dest}/deps/keys/void/"
 done
 
-test -d '/home/ccx/versions/container-bin-image.9d01a45931ea43b53908e131bd225e417218badcf208a6e7e76fe20beb4df61e/container-bin-image'
-test -f '/home/ccx/versions/container-bin-image.9d01a45931ea43b53908e131bd225e417218badcf208a6e7e76fe20beb4df61e/container-bin-image/if'
-ln -sf '/home/ccx/versions/container-bin-image.9d01a45931ea43b53908e131bd225e417218badcf208a6e7e76fe20beb4df61e/container-bin-image' "${dest}/deps/"
+test -d '/home/ccx/versions/container-bin-image.a6295db6240878f34b9bdd0270008274e3d4a8a126a152851b7d53f2c2a7efbe/container-bin-image'
+test -f '/home/ccx/versions/container-bin-image.a6295db6240878f34b9bdd0270008274e3d4a8a126a152851b7d53f2c2a7efbe/container-bin-image/if'
+ln -sf '/home/ccx/versions/container-bin-image.a6295db6240878f34b9bdd0270008274e3d4a8a126a152851b7d53f2c2a7efbe/container-bin-image' "${dest}/deps/"
  
 
 
@@ -137,9 +137,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-dosfstools.082c8505e8504856b248b6f39de79296ab9f7f967c98b907a135abde5e9ff599
-#+busybox-e2fsprogs.586024943410c8938b26e4af2fa01c93c77e95a8e3c727a88feee8763fdf5cd6
-#+busybox-iproute2.c9df1a1c5f61b29ecb0f9ebca71fddde5df330ac45e8aa6b8819c6daf6ed8de7
-#+busybox-iputils.c633b75e059a06fdb639f6e4d51b573b83aa2dbc7db478353a74a4fe16df7954
-#+busybox-net-misc.c82a713ab1239dff7b68347bef7d213c3743fafc70bd2a11a491614a2e70d52b
-#+busybox-net-tools.5a9d16c694cef26b7f17bdde44569e39ed2d9ec848445b728a90058e604cd855
-#+busybox-traceroute.10632edaaec631fed7f3decbf3f1d9432fed3a9d7b22e57de8fdff31f473175f
-#+busybox-wget.55d68755e7797658bd3adbf233e25158d90796da4ffc8f99b813b886c31e9dd9
-#+busybox-chpst.4cd94e4d27a87c4e620a1837eaaa0e60dceef843c7b57bba9be3ccc27c24aad1
-#+busybox-console.d454b6b84deb72034002d720d75ddcef97cb35ddf85fa36226991207319b5fb9
-#+busybox-getty.0d5f3d0cf3b3c7045b8593d17e3fc3f31d3b67a4c8c3351c5bd4e3350f981558
-#+busybox-i2c-tools.503a91d91b19266a775b52d057d92be9fbb0ccab21fe90b8413b829fbd3d44ab
-#+busybox-linux-extra.7d0bbeb541ea411ffb8e4ad2829834036dc10a467b1efba187a3640dd3076dc4
-#+busybox-mtd-utils.8b058942d5aaeacfb96d16df3ef7a2a62e88e1f9ba3fb4cec2f110f48fb333d5
-#+busybox-shadow.73ac712af837e5e783d9e762de8e12721605d8a085665ba2057483119345d4a5
-#+busybox-su.302cb68f398a32d2b353a959dc87d10dda8ca8585992c1f771af3a2c9709421f
-#+busybox-util-linux-priv.28d5d124181aad8bf03d02a88b837cec959833bf6c527962b3f61f9660faaf1e
-#+busybox-logging.0f3de914920894615b7cf2fc1da575e11daef613db4934bd7c0a5eb9ce1f97af
-#+busybox-cron.20f7b5919c276f669ceed33eac256a6ee548e2efc729150c83fb5b3375405ca6
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+execline.c021cb4fd44c364d09d3d581b5453eba7ac539af8fcaa45911e9e98e0e3cc3cc
-#+s6.e35b9ef84fcf9a69e9ef04fd22da5e72b2a917eb341bdbd1e7fb0bfbe641b481
-#+s6-portable-utils.282b0e074c758130782d2b6f19494728ce7978b85ab1f76faaadf0af500a708e
-#+s6-linux-utils.5b3e6ea8e722f5fe607f538fc50f16d70a634e729ee5e81cd5a2bbdb8f8fb109
-#+zsh.82e514e97a46638444fd2c4cd350f06448bc0e420106837798f816e61f93a8d8
-#+confz.e7f1047b6907b24ab802cb0429ec00381d79463ca8c38911ff0607e72bf4d10e
-#+containers.8026bc4c7f9e98940696277069750f638ab4ff0c9aa7a64cd6f39cd2be867d0b
-#+xbps.7fb65cd5079b8846fe45be14f871af716a5a9bda5077995fb8a60403a6a3b9fb
-#+zstd.5aaee80eaa2961048e0584df375f3adbc65332729f1082bca4ec6a8b61fb6062
-#+apk-tools.9709db335cd8154b09a6ac605f9b847aaa65d3e0f5eb5306ec2a5f6e62747b5d
-#+alpine-keys.7c1fcf8df1183d020cbc9cd02af7191e2e3c9f2a83a43c0c022de4bc30f9b332
-#+getent.95c9ace5e25224e5199d3c10a35632f717198de0db8bdafc2ebb836bfc5c429b
-#+fileset.7026d26a38ed1106dd42dcc2014c781dfb43c3a77f98f97acd68a797978f4178
-#+ccx-utils.8e0c384e96ad914f904a592857d5ef3f71d870d86fe4a23a2c32cfb1312b1d20
-#+easyseccomp.65da631e6e6c0a24e9300b7c30b4251cd57c7c1460fe3ba5b7db2869b5491e97
-#+findutils.3d20afa11a4d98f0dc7c511f601d602f7ded3485bd164aa362efd0f72fb9521a
-#+nawk.f13d31fe21bc47400c4a8a33b8c33fdfa9e1a5f0c4fcc5f3e6dd460b368cd5c2-
\ No newline at end of file
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-dosfstools.eefacf4063a74017ec25edb809e640575e2b39d7b7f9bc64a3b4ab5cff7a7d50
+#+busybox-e2fsprogs.a9a59754385df808bc52f94c0398cbfadaa178600868b8c9f00f4382413e0fc3
+#+busybox-iproute2.4ee9949367b50e9740dc8a72bae9a24448824b40a1d9d26870f816309d1e9ee6
+#+busybox-iputils.8a9de0c1dd9d0aff24e2d61efac1a7a5d0347a8f6bf96ffbaf05f1f741c2f783
+#+busybox-net-misc.635041820b01e5b954b4b9b8210100a82deb8ac763d37542bd20d5a313704fb7
+#+busybox-net-tools.a628d4b7a55aba902488d5d6778fa9ffbb78b6a9f25fff0f37dcd7caf0851a87
+#+busybox-traceroute.90adc3de774bd17af9446c7de7e02e4489866b874dc51519e6855b6fbe8fc573
+#+busybox-wget.eaadf77299148256e47638216c04006c62040940bb73a6c263332d8d8f2a296b
+#+busybox-chpst.ae97b6fb2bade6747667ed6cc67c363a3f24182901c31ada75e998a7b19ea52f
+#+busybox-console.d27cf965d89adf6024676ed416d70991ff5dd7f9ad3d51aeb2598b5357872821
+#+busybox-getty.b90bfb9248f996d6fb13cd2d94b5fca329d085e623fa8a3ed0e86a17d1cc2ea1
+#+busybox-i2c-tools.d146e54f37a421f6ba49bdf7c55c4c8a28c1a97e361cebdc051f4df3050aac11
+#+busybox-linux-extra.b283dc30c75d08daa117331a37e80960edf3f8ab4decabda0af1ac60a0630b90
+#+busybox-mtd-utils.704c58cda7a76ef359e5b11df087b7f8dbfbec536b554a256dc740e079db3bf2
+#+busybox-shadow.752a003fb021d4c38452a64617f5ddfd73322f6fe150bedd3a14663aea3172e6
+#+busybox-su.141ddd2babe7ade8f25c357e3417f63d471522e7e5a7cf36067e1df485c39173
+#+busybox-util-linux-priv.1402e2f690ad55db68f2514075a3a95c96a884a82d1f49cf991172896ccecb39
+#+busybox-logging.63b435942c4ef9b98eb1c52ce009fd765221bd5f2f5f19d5b2bcc878f241d535
+#+busybox-cron.d4aaecca250d5376a54ebf2b7ff4d09263ffdf9ba201e871776afa8d0ff37d48
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+execline.62aa9ddd636b6441ef0e28b1f9d71c135187616424d693b978ddff0c05cf3529
+#+s6.ce7acb6925fe79da8e6e25e0b035488c63c601433054d2910b2eaada965b4589
+#+s6-portable-utils.5a4f55daa1590e74ad5853ae565674567e23902ca38e50c3bbc2f2f27d23fd3c
+#+s6-linux-utils.c37a5e327402dc5749d7603bbd71ad439ac5170e5f23a33a5f561945bcf6c0a1
+#+zsh.314f09fa72addc628a39be341df4fd6a05c86508e74427114ee8ecfad3aa0daf
+#+confz.8ec1173ee5c86b6c24eae60f764ae6a6cfa35760e8fb5ac5cd608c114557189f
+#+containers.40606dcd75ad6d414bd51202b4c310e90fee1440e5e06ff264edd5610d17f610
+#+xbps.beb27d692aab5937397886d5dae02bb9ae4cde1b38116393419a0f4139c390ec
+#+zstd.d8e56d84c51ce4a2c66001746564a47ef314f7cbdf7c30250f527d89d9f1a5d1
+#+apk-tools.f5e6eb2c996e52880a4f3ed48eb4c3c4b0f55dfea8c0e9f73442d8f4be272656
+#+alpine-keys.b69be0462f992a165e9c051911070a16bc72f6d04c5f2c4d5583e8c7dce60650
+#+getent.d9e96e47f70f93726ae1549177c450abe3dc87fe1a826d540f1bdc403f13002f
+#+fileset.40cf2a445f4c75f3f486219d6a29fce964bd3d64b767290e23daf814d2c8bc4c
+#+ccx-utils.5b15d51d4178ffe7503552397b42a33e979f4a3d7e38d4491d16bbbd53aa7e9d
+#+easyseccomp.63026f36979d51a690bb929473259461d7f1df3b09184fa4d43594e2bf582e7b
+#+findutils.75cf5777af27901d2fbb6b4ec727592b702473d768cec80ad39b4065eec65410
+#+nawk.e1e0ceecd0021f5f6bfad9bd942b5ad4ffc87bc3d1d3784b7491e9ad888e8e52+
\ 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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+m4.71b0fceb1252909ac3e136c647ee97b6885ebb27cdbd4fb02d14a429f474ffac
-#+libressl.17d14a88243c1e6ab03ace6cc1c4b09f44c45ebefb8170d0e0c5c598ac08840a
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+m4.ebe5f39b4a169f768e6ba99d26ff9d39d314f936b14fe49b228a08742e5730b1
+#+libressl.0d257c1736931d70bd42eb2ce09e01a2b608544628a476871207cf9567e49bef
 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:.
 
 
@@ -157,9 +157,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-dosfstools.082c8505e8504856b248b6f39de79296ab9f7f967c98b907a135abde5e9ff599
-#+busybox-e2fsprogs.586024943410c8938b26e4af2fa01c93c77e95a8e3c727a88feee8763fdf5cd6
-#+busybox-iproute2.c9df1a1c5f61b29ecb0f9ebca71fddde5df330ac45e8aa6b8819c6daf6ed8de7
-#+busybox-iputils.c633b75e059a06fdb639f6e4d51b573b83aa2dbc7db478353a74a4fe16df7954
-#+busybox-net-misc.c82a713ab1239dff7b68347bef7d213c3743fafc70bd2a11a491614a2e70d52b
-#+busybox-net-tools.5a9d16c694cef26b7f17bdde44569e39ed2d9ec848445b728a90058e604cd855
-#+busybox-traceroute.10632edaaec631fed7f3decbf3f1d9432fed3a9d7b22e57de8fdff31f473175f
-#+busybox-wget.55d68755e7797658bd3adbf233e25158d90796da4ffc8f99b813b886c31e9dd9
-#+busybox-chpst.4cd94e4d27a87c4e620a1837eaaa0e60dceef843c7b57bba9be3ccc27c24aad1
-#+busybox-console.d454b6b84deb72034002d720d75ddcef97cb35ddf85fa36226991207319b5fb9
-#+busybox-getty.0d5f3d0cf3b3c7045b8593d17e3fc3f31d3b67a4c8c3351c5bd4e3350f981558
-#+busybox-i2c-tools.503a91d91b19266a775b52d057d92be9fbb0ccab21fe90b8413b829fbd3d44ab
-#+busybox-linux-extra.7d0bbeb541ea411ffb8e4ad2829834036dc10a467b1efba187a3640dd3076dc4
-#+busybox-mtd-utils.8b058942d5aaeacfb96d16df3ef7a2a62e88e1f9ba3fb4cec2f110f48fb333d5
-#+busybox-shadow.73ac712af837e5e783d9e762de8e12721605d8a085665ba2057483119345d4a5
-#+busybox-su.302cb68f398a32d2b353a959dc87d10dda8ca8585992c1f771af3a2c9709421f
-#+busybox-util-linux-priv.28d5d124181aad8bf03d02a88b837cec959833bf6c527962b3f61f9660faaf1e
-#+busybox-logging.0f3de914920894615b7cf2fc1da575e11daef613db4934bd7c0a5eb9ce1f97af
-#+busybox-cron.20f7b5919c276f669ceed33eac256a6ee548e2efc729150c83fb5b3375405ca6
-#+attr.ae3c7a2a8a562df5e09ea63a9a2ecf5010f23434230ecae0048c74f42dba4256
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+diffutils.300c7d6070fa3f67f80e4db9eb0045da8a29ec664a6158ca32f33930832770cb
-#+patch.06e45503237afc561db0492a9dd6e348344308340d6ba563d670031e4f008894
-#+flex.ecbd2bdcc5abd25d4ef923652fc6c158befdda7084b087db3ab7dda51308afbc
-#+bison.9446cfd6cf4dc7324d6d2069c9abbcbae24c33e96acb4032120af7142b6a5b1e
-#+rsync.0c79f9558617b4183d38b3baf33ac6dbf4202593174ac36e138d5225b1a06e58
-#+execline.c021cb4fd44c364d09d3d581b5453eba7ac539af8fcaa45911e9e98e0e3cc3cc
-#+s6.e35b9ef84fcf9a69e9ef04fd22da5e72b2a917eb341bdbd1e7fb0bfbe641b481
-#+s6-rc.012bd583d88a517c5afb73399ee4ece632468c1d16f36c5f4c5423147347369b
-#+s6-portable-utils.282b0e074c758130782d2b6f19494728ce7978b85ab1f76faaadf0af500a708e
-#+s6-linux-utils.5b3e6ea8e722f5fe607f538fc50f16d70a634e729ee5e81cd5a2bbdb8f8fb109
-#+s6-linux-init.a256cbc8d3a2f861870673826930c4e809f976bd7809204dc141670c8325a43f
-#+mdevd.8977e1530144243519622556e82af2519721ec115d384e1f4d21f69bd37ce043
-#+s6-dns.166bafae66d569f738d150e97c79bf3f124ec2b2f6ef246133d9d585006cd7d6
-#+libressl.17d14a88243c1e6ab03ace6cc1c4b09f44c45ebefb8170d0e0c5c598ac08840a
-#+s6-networking.3d6081057890416a9af62c24c53920c917810e82b2418418723110194a0e77ba
-#+zsh.82e514e97a46638444fd2c4cd350f06448bc0e420106837798f816e61f93a8d8
-#+pthbs-banginstall.dfcc9f95868b03f9f1bc27775713d0cf9f38ba973030e0a886e1c34c0c72f413
-#+aat.78d0a18ccbeee979785a37585d82f1be5b008b3a0b60c235170c4e940d5a62f4
-#+confz.e7f1047b6907b24ab802cb0429ec00381d79463ca8c38911ff0607e72bf4d10e
-#+containers.8026bc4c7f9e98940696277069750f638ab4ff0c9aa7a64cd6f39cd2be867d0b
-#+fileset.7026d26a38ed1106dd42dcc2014c781dfb43c3a77f98f97acd68a797978f4178
-#+logincaps.20a22e5f6ac95ea8aae188f17093be275e92048be7a9da137266d2ca8115ab30
-#+snaprep.d8402e4204644111f87a156041b486f1f1f659b5de6e6ddfa55cd8d427b1d098
-#+curl.3af169f38bdcdc43a00a74b9c8fb65ed96f1ffad59621a0bb0de45e63b47013b
-#+git.de5b94cec317e40461669a51b5701748bffd2ee10846568f6833b3b659b0b00e
-#+xbps.7fb65cd5079b8846fe45be14f871af716a5a9bda5077995fb8a60403a6a3b9fb
-#+apk-tools.9709db335cd8154b09a6ac605f9b847aaa65d3e0f5eb5306ec2a5f6e62747b5d
-#+getent.95c9ace5e25224e5199d3c10a35632f717198de0db8bdafc2ebb836bfc5c429b
-#+getconf.c422b6a1da2c320c7a1b67e8cbf71ae199593fdde1ee478e08e7cf510bce77e0
-#+iconv.74e8751dfa249daba004857134c8307e4b6412d757ec271a8f470fef5d01d493
-#+libcap.59bd3a6538e3e979c913eea22d0c51181ffebd01441f1d6ede9c4849a4e22414
-#+applyuidgid-caps.e2777d9ba79100a8419f5aace207d1fcfe421e02e7dd958d4cd1b71e4339941f
-#+ccx-utils.8e0c384e96ad914f904a592857d5ef3f71d870d86fe4a23a2c32cfb1312b1d20
-#+user-env.efabb13295c7544e99f0c8f96613bcb1ebd6c4f8024290ca4c1242c74a8c105f
-#+strace.40e9d102c40316b3fbaecf7fcb8994569066ea1a1e70a9433bf7a8a8fd4185b8
-#+mlog.72367cff481701d635fae9c6071760ddf98f1965bc0018580ec65d7680239367
-#+findutils.3d20afa11a4d98f0dc7c511f601d602f7ded3485bd164aa362efd0f72fb9521a
-#+nawk.f13d31fe21bc47400c4a8a33b8c33fdfa9e1a5f0c4fcc5f3e6dd460b368cd5c2
-#+squashfs-tools.077ccc4786e6da50b1970f949377e0569e37d1c562653da784fad22626dc7f96
-#+mandoc.8dabaf45cf7b5ea5b68d97d2652d41f4fff205863169c3aa2390d531cf46e0f4
-#+tinyssh.24e9ec76c8584233bec46e54179b54d0f5de0d92da0c0b2666f7994d0b73394f
-#+system-config.5b153883b11d485fa5d453c4adc20c9849a8a55c37686f26c33c3abe17a47705
-#+system-config-rc.620e776aae49dac979134d16da66a96327bdcb3841b4daca92a3f069606f83dc
-#+system-config-scripts.c39928f32e47925474e80aa14cf78fce2b7d9b1066865b00b0e5e10fcc6a14f6
-#+system-config-init.6ffaf7c9d67cbc49bf205ecb7eb2d11d85895506d0540c12d646392d65dffe38
-#+system-config-zsh.d7f274933ee411e74eb5a9d0e2e1ad5a9c1ac792f96b8d8228ea592aaac0afb8
-#+busybox.a01f8444ab1fc4d1d17e0dc88b2db15d8fdd90bb64d18f532f7feb70c742f008-
\ No newline at end of file
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-dosfstools.eefacf4063a74017ec25edb809e640575e2b39d7b7f9bc64a3b4ab5cff7a7d50
+#+busybox-e2fsprogs.a9a59754385df808bc52f94c0398cbfadaa178600868b8c9f00f4382413e0fc3
+#+busybox-iproute2.4ee9949367b50e9740dc8a72bae9a24448824b40a1d9d26870f816309d1e9ee6
+#+busybox-iputils.8a9de0c1dd9d0aff24e2d61efac1a7a5d0347a8f6bf96ffbaf05f1f741c2f783
+#+busybox-net-misc.635041820b01e5b954b4b9b8210100a82deb8ac763d37542bd20d5a313704fb7
+#+busybox-net-tools.a628d4b7a55aba902488d5d6778fa9ffbb78b6a9f25fff0f37dcd7caf0851a87
+#+busybox-traceroute.90adc3de774bd17af9446c7de7e02e4489866b874dc51519e6855b6fbe8fc573
+#+busybox-wget.eaadf77299148256e47638216c04006c62040940bb73a6c263332d8d8f2a296b
+#+busybox-chpst.ae97b6fb2bade6747667ed6cc67c363a3f24182901c31ada75e998a7b19ea52f
+#+busybox-console.d27cf965d89adf6024676ed416d70991ff5dd7f9ad3d51aeb2598b5357872821
+#+busybox-getty.b90bfb9248f996d6fb13cd2d94b5fca329d085e623fa8a3ed0e86a17d1cc2ea1
+#+busybox-i2c-tools.d146e54f37a421f6ba49bdf7c55c4c8a28c1a97e361cebdc051f4df3050aac11
+#+busybox-linux-extra.b283dc30c75d08daa117331a37e80960edf3f8ab4decabda0af1ac60a0630b90
+#+busybox-mtd-utils.704c58cda7a76ef359e5b11df087b7f8dbfbec536b554a256dc740e079db3bf2
+#+busybox-shadow.752a003fb021d4c38452a64617f5ddfd73322f6fe150bedd3a14663aea3172e6
+#+busybox-su.141ddd2babe7ade8f25c357e3417f63d471522e7e5a7cf36067e1df485c39173
+#+busybox-util-linux-priv.1402e2f690ad55db68f2514075a3a95c96a884a82d1f49cf991172896ccecb39
+#+busybox-logging.63b435942c4ef9b98eb1c52ce009fd765221bd5f2f5f19d5b2bcc878f241d535
+#+busybox-cron.d4aaecca250d5376a54ebf2b7ff4d09263ffdf9ba201e871776afa8d0ff37d48
+#+attr.55ff3226f9c5597bba6cb6b0d46416b2e6d40e47929b8068b22406eb21c1afcf
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+diffutils.264116b2f8a2a696fcd70230a252a6a0557dfbfee2f0fd2c9e74f95db4f19dfd
+#+patch.0e3975ff5b4a302fb8f415e49b4e0a756cd29bca495ef34d9aa1ec23149d0d4a
+#+flex.a8e6330e37a5b68ddcdd60c751957aef251a394ae0293a895274445fc7c4d472
+#+bison.1e46e10492ad00af4eb0af979777e6733dff37acb870a783b5c2778bb8d56cf8
+#+rsync.6127f16f505d7403e4351f91839aa0aca36634b273eb9906cf8b0663f37bfd99
+#+execline.62aa9ddd636b6441ef0e28b1f9d71c135187616424d693b978ddff0c05cf3529
+#+s6.ce7acb6925fe79da8e6e25e0b035488c63c601433054d2910b2eaada965b4589
+#+s6-rc.8c9433b6b3974868da0eb771745db7cdb75545b39186b12c43f45a28830c545e
+#+s6-portable-utils.5a4f55daa1590e74ad5853ae565674567e23902ca38e50c3bbc2f2f27d23fd3c
+#+s6-linux-utils.c37a5e327402dc5749d7603bbd71ad439ac5170e5f23a33a5f561945bcf6c0a1
+#+s6-linux-init.2819c598a774f39a33d05293d26bbf71ad6ef610aaf10a7fd7c88a17487655cb
+#+mdevd.bc5e266a5d997f9601d8320618aade618eb2c46ff47de37dff659b4b32c2bba0
+#+s6-dns.d009f1e7dea48eaead6be8c2f4b2d8119e8f1aa292d6dcb51e6c412009d91f86
+#+libressl.0d257c1736931d70bd42eb2ce09e01a2b608544628a476871207cf9567e49bef
+#+s6-networking.5942f95e84ca87407b2af022e116a8c31a15369796c0536eed42c04b454fa74d
+#+zsh.314f09fa72addc628a39be341df4fd6a05c86508e74427114ee8ecfad3aa0daf
+#+pthbs-banginstall.4b928bbc9f1757434da2b45fab5a8959939348bf367170eaabd97c836be9e43e
+#+aat.5f8aedb90767e3d6ddbbfddb69e59bdde7fb7b8faad6bcd91b0be2a6348d0b49
+#+confz.8ec1173ee5c86b6c24eae60f764ae6a6cfa35760e8fb5ac5cd608c114557189f
+#+containers.40606dcd75ad6d414bd51202b4c310e90fee1440e5e06ff264edd5610d17f610
+#+fileset.40cf2a445f4c75f3f486219d6a29fce964bd3d64b767290e23daf814d2c8bc4c
+#+logincaps.e683fcea4766a1dfe0b170c58c5c0c5a1b8152e3b245aa11e5b93b46f0e19df4
+#+snaprep.57fff42dfbcfdf8af82a2245ab76fdfc1f6131e3bd9148c26c24e608a17dffd2
+#+curl.31622a444019875e19d4d8532feb0d745333c209e7fee7ecd0073151aa43b4a8
+#+git.8b47dd5df033eef7fee57bb66b56aee3fe958650329b2a940ded23d6c0c354dd
+#+xbps.beb27d692aab5937397886d5dae02bb9ae4cde1b38116393419a0f4139c390ec
+#+apk-tools.f5e6eb2c996e52880a4f3ed48eb4c3c4b0f55dfea8c0e9f73442d8f4be272656
+#+getent.d9e96e47f70f93726ae1549177c450abe3dc87fe1a826d540f1bdc403f13002f
+#+getconf.07ea68360c917f8e1fd3024b4dc5973fa3b4747515581bf94af7346dfd6f03b7
+#+iconv.df76c6694d18b9a35dc7ffc190f40b3b67c95fee99baae948a35d00043eca621
+#+libcap.60b73785fae3ea4320bec2661ca30f89feab8325a75639079e2e0c62ca57eb87
+#+applyuidgid-caps.8eb31ae0e7020b3704f7a62b4e0036ab576bf0bf6e01fc7b146af97337b49b61
+#+ccx-utils.5b15d51d4178ffe7503552397b42a33e979f4a3d7e38d4491d16bbbd53aa7e9d
+#+user-env.aa6256771d40eac3b3a15265e082ce805527d5a5578ef12d9bbb2aa646f09fb0
+#+strace.580356767c9d232c405221cd06ee53aaee713221b34a663a8d4305c3a68fff59
+#+mlog.734033e8a7d9428adde6cb2328b9ac1e71a66327d2f3081422c02c9d1e8623e7
+#+findutils.75cf5777af27901d2fbb6b4ec727592b702473d768cec80ad39b4065eec65410
+#+nawk.e1e0ceecd0021f5f6bfad9bd942b5ad4ffc87bc3d1d3784b7491e9ad888e8e52
+#+squashfs-tools.48786b31c536a3780952e78e4cde33b63eeddfb948d2fecf2615ef0ec1326abc
+#+mandoc.cc8b2639f6385687d4a816ecffd10d4fdb874e2d81b12e441e4d623e8cc2ebc0
+#+tinyssh.69c1fd3572b6443c36035edfc82ea571e6baf0286e490fac3bd9c0ccb5c76afb
+#+system-config.2d4781db2faca22c838a9d3aee9f4a50e829c4081b761fd216c4ebb51301ad7b
+#+system-config-rc.1298dcffc3b4a3edec10bcd8bdb45cc28c3d9e6ad5a9201b134576d444e73a8f
+#+system-config-scripts.9dc3601801fe0143af4b0581e63a3c9057114daa47012353fca3813626a2a896
+#+system-config-init.7f2b8e641dda17d5f5de18ebd89201bd63b3b33cf354c345667dd864b14f0634
+#+system-config-zsh.00e5db1ede47250805b92009ba7c3167cc6c2a8b389516fc7d47e8138f4b6f96
+#+busybox.bb8729a06821874ffdda0b44281d96c5a935444130c81607f21a25da3629e79b+
\ 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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+m4.71b0fceb1252909ac3e136c647ee97b6885ebb27cdbd4fb02d14a429f474ffac
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+m4.ebe5f39b4a169f768e6ba99d26ff9d39d314f936b14fe49b228a08742e5730b1
 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:.
 
 
@@ -87,7 +87,7 @@ cd 'diffutils-3.10'
 
 build_env_static
 autotools_config_static --disable-nls
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -134,9 +134,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -145,16 +145,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
diff --git a/variants/ccx-x86_64/dune b/variants/ccx-x86_64/dune
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+ocaml.4d75f262bf09e32fff53b0470a750f575ccfc9b7fc86024da53f3d3aef384cce
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+ocaml.cf80a8e71deab5590a05d466358db911292818232925c185d49ecaaaeeb962a5
 #@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.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/home/ccx/versions/musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
 			return 0
 			;;
 		(*)
@@ -133,9 +133,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/easyseccomp b/variants/ccx-x86_64/easyseccomp
@@ -1,42 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+m4.71b0fceb1252909ac3e136c647ee97b6885ebb27cdbd4fb02d14a429f474ffac
-#+patch.06e45503237afc561db0492a9dd6e348344308340d6ba563d670031e4f008894
-#+flex.ecbd2bdcc5abd25d4ef923652fc6c158befdda7084b087db3ab7dda51308afbc
-#+bison.9446cfd6cf4dc7324d6d2069c9abbcbae24c33e96acb4032120af7142b6a5b1e
-#+libseccomp.ae150273f8b6ee0513373b68097592e619a0c0c2156a5cbccedfda2017b17a13
-#+error-standalone.a8a0adec5f4a6ec95a9791deb80155ae27551046207404768d6a3d4e5afa2208
-#+argp-standalone.0c4377f6f004b6761e9cda9255b7f2e8440df32827e24df082c0edc87ea3f55f
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+m4.ebe5f39b4a169f768e6ba99d26ff9d39d314f936b14fe49b228a08742e5730b1
+#+patch.0e3975ff5b4a302fb8f415e49b4e0a756cd29bca495ef34d9aa1ec23149d0d4a
+#+flex.a8e6330e37a5b68ddcdd60c751957aef251a394ae0293a895274445fc7c4d472
+#+bison.1e46e10492ad00af4eb0af979777e6733dff37acb870a783b5c2778bb8d56cf8
+#+libseccomp.6814556065427e35e01d38b4a7db41edae8a1f056dde2964b62759d0983f49ed
+#+error-standalone.6ef32d1b4778a29a971054f497464a4ada75e83897671ef9bf39be21fa51099f
+#+argp-standalone.449160731bf728141b119b4bffceca59132d8a20bb976477f9385423a6996715
 #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp
 #@sha256:eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10:easyseccomp_fix_includes.patch
 #@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
@@ -140,9 +140,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
 #@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:.
 
 
@@ -90,9 +90,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/execline b/variants/ccx-x86_64/execline
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+skalibs.213f85d2881fae1744f8870a18f06179e3ad33b6f22c98df2f0f48a201270f22
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+skalibs.8261b51ea57569b4b9b73580d7d818bb048f30c489e5204b0b4e2507214a1d97
 #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline
 
 
@@ -46,7 +46,7 @@ cd 'execline'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.213f85d2881fae1744f8870a18f06179e3ad33b6f22c98df2f0f48a201270f22/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.8261b51ea57569b4b9b73580d7d818bb048f30c489e5204b0b4e2507214a1d97/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -100,9 +100,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.cda5fd3e4f154e21e775b5b2f723f9c57872b16cdef270ff556c7a6960cdbb1b
-#+gnu-make.8318da17e38f9a12733fa1e2242bfaae80b595b20a53f789ecc91850f0f433cd
-#+busybox.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+skalibs.573e7a84cda96422faa842dd377c36a6b5979d6f02567b741d4802f561565cee
+#+musl-cross-make.43fb9dd4736189f7d854bf020f902893965e273641ceac80991bf9070179564b
+#+gnu-make.e7a4a6e3ee24dee37e06f6aec6ab7d82bb405aeba9b7f07f4efd222033e8a538
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+skalibs.8295b5524c8ec0f55727d5f04618f407e72d7656a6c794ddbb706e64f2eae71f
 #@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.573e7a84cda96422faa842dd377c36a6b5979d6f02567b741d4802f561565cee/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.8295b5524c8ec0f55727d5f04618f407e72d7656a6c794ddbb706e64f2eae71f/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -72,9 +72,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/fileset b/variants/ccx-x86_64/fileset
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+zsh.82e514e97a46638444fd2c4cd350f06448bc0e420106837798f816e61f93a8d8
-#+pthbs-banginstall.dfcc9f95868b03f9f1bc27775713d0cf9f38ba973030e0a886e1c34c0c72f413
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+zsh.314f09fa72addc628a39be341df4fd6a05c86508e74427114ee8ecfad3aa0daf
+#+pthbs-banginstall.4b928bbc9f1757434da2b45fab5a8959939348bf367170eaabd97c836be9e43e
 #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset
 
 
@@ -97,9 +97,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/findutils b/variants/ccx-x86_64/findutils
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+m4.71b0fceb1252909ac3e136c647ee97b6885ebb27cdbd4fb02d14a429f474ffac
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+m4.ebe5f39b4a169f768e6ba99d26ff9d39d314f936b14fe49b228a08742e5730b1
 #@untar:-J:sha256:1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5:.
 
 
@@ -87,7 +87,7 @@ cd 'findutils-4.10.0'
 
 build_env_static
 autotools_config_static --disable-nls
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -143,9 +143,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -154,16 +154,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
diff --git a/variants/ccx-x86_64/flex b/variants/ccx-x86_64/flex
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+m4.71b0fceb1252909ac3e136c647ee97b6885ebb27cdbd4fb02d14a429f474ffac
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+m4.ebe5f39b4a169f768e6ba99d26ff9d39d314f936b14fe49b228a08742e5730b1
 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
 
 
@@ -90,7 +90,7 @@ export LDFLAGS="--static"
 
 build_env_static
 autotools_config_static 
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -138,9 +138,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -149,16 +149,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
diff --git a/variants/ccx-x86_64/getconf b/variants/ccx-x86_64/getconf
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
 #@sha256:d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c:getconf.c
 
 
@@ -104,9 +104,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/getent b/variants/ccx-x86_64/getent
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
 #@sha256:002c1a216f6bed0f816ab1cfebde94a0b127193ef410c36b2190599983e015b8:getent.c
 
 
@@ -104,9 +104,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/git b/variants/ccx-x86_64/git
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+m4.71b0fceb1252909ac3e136c647ee97b6885ebb27cdbd4fb02d14a429f474ffac
-#+libressl.17d14a88243c1e6ab03ace6cc1c4b09f44c45ebefb8170d0e0c5c598ac08840a
-#+curl.3af169f38bdcdc43a00a74b9c8fb65ed96f1ffad59621a0bb0de45e63b47013b
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+m4.ebe5f39b4a169f768e6ba99d26ff9d39d314f936b14fe49b228a08742e5730b1
+#+libressl.0d257c1736931d70bd42eb2ce09e01a2b608544628a476871207cf9567e49bef
+#+curl.31622a444019875e19d4d8532feb0d745333c209e7fee7ecd0073151aa43b4a8
 #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:.
 
 
@@ -115,9 +115,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.8318da17e38f9a12733fa1e2242bfaae80b595b20a53f789ecc91850f0f433cd
-#+busybox.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.e7a4a6e3ee24dee37e06f6aec6ab7d82bb405aeba9b7f07f4efd222033e8a538
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -58,7 +58,7 @@ cd 'make-4.4.1'
 
 build_env_static
 autotools_config_static --disable-nls
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -104,9 +104,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -115,16 +115,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
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.cda5fd3e4f154e21e775b5b2f723f9c57872b16cdef270ff556c7a6960cdbb1b
+#+musl-cross-make.43fb9dd4736189f7d854bf020f902893965e273641ceac80991bf9070179564b
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -36,7 +36,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'make-4.4.1'
 
 
-mcm=/home/ccx/versions/musl-cross-make.cda5fd3e4f154e21e775b5b2f723f9c57872b16cdef270ff556c7a6960cdbb1b
+mcm=/home/ccx/versions/musl-cross-make.43fb9dd4736189f7d854bf020f902893965e273641ceac80991bf9070179564b
 
 export CC="$mcm/bin/x86_64-linux-musl-gcc"
 export CXX="$mcm/bin/x86_64-linux-musl-g++"
@@ -88,9 +88,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/gperf b/variants/ccx-x86_64/gperf
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+m4.71b0fceb1252909ac3e136c647ee97b6885ebb27cdbd4fb02d14a429f474ffac
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+m4.ebe5f39b4a169f768e6ba99d26ff9d39d314f936b14fe49b228a08742e5730b1
 #@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:.
 
 
@@ -87,7 +87,7 @@ cd 'gperf-3.1'
 
 build_env_static
 autotools_config_static 
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -131,9 +131,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -142,16 +142,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
diff --git a/variants/ccx-x86_64/iconv b/variants/ccx-x86_64/iconv
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
 #@sha256:f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7:iconv.c
 
 
@@ -104,9 +104,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/kbd b/variants/ccx-x86_64/kbd
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+m4.71b0fceb1252909ac3e136c647ee97b6885ebb27cdbd4fb02d14a429f474ffac
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+m4.ebe5f39b4a169f768e6ba99d26ff9d39d314f936b14fe49b228a08742e5730b1
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 
@@ -137,9 +137,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.eadd5356d3a3f62875ef56a11c9f0293937cbe67c91318cac4efcd5aa095f202
-#+busybox.a01f8444ab1fc4d1d17e0dc88b2db15d8fdd90bb64d18f532f7feb70c742f008-
\ No newline at end of file
+#+linux-qemu-guest.0b87e50abd2e72f360d3a14350ab6456b6ba7f4d4fae36e48fdff6d8612dfd94
+#+busybox.bb8729a06821874ffdda0b44281d96c5a935444130c81607f21a25da3629e79b+
\ 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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+m4.71b0fceb1252909ac3e136c647ee97b6885ebb27cdbd4fb02d14a429f474ffac
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+m4.ebe5f39b4a169f768e6ba99d26ff9d39d314f936b14fe49b228a08742e5730b1
 #@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:.
 
 
@@ -88,7 +88,7 @@ export LDFLAGS=--static
 
 build_env_static
 autotools_config_static --without-xml2
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -136,9 +136,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -147,16 +147,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
diff --git a/variants/ccx-x86_64/libbsd b/variants/ccx-x86_64/libbsd
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+m4.71b0fceb1252909ac3e136c647ee97b6885ebb27cdbd4fb02d14a429f474ffac
-#+libmd.99e6b960135e7e3efb5731b93b177293cc05291825f722a0095f307309a461e4
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+m4.ebe5f39b4a169f768e6ba99d26ff9d39d314f936b14fe49b228a08742e5730b1
+#+libmd.e76f049073b5dde3f56e0ca85b3e05ea55bb7b922b5c8f99edd5356fe9b9c2cb
 #@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:.
 
 
@@ -88,7 +88,7 @@ cd 'libbsd-0.11.8'
 
 build_env_static
 autotools_config_static 
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -132,9 +132,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -143,16 +143,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
diff --git a/variants/ccx-x86_64/libcap b/variants/ccx-x86_64/libcap
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+pkgconf-pkg-config.18dceaa29083112da146e7686701eb2035a024bee88b0ef7e4f3d640ee1af9b1
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+pkgconf-pkg-config.bb0e5a13e9d6d3816f435974a779c013297e262c7fe5a5f9f3325df5dff64e8d
 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:.
 
 
@@ -130,9 +130,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.cda5fd3e4f154e21e775b5b2f723f9c57872b16cdef270ff556c7a6960cdbb1b
-#+gnu-make.8318da17e38f9a12733fa1e2242bfaae80b595b20a53f789ecc91850f0f433cd
-#+busybox.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
+#+musl-cross-make.43fb9dd4736189f7d854bf020f902893965e273641ceac80991bf9070179564b
+#+gnu-make.e7a4a6e3ee24dee37e06f6aec6ab7d82bb405aeba9b7f07f4efd222033e8a538
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:.
 
 
@@ -79,9 +79,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/libcgroup b/variants/ccx-x86_64/libcgroup
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+m4.71b0fceb1252909ac3e136c647ee97b6885ebb27cdbd4fb02d14a429f474ffac
-#+flex.ecbd2bdcc5abd25d4ef923652fc6c158befdda7084b087db3ab7dda51308afbc
-#+bison.9446cfd6cf4dc7324d6d2069c9abbcbae24c33e96acb4032120af7142b6a5b1e
-#+musl-fts.8ca195d369a021220f7142d0347017cb08d0a122a309df876b98fedea05a034d
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+m4.ebe5f39b4a169f768e6ba99d26ff9d39d314f936b14fe49b228a08742e5730b1
+#+flex.a8e6330e37a5b68ddcdd60c751957aef251a394ae0293a895274445fc7c4d472
+#+bison.1e46e10492ad00af4eb0af979777e6733dff37acb870a783b5c2778bb8d56cf8
+#+musl-fts.fc8edce6a3a53594b53c11faf53afd0c1075f0327934013f6fc6d69548193aef
 #@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:.
 
 
@@ -145,9 +145,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/libelf b/variants/ccx-x86_64/libelf
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+zstd.5aaee80eaa2961048e0584df375f3adbc65332729f1082bca4ec6a8b61fb6062
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+zstd.d8e56d84c51ce4a2c66001746564a47ef314f7cbdf7c30250f527d89d9f1a5d1
 #@git:288355d104ff9930520c0283fe82556c6cc5c16f:libelf
 
 
@@ -109,9 +109,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/libmd b/variants/ccx-x86_64/libmd
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+m4.71b0fceb1252909ac3e136c647ee97b6885ebb27cdbd4fb02d14a429f474ffac
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+m4.ebe5f39b4a169f768e6ba99d26ff9d39d314f936b14fe49b228a08742e5730b1
 #@untar:-J:sha256:1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332:.
 
 
@@ -87,7 +87,7 @@ cd 'libmd-1.1.0'
 
 build_env_static
 autotools_config_static 
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -132,9 +132,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -143,16 +143,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
diff --git a/variants/ccx-x86_64/libressl b/variants/ccx-x86_64/libressl
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+m4.71b0fceb1252909ac3e136c647ee97b6885ebb27cdbd4fb02d14a429f474ffac
-#+ca-certificates-wip-donotuse.6467aed4dfd4fbf5423c52f5848a940ad13590b6c07a30155dd46f84bde52bfc
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+m4.ebe5f39b4a169f768e6ba99d26ff9d39d314f936b14fe49b228a08742e5730b1
+#+ca-certificates-wip-donotuse.f309d585e790ddd4652142fbb13effe141e3e3632da7d5c4e44d4b2c3d5aabdd
 #@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.6467aed4dfd4fbf5423c52f5848a940ad13590b6c07a30155dd46f84bde52bfc/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
+cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.f309d585e790ddd4652142fbb13effe141e3e3632da7d5c4e44d4b2c3d5aabdd/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
@@ -159,9 +159,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/libseccomp b/variants/ccx-x86_64/libseccomp
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+m4.71b0fceb1252909ac3e136c647ee97b6885ebb27cdbd4fb02d14a429f474ffac
-#+pkgconf-pkg-config.18dceaa29083112da146e7686701eb2035a024bee88b0ef7e4f3d640ee1af9b1
-#+gperf.e0ea20dff0406bcb8da59b8a473ffa3eb88c6b15824620e797163a774d43ce3d
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+m4.ebe5f39b4a169f768e6ba99d26ff9d39d314f936b14fe49b228a08742e5730b1
+#+pkgconf-pkg-config.bb0e5a13e9d6d3816f435974a779c013297e262c7fe5a5f9f3325df5dff64e8d
+#+gperf.7e0365ce7ead3d90588019734268ba577c41965e0aa1401b88783a699750a612
 #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:.
 
 
@@ -91,7 +91,7 @@ export LDFLAGS="--static"
 
 build_env_static
 autotools_config_static 
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -137,9 +137,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -148,16 +148,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
diff --git a/variants/ccx-x86_64/libunwind b/variants/ccx-x86_64/libunwind
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+m4.71b0fceb1252909ac3e136c647ee97b6885ebb27cdbd4fb02d14a429f474ffac
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+m4.ebe5f39b4a169f768e6ba99d26ff9d39d314f936b14fe49b228a08742e5730b1
 #@untar:-z:sha256:ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157:.
 
 
@@ -92,7 +92,7 @@ autotools_config_static --enable-cxx-exceptions \
 	--enable-setjmp \
 	--enable-zlib
 
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -137,9 +137,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -148,16 +148,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
diff --git a/variants/ccx-x86_64/linux b/variants/ccx-x86_64/linux
@@ -1,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-modutils.39003b7ad829914af530f27e930e31df1115b3aa7731059f55fdfff60ed1b8b2
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+findutils.3d20afa11a4d98f0dc7c511f601d602f7ded3485bd164aa362efd0f72fb9521a
-#+diffutils.300c7d6070fa3f67f80e4db9eb0045da8a29ec664a6158ca32f33930832770cb
-#+patch.06e45503237afc561db0492a9dd6e348344308340d6ba563d670031e4f008894
-#+flex.ecbd2bdcc5abd25d4ef923652fc6c158befdda7084b087db3ab7dda51308afbc
-#+bison.9446cfd6cf4dc7324d6d2069c9abbcbae24c33e96acb4032120af7142b6a5b1e
-#+rsync.0c79f9558617b4183d38b3baf33ac6dbf4202593174ac36e138d5225b1a06e58
-#+zstd.5aaee80eaa2961048e0584df375f3adbc65332729f1082bca4ec6a8b61fb6062
-#+libelf.4cdae1469f8557750a40c0e3b18a8e1d7299068146fd3cd5bfb282f4675d36fc
-#+pkgconf-pkg-config.18dceaa29083112da146e7686701eb2035a024bee88b0ef7e4f3d640ee1af9b1
-#+nawk.f13d31fe21bc47400c4a8a33b8c33fdfa9e1a5f0c4fcc5f3e6dd460b368cd5c2
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-modutils.57450275561456b73cbb6e67145aacb7e7a69a7e873856915d496c1b20acc7ca
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+findutils.75cf5777af27901d2fbb6b4ec727592b702473d768cec80ad39b4065eec65410
+#+diffutils.264116b2f8a2a696fcd70230a252a6a0557dfbfee2f0fd2c9e74f95db4f19dfd
+#+patch.0e3975ff5b4a302fb8f415e49b4e0a756cd29bca495ef34d9aa1ec23149d0d4a
+#+flex.a8e6330e37a5b68ddcdd60c751957aef251a394ae0293a895274445fc7c4d472
+#+bison.1e46e10492ad00af4eb0af979777e6733dff37acb870a783b5c2778bb8d56cf8
+#+rsync.6127f16f505d7403e4351f91839aa0aca36634b273eb9906cf8b0663f37bfd99
+#+zstd.d8e56d84c51ce4a2c66001746564a47ef314f7cbdf7c30250f527d89d9f1a5d1
+#+libelf.9aff8a480d4a6ec000464e5745cb2730ec980d1f59b2c1aa4bc63a7d605042bf
+#+pkgconf-pkg-config.bb0e5a13e9d6d3816f435974a779c013297e262c7fe5a5f9f3325df5dff64e8d
+#+nawk.e1e0ceecd0021f5f6bfad9bd942b5ad4ffc87bc3d1d3784b7491e9ad888e8e52
 #@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:.
 #@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz
 #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config
@@ -135,9 +135,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-modutils.39003b7ad829914af530f27e930e31df1115b3aa7731059f55fdfff60ed1b8b2
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+findutils.3d20afa11a4d98f0dc7c511f601d602f7ded3485bd164aa362efd0f72fb9521a
-#+diffutils.300c7d6070fa3f67f80e4db9eb0045da8a29ec664a6158ca32f33930832770cb
-#+patch.06e45503237afc561db0492a9dd6e348344308340d6ba563d670031e4f008894
-#+flex.ecbd2bdcc5abd25d4ef923652fc6c158befdda7084b087db3ab7dda51308afbc
-#+bison.9446cfd6cf4dc7324d6d2069c9abbcbae24c33e96acb4032120af7142b6a5b1e
-#+rsync.0c79f9558617b4183d38b3baf33ac6dbf4202593174ac36e138d5225b1a06e58
-#+zstd.5aaee80eaa2961048e0584df375f3adbc65332729f1082bca4ec6a8b61fb6062
-#+libelf.4cdae1469f8557750a40c0e3b18a8e1d7299068146fd3cd5bfb282f4675d36fc
-#+pkgconf-pkg-config.18dceaa29083112da146e7686701eb2035a024bee88b0ef7e4f3d640ee1af9b1
-#+nawk.f13d31fe21bc47400c4a8a33b8c33fdfa9e1a5f0c4fcc5f3e6dd460b368cd5c2
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-modutils.57450275561456b73cbb6e67145aacb7e7a69a7e873856915d496c1b20acc7ca
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+findutils.75cf5777af27901d2fbb6b4ec727592b702473d768cec80ad39b4065eec65410
+#+diffutils.264116b2f8a2a696fcd70230a252a6a0557dfbfee2f0fd2c9e74f95db4f19dfd
+#+patch.0e3975ff5b4a302fb8f415e49b4e0a756cd29bca495ef34d9aa1ec23149d0d4a
+#+flex.a8e6330e37a5b68ddcdd60c751957aef251a394ae0293a895274445fc7c4d472
+#+bison.1e46e10492ad00af4eb0af979777e6733dff37acb870a783b5c2778bb8d56cf8
+#+rsync.6127f16f505d7403e4351f91839aa0aca36634b273eb9906cf8b0663f37bfd99
+#+zstd.d8e56d84c51ce4a2c66001746564a47ef314f7cbdf7c30250f527d89d9f1a5d1
+#+libelf.9aff8a480d4a6ec000464e5745cb2730ec980d1f59b2c1aa4bc63a7d605042bf
+#+pkgconf-pkg-config.bb0e5a13e9d6d3816f435974a779c013297e262c7fe5a5f9f3325df5dff64e8d
+#+nawk.e1e0ceecd0021f5f6bfad9bd942b5ad4ffc87bc3d1d3784b7491e9ad888e8e52
 #@untar:-J:sha256:7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764:.
 #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config
 #@sha256:ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417:noobjtool.patch
@@ -133,9 +133,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.cda5fd3e4f154e21e775b5b2f723f9c57872b16cdef270ff556c7a6960cdbb1b
-#+gnu-make.8318da17e38f9a12733fa1e2242bfaae80b595b20a53f789ecc91850f0f433cd
-#+busybox.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+skalibs.573e7a84cda96422faa842dd377c36a6b5979d6f02567b741d4802f561565cee
-#+execline.27ab2a4e327fcbbe7b5d2d6dc87846d4088bb3cde77c426942e936e06b272358
-#+libcap.726b6bcf7cfaba00a8efafd81f97a449dafe6a6455163cab0cd6a1219d3b5937
+#+musl-cross-make.43fb9dd4736189f7d854bf020f902893965e273641ceac80991bf9070179564b
+#+gnu-make.e7a4a6e3ee24dee37e06f6aec6ab7d82bb405aeba9b7f07f4efd222033e8a538
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+skalibs.8295b5524c8ec0f55727d5f04618f407e72d7656a6c794ddbb706e64f2eae71f
+#+execline.cacbf244584ed78052217c951ba9788d9e5ec4d2516bfeb23ef9f1bd33e436e5
+#+libcap.b49a295e717ceddd36bef9932f574331ab63a78f6826d8b629c443e20b695e89
 #@git:7fbfb934cdaa187a063a4df41498c06c46d4a6a9:lnstools
 
 
@@ -71,9 +71,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/logincaps b/variants/ccx-x86_64/logincaps
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+zsh.82e514e97a46638444fd2c4cd350f06448bc0e420106837798f816e61f93a8d8
-#+pthbs-banginstall.dfcc9f95868b03f9f1bc27775713d0cf9f38ba973030e0a886e1c34c0c72f413
-#+execline.c021cb4fd44c364d09d3d581b5453eba7ac539af8fcaa45911e9e98e0e3cc3cc
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+ccx-utils.8e0c384e96ad914f904a592857d5ef3f71d870d86fe4a23a2c32cfb1312b1d20
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+zsh.314f09fa72addc628a39be341df4fd6a05c86508e74427114ee8ecfad3aa0daf
+#+pthbs-banginstall.4b928bbc9f1757434da2b45fab5a8959939348bf367170eaabd97c836be9e43e
+#+execline.62aa9ddd636b6441ef0e28b1f9d71c135187616424d693b978ddff0c05cf3529
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+ccx-utils.5b15d51d4178ffe7503552397b42a33e979f4a3d7e38d4491d16bbbd53aa7e9d
 #@git:409db79b3e7e5fc6b73305471d9bbb6ac5c14036:logincaps
 
 
@@ -132,9 +132,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
 
 
@@ -86,7 +86,7 @@ cd 'm4-1.4.19'
 
 build_env_static
 autotools_config_static --disable-nls
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -131,9 +131,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -142,16 +142,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
diff --git a/variants/ccx-x86_64/mandoc b/variants/ccx-x86_64/mandoc
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
 #@untar:-z:sha256:8bf0d570f01e70a6e124884088870cbed7537f36328d512909eb10cd53179d9c:.
 
 
@@ -124,9 +124,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+zsh.82e514e97a46638444fd2c4cd350f06448bc0e420106837798f816e61f93a8d8
-#+pthbs-banginstall.dfcc9f95868b03f9f1bc27775713d0cf9f38ba973030e0a886e1c34c0c72f413
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+zsh.314f09fa72addc628a39be341df4fd6a05c86508e74427114ee8ecfad3aa0daf
+#+pthbs-banginstall.4b928bbc9f1757434da2b45fab5a8959939348bf367170eaabd97c836be9e43e
 #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts
 
 
@@ -79,9 +79,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/mdevd b/variants/ccx-x86_64/mdevd
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+skalibs.213f85d2881fae1744f8870a18f06179e3ad33b6f22c98df2f0f48a201270f22
-#+execline.c021cb4fd44c364d09d3d581b5453eba7ac539af8fcaa45911e9e98e0e3cc3cc
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+skalibs.8261b51ea57569b4b9b73580d7d818bb048f30c489e5204b0b4e2507214a1d97
+#+execline.62aa9ddd636b6441ef0e28b1f9d71c135187616424d693b978ddff0c05cf3529
 #@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd
 
 
@@ -47,7 +47,7 @@ cd 'mdevd'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.213f85d2881fae1744f8870a18f06179e3ad33b6f22c98df2f0f48a201270f22/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.8261b51ea57569b4b9b73580d7d818bb048f30c489e5204b0b4e2507214a1d97/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -93,9 +93,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-dosfstools.082c8505e8504856b248b6f39de79296ab9f7f967c98b907a135abde5e9ff599
-#+busybox-e2fsprogs.586024943410c8938b26e4af2fa01c93c77e95a8e3c727a88feee8763fdf5cd6
-#+busybox-iproute2.c9df1a1c5f61b29ecb0f9ebca71fddde5df330ac45e8aa6b8819c6daf6ed8de7
-#+busybox-iputils.c633b75e059a06fdb639f6e4d51b573b83aa2dbc7db478353a74a4fe16df7954
-#+busybox-net-misc.c82a713ab1239dff7b68347bef7d213c3743fafc70bd2a11a491614a2e70d52b
-#+busybox-net-tools.5a9d16c694cef26b7f17bdde44569e39ed2d9ec848445b728a90058e604cd855
-#+busybox-traceroute.10632edaaec631fed7f3decbf3f1d9432fed3a9d7b22e57de8fdff31f473175f
-#+busybox-wget.55d68755e7797658bd3adbf233e25158d90796da4ffc8f99b813b886c31e9dd9
-#+busybox-chpst.4cd94e4d27a87c4e620a1837eaaa0e60dceef843c7b57bba9be3ccc27c24aad1
-#+busybox-console.d454b6b84deb72034002d720d75ddcef97cb35ddf85fa36226991207319b5fb9
-#+busybox-getty.0d5f3d0cf3b3c7045b8593d17e3fc3f31d3b67a4c8c3351c5bd4e3350f981558
-#+busybox-i2c-tools.503a91d91b19266a775b52d057d92be9fbb0ccab21fe90b8413b829fbd3d44ab
-#+busybox-linux-extra.7d0bbeb541ea411ffb8e4ad2829834036dc10a467b1efba187a3640dd3076dc4
-#+busybox-mtd-utils.8b058942d5aaeacfb96d16df3ef7a2a62e88e1f9ba3fb4cec2f110f48fb333d5
-#+busybox-shadow.73ac712af837e5e783d9e762de8e12721605d8a085665ba2057483119345d4a5
-#+busybox-su.302cb68f398a32d2b353a959dc87d10dda8ca8585992c1f771af3a2c9709421f
-#+busybox-util-linux-priv.28d5d124181aad8bf03d02a88b837cec959833bf6c527962b3f61f9660faaf1e
-#+busybox-logging.0f3de914920894615b7cf2fc1da575e11daef613db4934bd7c0a5eb9ce1f97af
-#+busybox-cron.20f7b5919c276f669ceed33eac256a6ee548e2efc729150c83fb5b3375405ca6
-#+execline.c021cb4fd44c364d09d3d581b5453eba7ac539af8fcaa45911e9e98e0e3cc3cc
-#+s6.e35b9ef84fcf9a69e9ef04fd22da5e72b2a917eb341bdbd1e7fb0bfbe641b481
-#+mdev-scripts.8e1d46b8f98df9e4186880543d4beb685265dc03a51db2acf85b0bd0dc9b4dc3
-#+mdevd.8977e1530144243519622556e82af2519721ec115d384e1f4d21f69bd37ce043
-#+busybox.a01f8444ab1fc4d1d17e0dc88b2db15d8fdd90bb64d18f532f7feb70c742f008-
\ No newline at end of file
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-dosfstools.eefacf4063a74017ec25edb809e640575e2b39d7b7f9bc64a3b4ab5cff7a7d50
+#+busybox-e2fsprogs.a9a59754385df808bc52f94c0398cbfadaa178600868b8c9f00f4382413e0fc3
+#+busybox-iproute2.4ee9949367b50e9740dc8a72bae9a24448824b40a1d9d26870f816309d1e9ee6
+#+busybox-iputils.8a9de0c1dd9d0aff24e2d61efac1a7a5d0347a8f6bf96ffbaf05f1f741c2f783
+#+busybox-net-misc.635041820b01e5b954b4b9b8210100a82deb8ac763d37542bd20d5a313704fb7
+#+busybox-net-tools.a628d4b7a55aba902488d5d6778fa9ffbb78b6a9f25fff0f37dcd7caf0851a87
+#+busybox-traceroute.90adc3de774bd17af9446c7de7e02e4489866b874dc51519e6855b6fbe8fc573
+#+busybox-wget.eaadf77299148256e47638216c04006c62040940bb73a6c263332d8d8f2a296b
+#+busybox-chpst.ae97b6fb2bade6747667ed6cc67c363a3f24182901c31ada75e998a7b19ea52f
+#+busybox-console.d27cf965d89adf6024676ed416d70991ff5dd7f9ad3d51aeb2598b5357872821
+#+busybox-getty.b90bfb9248f996d6fb13cd2d94b5fca329d085e623fa8a3ed0e86a17d1cc2ea1
+#+busybox-i2c-tools.d146e54f37a421f6ba49bdf7c55c4c8a28c1a97e361cebdc051f4df3050aac11
+#+busybox-linux-extra.b283dc30c75d08daa117331a37e80960edf3f8ab4decabda0af1ac60a0630b90
+#+busybox-mtd-utils.704c58cda7a76ef359e5b11df087b7f8dbfbec536b554a256dc740e079db3bf2
+#+busybox-shadow.752a003fb021d4c38452a64617f5ddfd73322f6fe150bedd3a14663aea3172e6
+#+busybox-su.141ddd2babe7ade8f25c357e3417f63d471522e7e5a7cf36067e1df485c39173
+#+busybox-util-linux-priv.1402e2f690ad55db68f2514075a3a95c96a884a82d1f49cf991172896ccecb39
+#+busybox-logging.63b435942c4ef9b98eb1c52ce009fd765221bd5f2f5f19d5b2bcc878f241d535
+#+busybox-cron.d4aaecca250d5376a54ebf2b7ff4d09263ffdf9ba201e871776afa8d0ff37d48
+#+execline.62aa9ddd636b6441ef0e28b1f9d71c135187616424d693b978ddff0c05cf3529
+#+s6.ce7acb6925fe79da8e6e25e0b035488c63c601433054d2910b2eaada965b4589
+#+mdev-scripts.77e7adcffe6e7425048d8f647381769c2ff68e706d89c91c5ad3475efaa92764
+#+mdevd.bc5e266a5d997f9601d8320618aade618eb2c46ff47de37dff659b4b32c2bba0
+#+busybox.bb8729a06821874ffdda0b44281d96c5a935444130c81607f21a25da3629e79b+
\ 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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
 #@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog
 
 
@@ -106,9 +106,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.cda5fd3e4f154e21e775b5b2f723f9c57872b16cdef270ff556c7a6960cdbb1b
-#+gnu-make.8318da17e38f9a12733fa1e2242bfaae80b595b20a53f789ecc91850f0f433cd
-#+busybox.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
+#+musl-cross-make.43fb9dd4736189f7d854bf020f902893965e273641ceac80991bf9070179564b
+#+gnu-make.e7a4a6e3ee24dee37e06f6aec6ab7d82bb405aeba9b7f07f4efd222033e8a538
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
 #@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
@@ -141,9 +141,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/musl-cross-make:bootstrap-0 b/variants/ccx-x86_64/musl-cross-make:bootstrap-0
@@ -92,9 +92,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.f6244cefe5015651f354055c1c43019a76bf5a7c6ec7a4aaff2c446b14746e70
+#+musl-cross-make.3608404e2923765f631cb9a26ae8fd4d3cb181bd27480a0d5a254386f8a1c1b6
 #@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.f6244cefe5015651f354055c1c43019a76bf5a7c6ec7a4aaff2c446b14746e70
+bootstrap=/home/ccx/versions/musl-cross-make.3608404e2923765f631cb9a26ae8fd4d3cb181bd27480a0d5a254386f8a1c1b6
 "$bootstrap/bin/x86_64-linux-musl-gcc" --version
 
 cat >musl-cross-make/config.mak <<EOF
@@ -101,9 +101,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
 #@untar:-z:sha256:49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6:.
 
 
@@ -103,9 +103,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/nawk b/variants/ccx-x86_64/nawk
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+bison.9446cfd6cf4dc7324d6d2069c9abbcbae24c33e96acb4032120af7142b6a5b1e
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+bison.1e46e10492ad00af4eb0af979777e6733dff37acb870a783b5c2778bb8d56cf8
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
 #@untar:-z:sha256:e031b1e1d2b230f276f975bffb923f0ea15f798c839d15a3f26a1a39448e32d7:.
 
 
@@ -82,9 +82,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
 #@git:51d179dad861640caeb76674b5908ccd79f04fae:netbsd-curses
 
 
@@ -95,9 +95,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+ocaml.4d75f262bf09e32fff53b0470a750f575ccfc9b7fc86024da53f3d3aef384cce
-#+ocaml-findlib.031761a65bc50705080526ad732fc76ca7e950ab94f06437d6e98bee5e185501
-#+ocamlbuild.dccce6be9ebfc842dce8728edfba4279907984f52551c9269388b7b426a014ea
-#+opam.58cb67d792334f1686d5a15f9a244425297b0f0bc9bc5bb293f59ff1bbbbfb78
-#+ocaml-topkg.11c5e08797a5b3515204e05286f8dfc9a2759cfec5034c142267c2c93ba9d5fe
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+ocaml.cf80a8e71deab5590a05d466358db911292818232925c185d49ecaaaeeb962a5
+#+ocaml-findlib.6889707de55f193056b66c6101902485db955435d32d6b8e8fc663c1364c8d5c
+#+ocamlbuild.da75b2a26a42e504aa5de28f7518e2d804929aa5ea7cddea1e46b0762ee2a946
+#+opam.f527c1106ead8698ca30f37d96e6b5a902d6d30cbdff765be07491935cbe0edf
+#+ocaml-topkg.97ecf9c4d21239d3d06f75ecfba69a12964979c465d2c9758871588c5e1225d8
 #@untar:-j:sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa:.
 
 
@@ -99,9 +99,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+ocaml.4d75f262bf09e32fff53b0470a750f575ccfc9b7fc86024da53f3d3aef384cce
-#+dune.0703869b0c6b3ae4645283dc603a7d59a92b5ea1c036c7b29a6322d844af6f8f
-#+ocaml_intrinsics_kernel.d5fed132b345ca4d04c931ba1a5eaf7e686eff255a8524e23f7ca2fa0c8aa280
-#+ocaml-sexplib0.39761efd20073a0f08eeef9ae9f936a52e18d817012a4286843b03bf9b78c60a
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+ocaml.cf80a8e71deab5590a05d466358db911292818232925c185d49ecaaaeeb962a5
+#+dune.8cc3ee9698ee2c21a43a8349242fd7f24e1102e508797014486e3f5e3fd68b15
+#+ocaml_intrinsics_kernel.d57cd0dc61ae33c1b487ae7e0be2291fd02663bc3ef519c0667726a9804f52cc
+#+ocaml-sexplib0.4063398ebf559265cef73db59d22847ee3fdeaa38e05bfa12ca798614988c4aa
 #@untar:-z:sha256:3f3f64789ab25bb5cb7f5f907dd651dec9cc9440981822fe75df6b94344b7208:.
 
 
@@ -106,9 +106,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+ocaml.4d75f262bf09e32fff53b0470a750f575ccfc9b7fc86024da53f3d3aef384cce
-#+ocaml-findlib.031761a65bc50705080526ad732fc76ca7e950ab94f06437d6e98bee5e185501
-#+ocamlbuild.dccce6be9ebfc842dce8728edfba4279907984f52551c9269388b7b426a014ea
-#+opam.58cb67d792334f1686d5a15f9a244425297b0f0bc9bc5bb293f59ff1bbbbfb78
-#+ocaml-topkg.11c5e08797a5b3515204e05286f8dfc9a2759cfec5034c142267c2c93ba9d5fe
-#+ocaml-astring.8f1f075b061e80a2faea5445037e347a58595261d56fe4a3b3bf62d51706615d
-#+ocaml-fpath.b570258b127277899974d322a17a766ee381402bdad63369ec1753cdfd1c146c
-#+ocaml-rresult.ddc687cae45a3dbfe417d03a0e51c2b5b56b4c62aa9b68ac26d51563bdd67a13
-#+ocaml-fmt.99aae0f4a17ec607bf3d6ae48c59d220d3cbb7ec89d02f7bc26b588bc91487b2
-#+ocaml-logs.59286fc281f1cb5ccfb3586b87323a78860f6991b6f458c10a6171b550ca795d
-#+ocaml-mtime.5fb57f123b5a10c99b4b921074469c6c065d2a6fe6bccebe74b9e4b7620e7972
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+ocaml.cf80a8e71deab5590a05d466358db911292818232925c185d49ecaaaeeb962a5
+#+ocaml-findlib.6889707de55f193056b66c6101902485db955435d32d6b8e8fc663c1364c8d5c
+#+ocamlbuild.da75b2a26a42e504aa5de28f7518e2d804929aa5ea7cddea1e46b0762ee2a946
+#+opam.f527c1106ead8698ca30f37d96e6b5a902d6d30cbdff765be07491935cbe0edf
+#+ocaml-topkg.97ecf9c4d21239d3d06f75ecfba69a12964979c465d2c9758871588c5e1225d8
+#+ocaml-astring.0874af65c8127bf91a766adbeea5699de50438b1fcc79ea524ac42691992ec49
+#+ocaml-fpath.140332cf820bcae02b397e9dea2f7650e335c6639f787d00f2dc0da39863e27d
+#+ocaml-rresult.700b56c8209dad06ecd0ba8ccbd338b8279590b0a6e2dfa5b6c0812dadfafbb4
+#+ocaml-fmt.c81b888efe9616c68f700c8255884906be64bcf78b3ca9dfc079d86b361c86bb
+#+ocaml-logs.8805a86e0566209dce698af6698b9cd3141606cefc9a21faa5198c2200f524cc
+#+ocaml-mtime.54349371316e782e204e2ddf9bad5223fa28e62ef517fae52cd9ca72610d912d
 #@untar:-j:sha256:d8d62e786b10d697e0457205a8eedeaa27ebcc90f1855f18df190cac2e3d8f37:.
 
 
@@ -105,9 +105,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+ocaml.4d75f262bf09e32fff53b0470a750f575ccfc9b7fc86024da53f3d3aef384cce
-#+ocaml-findlib.031761a65bc50705080526ad732fc76ca7e950ab94f06437d6e98bee5e185501
-#+ocamlbuild.dccce6be9ebfc842dce8728edfba4279907984f52551c9269388b7b426a014ea
-#+opam.58cb67d792334f1686d5a15f9a244425297b0f0bc9bc5bb293f59ff1bbbbfb78
-#+ocaml-topkg.11c5e08797a5b3515204e05286f8dfc9a2759cfec5034c142267c2c93ba9d5fe
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+ocaml.cf80a8e71deab5590a05d466358db911292818232925c185d49ecaaaeeb962a5
+#+ocaml-findlib.6889707de55f193056b66c6101902485db955435d32d6b8e8fc663c1364c8d5c
+#+ocamlbuild.da75b2a26a42e504aa5de28f7518e2d804929aa5ea7cddea1e46b0762ee2a946
+#+opam.f527c1106ead8698ca30f37d96e6b5a902d6d30cbdff765be07491935cbe0edf
+#+ocaml-topkg.97ecf9c4d21239d3d06f75ecfba69a12964979c465d2c9758871588c5e1225d8
 #@untar:-j:sha256:4e547a631c36fbaadff60d3bd7724eb3f83ba274e92fb725950bae7868378582:.
 
 
@@ -99,9 +99,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+ocaml.4d75f262bf09e32fff53b0470a750f575ccfc9b7fc86024da53f3d3aef384cce
-#+dune.0703869b0c6b3ae4645283dc603a7d59a92b5ea1c036c7b29a6322d844af6f8f
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+ocaml.cf80a8e71deab5590a05d466358db911292818232925c185d49ecaaaeeb962a5
+#+dune.8cc3ee9698ee2c21a43a8349242fd7f24e1102e508797014486e3f5e3fd68b15
 #@untar:-z:sha256:9b9644d7351db699e57ddba7c767bb4153e6e988ccf45ead2fb238a3bd75cdc7:.
 
 
@@ -102,9 +102,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+ocaml.4d75f262bf09e32fff53b0470a750f575ccfc9b7fc86024da53f3d3aef384cce
-#+dune.0703869b0c6b3ae4645283dc603a7d59a92b5ea1c036c7b29a6322d844af6f8f
-#+ocamlbuild.dccce6be9ebfc842dce8728edfba4279907984f52551c9269388b7b426a014ea
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+ocaml.cf80a8e71deab5590a05d466358db911292818232925c185d49ecaaaeeb962a5
+#+dune.8cc3ee9698ee2c21a43a8349242fd7f24e1102e508797014486e3f5e3fd68b15
+#+ocamlbuild.da75b2a26a42e504aa5de28f7518e2d804929aa5ea7cddea1e46b0762ee2a946
 #@untar:-z:sha256:6e62a8ee0217c9cc38d5860110eb18eb8d89c05c420353d298e1431fe8bac00f:.
 
 
@@ -107,9 +107,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+m4.71b0fceb1252909ac3e136c647ee97b6885ebb27cdbd4fb02d14a429f474ffac
-#+netbsd-curses.8bfbf34a00001cde709bde178cb7fcd5f3b991170bc72e8c6b71f30806a1e9a9
-#+ocaml.4d75f262bf09e32fff53b0470a750f575ccfc9b7fc86024da53f3d3aef384cce
-#+ocamlbuild.dccce6be9ebfc842dce8728edfba4279907984f52551c9269388b7b426a014ea
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+m4.ebe5f39b4a169f768e6ba99d26ff9d39d314f936b14fe49b228a08742e5730b1
+#+netbsd-curses.c3702a0b3a97b5d0e6272a40a23b8f327e4f3eb4b57e87d626c9687a84f7f76a
+#+ocaml.cf80a8e71deab5590a05d466358db911292818232925c185d49ecaaaeeb962a5
+#+ocamlbuild.da75b2a26a42e504aa5de28f7518e2d804929aa5ea7cddea1e46b0762ee2a946
 #@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.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/home/ccx/versions/musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59/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.4d75f262bf09e32fff53b0470a750f575ccfc9b7fc86024da53f3d3aef384cce"
+stdlib="$pthbs_destdir/home/ccx/versions/ocaml.cf80a8e71deab5590a05d466358db911292818232925c185d49ecaaaeeb962a5"
 mkdir -p "${stdlib%/*}"
 ln -s "$pthbs_package" "$stdlib"
 make install prefix="$pthbs_destdir"
@@ -136,9 +136,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+ocaml.4d75f262bf09e32fff53b0470a750f575ccfc9b7fc86024da53f3d3aef384cce
-#+ocaml-findlib.031761a65bc50705080526ad732fc76ca7e950ab94f06437d6e98bee5e185501
-#+ocamlbuild.dccce6be9ebfc842dce8728edfba4279907984f52551c9269388b7b426a014ea
-#+opam.58cb67d792334f1686d5a15f9a244425297b0f0bc9bc5bb293f59ff1bbbbfb78
-#+ocaml-topkg.11c5e08797a5b3515204e05286f8dfc9a2759cfec5034c142267c2c93ba9d5fe
-#+ocaml-cmdliner.2b942083af5ce0f5c636e69d975ddccd9ba1a093bff3535c38aee92bbca7266c
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+ocaml.cf80a8e71deab5590a05d466358db911292818232925c185d49ecaaaeeb962a5
+#+ocaml-findlib.6889707de55f193056b66c6101902485db955435d32d6b8e8fc663c1364c8d5c
+#+ocamlbuild.da75b2a26a42e504aa5de28f7518e2d804929aa5ea7cddea1e46b0762ee2a946
+#+opam.f527c1106ead8698ca30f37d96e6b5a902d6d30cbdff765be07491935cbe0edf
+#+ocaml-topkg.97ecf9c4d21239d3d06f75ecfba69a12964979c465d2c9758871588c5e1225d8
+#+ocaml-cmdliner.abb3d7dc9bd4a42fbb6c1de8dcb0069c5e7fd867ed3a1ee0c1e5084daa45f559
 #@untar:-j:sha256:857cfd47a54b52429cd9b3e2665e44173cd1bd3b435bece7172f984ad5376a1b:.
 
 
@@ -100,9 +100,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+ocaml.4d75f262bf09e32fff53b0470a750f575ccfc9b7fc86024da53f3d3aef384cce
-#+ocaml-findlib.031761a65bc50705080526ad732fc76ca7e950ab94f06437d6e98bee5e185501
-#+ocamlbuild.dccce6be9ebfc842dce8728edfba4279907984f52551c9269388b7b426a014ea
-#+opam.58cb67d792334f1686d5a15f9a244425297b0f0bc9bc5bb293f59ff1bbbbfb78
-#+ocaml-topkg.11c5e08797a5b3515204e05286f8dfc9a2759cfec5034c142267c2c93ba9d5fe
-#+ocaml-astring.8f1f075b061e80a2faea5445037e347a58595261d56fe4a3b3bf62d51706615d
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+ocaml.cf80a8e71deab5590a05d466358db911292818232925c185d49ecaaaeeb962a5
+#+ocaml-findlib.6889707de55f193056b66c6101902485db955435d32d6b8e8fc663c1364c8d5c
+#+ocamlbuild.da75b2a26a42e504aa5de28f7518e2d804929aa5ea7cddea1e46b0762ee2a946
+#+opam.f527c1106ead8698ca30f37d96e6b5a902d6d30cbdff765be07491935cbe0edf
+#+ocaml-topkg.97ecf9c4d21239d3d06f75ecfba69a12964979c465d2c9758871588c5e1225d8
+#+ocaml-astring.0874af65c8127bf91a766adbeea5699de50438b1fcc79ea524ac42691992ec49
 #@untar:-j:sha256:12b08ff192d037d9b6d69e9ca19d1d385184f20b3237c27231e437ac81ace70f:.
 
 
@@ -100,9 +100,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+ocaml.4d75f262bf09e32fff53b0470a750f575ccfc9b7fc86024da53f3d3aef384cce
-#+ocaml-findlib.031761a65bc50705080526ad732fc76ca7e950ab94f06437d6e98bee5e185501
-#+ocamlbuild.dccce6be9ebfc842dce8728edfba4279907984f52551c9269388b7b426a014ea
-#+opam.58cb67d792334f1686d5a15f9a244425297b0f0bc9bc5bb293f59ff1bbbbfb78
-#+ocaml-topkg.11c5e08797a5b3515204e05286f8dfc9a2759cfec5034c142267c2c93ba9d5fe
-#+ocaml-mtime.5fb57f123b5a10c99b4b921074469c6c065d2a6fe6bccebe74b9e4b7620e7972
-#+ocaml-cmdliner.2b942083af5ce0f5c636e69d975ddccd9ba1a093bff3535c38aee92bbca7266c
-#+ocaml-fmt.99aae0f4a17ec607bf3d6ae48c59d220d3cbb7ec89d02f7bc26b588bc91487b2
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+ocaml.cf80a8e71deab5590a05d466358db911292818232925c185d49ecaaaeeb962a5
+#+ocaml-findlib.6889707de55f193056b66c6101902485db955435d32d6b8e8fc663c1364c8d5c
+#+ocamlbuild.da75b2a26a42e504aa5de28f7518e2d804929aa5ea7cddea1e46b0762ee2a946
+#+opam.f527c1106ead8698ca30f37d96e6b5a902d6d30cbdff765be07491935cbe0edf
+#+ocaml-topkg.97ecf9c4d21239d3d06f75ecfba69a12964979c465d2c9758871588c5e1225d8
+#+ocaml-mtime.54349371316e782e204e2ddf9bad5223fa28e62ef517fae52cd9ca72610d912d
+#+ocaml-cmdliner.abb3d7dc9bd4a42fbb6c1de8dcb0069c5e7fd867ed3a1ee0c1e5084daa45f559
+#+ocaml-fmt.c81b888efe9616c68f700c8255884906be64bcf78b3ca9dfc079d86b361c86bb
 #@untar:-j:sha256:ee97065ba41ce28f19dea9453c6bec4e0ef26165ad7394c4131ea0c65c0f06d5:.
 
 
@@ -107,9 +107,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+ocaml.4d75f262bf09e32fff53b0470a750f575ccfc9b7fc86024da53f3d3aef384cce
-#+dune.0703869b0c6b3ae4645283dc603a7d59a92b5ea1c036c7b29a6322d844af6f8f
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+ocaml.cf80a8e71deab5590a05d466358db911292818232925c185d49ecaaaeeb962a5
+#+dune.8cc3ee9698ee2c21a43a8349242fd7f24e1102e508797014486e3f5e3fd68b15
 #@untar:-j:sha256:cca8badff83b470fdcfb1840116f8e8a6f2cb86cde2f44ed28cf26cbf692a793:.
 
 
@@ -105,9 +105,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+ocaml.4d75f262bf09e32fff53b0470a750f575ccfc9b7fc86024da53f3d3aef384cce
-#+ocaml-findlib.031761a65bc50705080526ad732fc76ca7e950ab94f06437d6e98bee5e185501
-#+ocamlbuild.dccce6be9ebfc842dce8728edfba4279907984f52551c9269388b7b426a014ea
-#+opam.58cb67d792334f1686d5a15f9a244425297b0f0bc9bc5bb293f59ff1bbbbfb78
-#+ocaml-topkg.11c5e08797a5b3515204e05286f8dfc9a2759cfec5034c142267c2c93ba9d5fe
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+ocaml.cf80a8e71deab5590a05d466358db911292818232925c185d49ecaaaeeb962a5
+#+ocaml-findlib.6889707de55f193056b66c6101902485db955435d32d6b8e8fc663c1364c8d5c
+#+ocamlbuild.da75b2a26a42e504aa5de28f7518e2d804929aa5ea7cddea1e46b0762ee2a946
+#+opam.f527c1106ead8698ca30f37d96e6b5a902d6d30cbdff765be07491935cbe0edf
+#+ocaml-topkg.97ecf9c4d21239d3d06f75ecfba69a12964979c465d2c9758871588c5e1225d8
 #@untar:-j:sha256:097cb2802e3701ead9572e1b483d5a28c6e2f0a39449faaf9b44ad8a89834d88:.
 
 
@@ -99,9 +99,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+ocaml.4d75f262bf09e32fff53b0470a750f575ccfc9b7fc86024da53f3d3aef384cce
-#+dune.0703869b0c6b3ae4645283dc603a7d59a92b5ea1c036c7b29a6322d844af6f8f
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+ocaml.cf80a8e71deab5590a05d466358db911292818232925c185d49ecaaaeeb962a5
+#+dune.8cc3ee9698ee2c21a43a8349242fd7f24e1102e508797014486e3f5e3fd68b15
 #@untar:-z:sha256:b6595ee187dea792b31fc54a0e1524ab1e48bc6068d3066c45215a138cc73b95:.
 
 
@@ -107,9 +107,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+ocaml.4d75f262bf09e32fff53b0470a750f575ccfc9b7fc86024da53f3d3aef384cce
-#+dune.0703869b0c6b3ae4645283dc603a7d59a92b5ea1c036c7b29a6322d844af6f8f
-#+ocaml-compiler-libs.09363c7eb2167ff2f4a37de6b3e3a4d85986afed52305d3e3655439cc9aa9120
-#+ocaml-cppo.da40cee88dfa07fa995036a82dea8ec03faa751e8e1bafa60441e18c56eb2b88
-#+ocaml-findlib.031761a65bc50705080526ad732fc76ca7e950ab94f06437d6e98bee5e185501
-#+ocaml-ppx_derivers.3e4f0e7dd7c4358dde33b087315c286e4d6db846a596b5bf2b990daa86c291c7
-#+ocaml-ppxlib.7efaaac2d368600f8a718efa7e4cc630719e92f9530217f3fc6de67deac03e16
-#+ocaml-sexplib0.39761efd20073a0f08eeef9ae9f936a52e18d817012a4286843b03bf9b78c60a
-#+ocaml-stdlib-shims.df3bfa07ef8b3973041240a571deb549ed395464d53c115b5f22c1cb4baf1296
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+ocaml.cf80a8e71deab5590a05d466358db911292818232925c185d49ecaaaeeb962a5
+#+dune.8cc3ee9698ee2c21a43a8349242fd7f24e1102e508797014486e3f5e3fd68b15
+#+ocaml-compiler-libs.775df0f72fa6377f89526b663ca2b0e2822616d2dbe2ad0ebb7804596b3bfb06
+#+ocaml-cppo.19fb2ff5e7c7019f383463dade9aa95a678911f9ef2e35a9eeba0542b8f76d65
+#+ocaml-findlib.6889707de55f193056b66c6101902485db955435d32d6b8e8fc663c1364c8d5c
+#+ocaml-ppx_derivers.3dfb8998e9d06d17bf086c942cfd93d7e7fb8602ba2b22bedc14cf75657e88b3
+#+ocaml-ppxlib.0ede2541edf4c1a91e843986568a794f286d8d6c9364d148c1c7ede20582bb3f
+#+ocaml-sexplib0.4063398ebf559265cef73db59d22847ee3fdeaa38e05bfa12ca798614988c4aa
+#+ocaml-stdlib-shims.02f6f22bbe820b1dab361854c61bde57ec842e69776a44588b11ee18686f7aec
 #@untar:-z:sha256:c91d1ea5e15e6928a2f8947dbd135b9f765cc0e2d72be271427981afcd350c24:.
 
 
@@ -109,9 +109,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+ocaml.4d75f262bf09e32fff53b0470a750f575ccfc9b7fc86024da53f3d3aef384cce
-#+dune.0703869b0c6b3ae4645283dc603a7d59a92b5ea1c036c7b29a6322d844af6f8f
-#+ocaml-compiler-libs.09363c7eb2167ff2f4a37de6b3e3a4d85986afed52305d3e3655439cc9aa9120
-#+ocaml-ppx_derivers.3e4f0e7dd7c4358dde33b087315c286e4d6db846a596b5bf2b990daa86c291c7
-#+ocaml-sexplib0.39761efd20073a0f08eeef9ae9f936a52e18d817012a4286843b03bf9b78c60a
-#+ocaml-stdlib-shims.df3bfa07ef8b3973041240a571deb549ed395464d53c115b5f22c1cb4baf1296
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+ocaml.cf80a8e71deab5590a05d466358db911292818232925c185d49ecaaaeeb962a5
+#+dune.8cc3ee9698ee2c21a43a8349242fd7f24e1102e508797014486e3f5e3fd68b15
+#+ocaml-compiler-libs.775df0f72fa6377f89526b663ca2b0e2822616d2dbe2ad0ebb7804596b3bfb06
+#+ocaml-ppx_derivers.3dfb8998e9d06d17bf086c942cfd93d7e7fb8602ba2b22bedc14cf75657e88b3
+#+ocaml-sexplib0.4063398ebf559265cef73db59d22847ee3fdeaa38e05bfa12ca798614988c4aa
+#+ocaml-stdlib-shims.02f6f22bbe820b1dab361854c61bde57ec842e69776a44588b11ee18686f7aec
 #@untar:-j:sha256:2e223837e7cecc3bc84a432432c0a72f4e1d5be9165c9c33772f156db85db0b3:.
 
 
@@ -107,9 +107,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+ocaml.4d75f262bf09e32fff53b0470a750f575ccfc9b7fc86024da53f3d3aef384cce
-#+ocaml-findlib.031761a65bc50705080526ad732fc76ca7e950ab94f06437d6e98bee5e185501
-#+ocamlbuild.dccce6be9ebfc842dce8728edfba4279907984f52551c9269388b7b426a014ea
-#+opam.58cb67d792334f1686d5a15f9a244425297b0f0bc9bc5bb293f59ff1bbbbfb78
-#+ocaml-topkg.11c5e08797a5b3515204e05286f8dfc9a2759cfec5034c142267c2c93ba9d5fe
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+ocaml.cf80a8e71deab5590a05d466358db911292818232925c185d49ecaaaeeb962a5
+#+ocaml-findlib.6889707de55f193056b66c6101902485db955435d32d6b8e8fc663c1364c8d5c
+#+ocamlbuild.da75b2a26a42e504aa5de28f7518e2d804929aa5ea7cddea1e46b0762ee2a946
+#+opam.f527c1106ead8698ca30f37d96e6b5a902d6d30cbdff765be07491935cbe0edf
+#+ocaml-topkg.97ecf9c4d21239d3d06f75ecfba69a12964979c465d2c9758871588c5e1225d8
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
@@ -99,9 +99,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+ocaml.4d75f262bf09e32fff53b0470a750f575ccfc9b7fc86024da53f3d3aef384cce
-#+dune.0703869b0c6b3ae4645283dc603a7d59a92b5ea1c036c7b29a6322d844af6f8f
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+ocaml.cf80a8e71deab5590a05d466358db911292818232925c185d49ecaaaeeb962a5
+#+dune.8cc3ee9698ee2c21a43a8349242fd7f24e1102e508797014486e3f5e3fd68b15
 #@untar:-z:sha256:86dba26468194512f789f2fb709063515a9cb4e5c4461c021c239a369590701d:.
 
 
@@ -102,9 +102,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+ocaml.4d75f262bf09e32fff53b0470a750f575ccfc9b7fc86024da53f3d3aef384cce
-#+dune.0703869b0c6b3ae4645283dc603a7d59a92b5ea1c036c7b29a6322d844af6f8f
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+ocaml.cf80a8e71deab5590a05d466358db911292818232925c185d49ecaaaeeb962a5
+#+dune.8cc3ee9698ee2c21a43a8349242fd7f24e1102e508797014486e3f5e3fd68b15
 #@untar:-j:sha256:babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a:.
 
 
@@ -101,9 +101,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+ocaml.4d75f262bf09e32fff53b0470a750f575ccfc9b7fc86024da53f3d3aef384cce
-#+ocaml-findlib.031761a65bc50705080526ad732fc76ca7e950ab94f06437d6e98bee5e185501
-#+ocamlbuild.dccce6be9ebfc842dce8728edfba4279907984f52551c9269388b7b426a014ea
-#+opam.58cb67d792334f1686d5a15f9a244425297b0f0bc9bc5bb293f59ff1bbbbfb78
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+ocaml.cf80a8e71deab5590a05d466358db911292818232925c185d49ecaaaeeb962a5
+#+ocaml-findlib.6889707de55f193056b66c6101902485db955435d32d6b8e8fc663c1364c8d5c
+#+ocamlbuild.da75b2a26a42e504aa5de28f7518e2d804929aa5ea7cddea1e46b0762ee2a946
+#+opam.f527c1106ead8698ca30f37d96e6b5a902d6d30cbdff765be07491935cbe0edf
 #@untar:-j:sha256:452082626e651ac4b1633c2b4ae4cad7abeb1fb6a13046e699f95eec58b5d1c7:.
 
 
@@ -98,9 +98,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.4d75f262bf09e32fff53b0470a750f575ccfc9b7fc86024da53f3d3aef384cce
-#+dune.0703869b0c6b3ae4645283dc603a7d59a92b5ea1c036c7b29a6322d844af6f8f
-#+ocamlbuild.dccce6be9ebfc842dce8728edfba4279907984f52551c9269388b7b426a014ea
-#+ocaml-base.48bb0a669eb85b40d0260148b7988c4c75804fad1673e855f62ae65043a75cb9
-#+opam.58cb67d792334f1686d5a15f9a244425297b0f0bc9bc5bb293f59ff1bbbbfb78
-#+ocaml-bos.50c54ad0e0171960255b59a033caba0b9eefda7c99f7b4036dc13c5c4d17887c
-#+ocaml-lun.1abf39b860c7c96389793f905fe112a14d3933a961a12d67beab3b9561a8a09f
-#+ocaml-ppx_deriving.392b523fbf1501c44860aeb2103ef31a5fe2a17167a0bcfb2763476b5c4613f5-
\ No newline at end of file
+#+ocaml.cf80a8e71deab5590a05d466358db911292818232925c185d49ecaaaeeb962a5
+#+dune.8cc3ee9698ee2c21a43a8349242fd7f24e1102e508797014486e3f5e3fd68b15
+#+ocamlbuild.da75b2a26a42e504aa5de28f7518e2d804929aa5ea7cddea1e46b0762ee2a946
+#+ocaml-base.51bd2b50728dc6dc60fa91147438b2e4850cfd20d9741a01f24efc15cdf6aa95
+#+opam.f527c1106ead8698ca30f37d96e6b5a902d6d30cbdff765be07491935cbe0edf
+#+ocaml-bos.2dd9cedcb7ab40399c54e229f3240672a2ba7ddaaefd04af29ce260efac393bb
+#+ocaml-lun.fcbd8e24289068a488a4b8e9b408f1ee08d35abfeae939710321e82b68702b36
+#+ocaml-ppx_deriving.92e9ff3673617c5251357af2bc89e10877522b759387cacef5a491e43c15b6c7+
\ 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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+m4.71b0fceb1252909ac3e136c647ee97b6885ebb27cdbd4fb02d14a429f474ffac
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+m4.ebe5f39b4a169f768e6ba99d26ff9d39d314f936b14fe49b228a08742e5730b1
 #@untar:-J:sha256:dfaa8a2e11c799bc1765d8bef44911406ee5f4803027190382a939f88c912266:.
 
 
@@ -117,9 +117,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+ocaml.4d75f262bf09e32fff53b0470a750f575ccfc9b7fc86024da53f3d3aef384cce
-#+dune.0703869b0c6b3ae4645283dc603a7d59a92b5ea1c036c7b29a6322d844af6f8f
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+ocaml.cf80a8e71deab5590a05d466358db911292818232925c185d49ecaaaeeb962a5
+#+dune.8cc3ee9698ee2c21a43a8349242fd7f24e1102e508797014486e3f5e3fd68b15
 #@untar:-z:sha256:c988b7769a59749631c3c98ba5edd1d2fe91f5dc380b5e0593c073c92f4bee01:.
 
 
@@ -95,9 +95,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/ocamlbuild b/variants/ccx-x86_64/ocamlbuild
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+m4.71b0fceb1252909ac3e136c647ee97b6885ebb27cdbd4fb02d14a429f474ffac
-#+ocaml.4d75f262bf09e32fff53b0470a750f575ccfc9b7fc86024da53f3d3aef384cce
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+m4.ebe5f39b4a169f768e6ba99d26ff9d39d314f936b14fe49b228a08742e5730b1
+#+ocaml.cf80a8e71deab5590a05d466358db911292818232925c185d49ecaaaeeb962a5
 #@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.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/home/ccx/versions/musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59/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.4d75f262bf09e32fff53b0470a750f575ccfc9b7fc86024da53f3d3aef384cce"
+stdlib="$pthbs_destdir/home/ccx/versions/ocaml.cf80a8e71deab5590a05d466358db911292818232925c185d49ecaaaeeb962a5"
 mkdir -p "${stdlib%/*}"
 ln -s "$pthbs_package" "$stdlib"
 
@@ -121,9 +121,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/opam b/variants/ccx-x86_64/opam
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+diffutils.300c7d6070fa3f67f80e4db9eb0045da8a29ec664a6158ca32f33930832770cb
-#+patch.06e45503237afc561db0492a9dd6e348344308340d6ba563d670031e4f008894
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+getconf.c422b6a1da2c320c7a1b67e8cbf71ae199593fdde1ee478e08e7cf510bce77e0
-#+ocaml.4d75f262bf09e32fff53b0470a750f575ccfc9b7fc86024da53f3d3aef384cce
-#+dune.0703869b0c6b3ae4645283dc603a7d59a92b5ea1c036c7b29a6322d844af6f8f
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+diffutils.264116b2f8a2a696fcd70230a252a6a0557dfbfee2f0fd2c9e74f95db4f19dfd
+#+patch.0e3975ff5b4a302fb8f415e49b4e0a756cd29bca495ef34d9aa1ec23149d0d4a
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+getconf.07ea68360c917f8e1fd3024b4dc5973fa3b4747515581bf94af7346dfd6f03b7
+#+ocaml.cf80a8e71deab5590a05d466358db911292818232925c185d49ecaaaeeb962a5
+#+dune.8cc3ee9698ee2c21a43a8349242fd7f24e1102e508797014486e3f5e3fd68b15
 #@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.0703869b0c6b3ae4645283dc603a7d59a92b5ea1c036c7b29a6322d844af6f8f/command/dune' \
+	--with-dune='/home/ccx/versions/dune.8cc3ee9698ee2c21a43a8349242fd7f24e1102e508797014486e3f5e3fd68b15/command/dune' \
 	--with-mccs \
 	--with-vendored-deps \
 	--enable-static
@@ -126,9 +126,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/patch b/variants/ccx-x86_64/patch
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+m4.71b0fceb1252909ac3e136c647ee97b6885ebb27cdbd4fb02d14a429f474ffac
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+m4.ebe5f39b4a169f768e6ba99d26ff9d39d314f936b14fe49b228a08742e5730b1
 #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:.
 
 
@@ -87,7 +87,7 @@ cd 'patch-2.7.6'
 
 build_env_static
 autotools_config_static --disable-nls
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -132,9 +132,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -143,16 +143,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
diff --git a/variants/ccx-x86_64/pkgconf b/variants/ccx-x86_64/pkgconf
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+m4.71b0fceb1252909ac3e136c647ee97b6885ebb27cdbd4fb02d14a429f474ffac
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+m4.ebe5f39b4a169f768e6ba99d26ff9d39d314f936b14fe49b228a08742e5730b1
 #@untar:-J:sha256:3a224f2accf091b77a5781316e27b9ee3ba82c083cc2e539e08940b68a44fec5:.
 
 
@@ -137,9 +137,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+pkgconf.87c6b3db822eaaf2e713a53070d4ab6aa8344b2e20d7d544a2a85c77582f01fc
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+pkgconf.0890653bd5febef18b907684303dafd589d4f9770f911689df7553325fd8be15
 
 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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+m4.71b0fceb1252909ac3e136c647ee97b6885ebb27cdbd4fb02d14a429f474ffac
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+m4.ebe5f39b4a169f768e6ba99d26ff9d39d314f936b14fe49b228a08742e5730b1
 #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:.
 
 
@@ -87,7 +87,7 @@ cd 'popt-1.19'
 
 build_env_static
 autotools_config_static --disable-nls
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -131,9 +131,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -142,16 +142,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+zsh.82e514e97a46638444fd2c4cd350f06448bc0e420106837798f816e61f93a8d8
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+zsh.314f09fa72addc628a39be341df4fd6a05c86508e74427114ee8ecfad3aa0daf
 #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall
 
 
@@ -77,9 +77,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+execline.27ab2a4e327fcbbe7b5d2d6dc87846d4088bb3cde77c426942e936e06b272358
-#+lnstools.01a1598c4a41ef6ffeb5ae4b33b5e47cd371619072548985d551d4e99e91f79a
-#+sandbox_rootfs.21948e341bd9f5e469a57f21fcf60a39e01baa3607a2d03b176f4426da1472cf
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+execline.cacbf244584ed78052217c951ba9788d9e5ec4d2516bfeb23ef9f1bd33e436e5
+#+lnstools.727f3883d0ff11cecd3b6178e79fe8e15d92006235ccd2d49d292a1c15e729aa
+#+sandbox_rootfs.0b3114837abba0997788de96861cdb32119ff2d8af8bead14abd8730bffbee2f
 #@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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+m4.71b0fceb1252909ac3e136c647ee97b6885ebb27cdbd4fb02d14a429f474ffac
-#+nawk.f13d31fe21bc47400c4a8a33b8c33fdfa9e1a5f0c4fcc5f3e6dd460b368cd5c2
-#+popt.ca452500c537f8a8c7abcac477aaabe3fe84d1b42a03bb523f936bc838f5f42a
-#+libressl.17d14a88243c1e6ab03ace6cc1c4b09f44c45ebefb8170d0e0c5c598ac08840a
-#+zstd.5aaee80eaa2961048e0584df375f3adbc65332729f1082bca4ec6a8b61fb6062
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+m4.ebe5f39b4a169f768e6ba99d26ff9d39d314f936b14fe49b228a08742e5730b1
+#+nawk.e1e0ceecd0021f5f6bfad9bd942b5ad4ffc87bc3d1d3784b7491e9ad888e8e52
+#+popt.ae8c37202111ae76dc7767f91ebf3d525d1bcbc7350611f94b870e0650dce936
+#+libressl.0d257c1736931d70bd42eb2ce09e01a2b608544628a476871207cf9567e49bef
+#+zstd.d8e56d84c51ce4a2c66001746564a47ef314f7cbdf7c30250f527d89d9f1a5d1
 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:.
 
 
@@ -95,7 +95,7 @@ autotools_config_static --without-included-popt \
 	--disable-xxhash \
 	--disable-lz4
 
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -141,9 +141,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -152,16 +152,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
diff --git a/variants/ccx-x86_64/s6 b/variants/ccx-x86_64/s6
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+skalibs.213f85d2881fae1744f8870a18f06179e3ad33b6f22c98df2f0f48a201270f22
-#+execline.c021cb4fd44c364d09d3d581b5453eba7ac539af8fcaa45911e9e98e0e3cc3cc
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+skalibs.8261b51ea57569b4b9b73580d7d818bb048f30c489e5204b0b4e2507214a1d97
+#+execline.62aa9ddd636b6441ef0e28b1f9d71c135187616424d693b978ddff0c05cf3529
 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6
 
 
@@ -47,7 +47,7 @@ cd 's6'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.213f85d2881fae1744f8870a18f06179e3ad33b6f22c98df2f0f48a201270f22/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.8261b51ea57569b4b9b73580d7d818bb048f30c489e5204b0b4e2507214a1d97/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -93,9 +93,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+skalibs.213f85d2881fae1744f8870a18f06179e3ad33b6f22c98df2f0f48a201270f22
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+skalibs.8261b51ea57569b4b9b73580d7d818bb048f30c489e5204b0b4e2507214a1d97
 #@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.213f85d2881fae1744f8870a18f06179e3ad33b6f22c98df2f0f48a201270f22/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.8261b51ea57569b4b9b73580d7d818bb048f30c489e5204b0b4e2507214a1d97/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -92,9 +92,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+skalibs.213f85d2881fae1744f8870a18f06179e3ad33b6f22c98df2f0f48a201270f22
-#+execline.c021cb4fd44c364d09d3d581b5453eba7ac539af8fcaa45911e9e98e0e3cc3cc
-#+s6.e35b9ef84fcf9a69e9ef04fd22da5e72b2a917eb341bdbd1e7fb0bfbe641b481
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+skalibs.8261b51ea57569b4b9b73580d7d818bb048f30c489e5204b0b4e2507214a1d97
+#+execline.62aa9ddd636b6441ef0e28b1f9d71c135187616424d693b978ddff0c05cf3529
+#+s6.ce7acb6925fe79da8e6e25e0b035488c63c601433054d2910b2eaada965b4589
 #@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.213f85d2881fae1744f8870a18f06179e3ad33b6f22c98df2f0f48a201270f22/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.8261b51ea57569b4b9b73580d7d818bb048f30c489e5204b0b4e2507214a1d97/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -94,9 +94,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+skalibs.213f85d2881fae1744f8870a18f06179e3ad33b6f22c98df2f0f48a201270f22
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+skalibs.8261b51ea57569b4b9b73580d7d818bb048f30c489e5204b0b4e2507214a1d97
 #@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.213f85d2881fae1744f8870a18f06179e3ad33b6f22c98df2f0f48a201270f22/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.8261b51ea57569b4b9b73580d7d818bb048f30c489e5204b0b4e2507214a1d97/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -92,9 +92,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+skalibs.213f85d2881fae1744f8870a18f06179e3ad33b6f22c98df2f0f48a201270f22
-#+execline.c021cb4fd44c364d09d3d581b5453eba7ac539af8fcaa45911e9e98e0e3cc3cc
-#+s6.e35b9ef84fcf9a69e9ef04fd22da5e72b2a917eb341bdbd1e7fb0bfbe641b481
-#+s6-dns.166bafae66d569f738d150e97c79bf3f124ec2b2f6ef246133d9d585006cd7d6
-#+libressl.17d14a88243c1e6ab03ace6cc1c4b09f44c45ebefb8170d0e0c5c598ac08840a
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+skalibs.8261b51ea57569b4b9b73580d7d818bb048f30c489e5204b0b4e2507214a1d97
+#+execline.62aa9ddd636b6441ef0e28b1f9d71c135187616424d693b978ddff0c05cf3529
+#+s6.ce7acb6925fe79da8e6e25e0b035488c63c601433054d2910b2eaada965b4589
+#+s6-dns.d009f1e7dea48eaead6be8c2f4b2d8119e8f1aa292d6dcb51e6c412009d91f86
+#+libressl.0d257c1736931d70bd42eb2ce09e01a2b608544628a476871207cf9567e49bef
 #@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.213f85d2881fae1744f8870a18f06179e3ad33b6f22c98df2f0f48a201270f22/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.8261b51ea57569b4b9b73580d7d818bb048f30c489e5204b0b4e2507214a1d97/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -101,9 +101,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+skalibs.213f85d2881fae1744f8870a18f06179e3ad33b6f22c98df2f0f48a201270f22
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+skalibs.8261b51ea57569b4b9b73580d7d818bb048f30c489e5204b0b4e2507214a1d97
 #@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.213f85d2881fae1744f8870a18f06179e3ad33b6f22c98df2f0f48a201270f22/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.8261b51ea57569b4b9b73580d7d818bb048f30c489e5204b0b4e2507214a1d97/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -92,9 +92,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+skalibs.213f85d2881fae1744f8870a18f06179e3ad33b6f22c98df2f0f48a201270f22
-#+execline.c021cb4fd44c364d09d3d581b5453eba7ac539af8fcaa45911e9e98e0e3cc3cc
-#+s6.e35b9ef84fcf9a69e9ef04fd22da5e72b2a917eb341bdbd1e7fb0bfbe641b481
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+skalibs.8261b51ea57569b4b9b73580d7d818bb048f30c489e5204b0b4e2507214a1d97
+#+execline.62aa9ddd636b6441ef0e28b1f9d71c135187616424d693b978ddff0c05cf3529
+#+s6.ce7acb6925fe79da8e6e25e0b035488c63c601433054d2910b2eaada965b4589
 #@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.213f85d2881fae1744f8870a18f06179e3ad33b6f22c98df2f0f48a201270f22/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.8261b51ea57569b4b9b73580d7d818bb048f30c489e5204b0b4e2507214a1d97/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -94,9 +94,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.cda5fd3e4f154e21e775b5b2f723f9c57872b16cdef270ff556c7a6960cdbb1b
-#+gnu-make.8318da17e38f9a12733fa1e2242bfaae80b595b20a53f789ecc91850f0f433cd
-#+busybox.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
-#+skalibs.573e7a84cda96422faa842dd377c36a6b5979d6f02567b741d4802f561565cee
+#+musl-cross-make.43fb9dd4736189f7d854bf020f902893965e273641ceac80991bf9070179564b
+#+gnu-make.e7a4a6e3ee24dee37e06f6aec6ab7d82bb405aeba9b7f07f4efd222033e8a538
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+skalibs.8295b5524c8ec0f55727d5f04618f407e72d7656a6c794ddbb706e64f2eae71f
 #@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.01a1598c4a41ef6ffeb5ae4b33b5e47cd371619072548985d551d4e99e91f79a
-#+sandbox_rootfs.21948e341bd9f5e469a57f21fcf60a39e01baa3607a2d03b176f4426da1472cf
-#+pthbs-sandbox-rootns.d199e80086d05af6f0c322761958be8c4b2d77d1d63079d2892ab04255260332-
\ No newline at end of file
+#+lnstools.727f3883d0ff11cecd3b6178e79fe8e15d92006235ccd2d49d292a1c15e729aa
+#+sandbox_rootfs.0b3114837abba0997788de96861cdb32119ff2d8af8bead14abd8730bffbee2f
+#+pthbs-sandbox-rootns.c5b43608101ad7efb5649bd988337f15f00fea9f26f96f6b3898650f91f40145+
\ 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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
 #@git:96b537f42695da1b865588baf591fdfcae76bd41:skalibs
 
 
@@ -94,9 +94,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.cda5fd3e4f154e21e775b5b2f723f9c57872b16cdef270ff556c7a6960cdbb1b
-#+gnu-make.8318da17e38f9a12733fa1e2242bfaae80b595b20a53f789ecc91850f0f433cd
-#+busybox.3bbcd7fa9c48d58f5a88ae4af3a564cf3d69b21487c2236b952034fa3f11adae
+#+musl-cross-make.43fb9dd4736189f7d854bf020f902893965e273641ceac80991bf9070179564b
+#+gnu-make.e7a4a6e3ee24dee37e06f6aec6ab7d82bb405aeba9b7f07f4efd222033e8a538
+#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
 #@git:96b537f42695da1b865588baf591fdfcae76bd41:skalibs
 
 
@@ -67,9 +67,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/snaprep b/variants/ccx-x86_64/snaprep
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+zsh.82e514e97a46638444fd2c4cd350f06448bc0e420106837798f816e61f93a8d8
-#+pthbs-banginstall.dfcc9f95868b03f9f1bc27775713d0cf9f38ba973030e0a886e1c34c0c72f413
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+zsh.314f09fa72addc628a39be341df4fd6a05c86508e74427114ee8ecfad3aa0daf
+#+pthbs-banginstall.4b928bbc9f1757434da2b45fab5a8959939348bf367170eaabd97c836be9e43e
 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep
 
 
@@ -96,9 +96,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+attr.ae3c7a2a8a562df5e09ea63a9a2ecf5010f23434230ecae0048c74f42dba4256
-#+zstd.5aaee80eaa2961048e0584df375f3adbc65332729f1082bca4ec6a8b61fb6062
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+attr.55ff3226f9c5597bba6cb6b0d46416b2e6d40e47929b8068b22406eb21c1afcf
+#+zstd.d8e56d84c51ce4a2c66001746564a47ef314f7cbdf7c30250f527d89d9f1a5d1
 #@untar:-z:sha256:4672b5c47d9418d3a5ae5b243defc6d9eae8275b9771022247c6a6082c815914:.
 
 
@@ -133,9 +133,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/strace b/variants/ccx-x86_64/strace
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+m4.71b0fceb1252909ac3e136c647ee97b6885ebb27cdbd4fb02d14a429f474ffac
-#+patch.06e45503237afc561db0492a9dd6e348344308340d6ba563d670031e4f008894
-#+libunwind.c38ed47d52a20d3532b18b61cbd776f6b26a1ef278a10ac44fb218c39bbe4bf5
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+m4.ebe5f39b4a169f768e6ba99d26ff9d39d314f936b14fe49b228a08742e5730b1
+#+patch.0e3975ff5b4a302fb8f415e49b4e0a756cd29bca495ef34d9aa1ec23149d0d4a
+#+libunwind.08f7826251c21282d7bbe7bf9fced2d2fdc2d4cb1cb7790196339d3d7f0a4d52
 #@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch
 #@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:.
 
@@ -92,7 +92,7 @@ patch -p1 <../strace-6.5-static.patch
 
 build_env_static
 autotools_config_static --with-unwind --without-libdw --enable-mpers=check
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -140,9 +140,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -151,16 +151,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-dosfstools.082c8505e8504856b248b6f39de79296ab9f7f967c98b907a135abde5e9ff599
-#+busybox-e2fsprogs.586024943410c8938b26e4af2fa01c93c77e95a8e3c727a88feee8763fdf5cd6
-#+busybox-iproute2.c9df1a1c5f61b29ecb0f9ebca71fddde5df330ac45e8aa6b8819c6daf6ed8de7
-#+busybox-iputils.c633b75e059a06fdb639f6e4d51b573b83aa2dbc7db478353a74a4fe16df7954
-#+busybox-net-misc.c82a713ab1239dff7b68347bef7d213c3743fafc70bd2a11a491614a2e70d52b
-#+busybox-net-tools.5a9d16c694cef26b7f17bdde44569e39ed2d9ec848445b728a90058e604cd855
-#+busybox-traceroute.10632edaaec631fed7f3decbf3f1d9432fed3a9d7b22e57de8fdff31f473175f
-#+busybox-wget.55d68755e7797658bd3adbf233e25158d90796da4ffc8f99b813b886c31e9dd9
-#+busybox-chpst.4cd94e4d27a87c4e620a1837eaaa0e60dceef843c7b57bba9be3ccc27c24aad1
-#+busybox-console.d454b6b84deb72034002d720d75ddcef97cb35ddf85fa36226991207319b5fb9
-#+busybox-getty.0d5f3d0cf3b3c7045b8593d17e3fc3f31d3b67a4c8c3351c5bd4e3350f981558
-#+busybox-i2c-tools.503a91d91b19266a775b52d057d92be9fbb0ccab21fe90b8413b829fbd3d44ab
-#+busybox-linux-extra.7d0bbeb541ea411ffb8e4ad2829834036dc10a467b1efba187a3640dd3076dc4
-#+busybox-mtd-utils.8b058942d5aaeacfb96d16df3ef7a2a62e88e1f9ba3fb4cec2f110f48fb333d5
-#+busybox-shadow.73ac712af837e5e783d9e762de8e12721605d8a085665ba2057483119345d4a5
-#+busybox-su.302cb68f398a32d2b353a959dc87d10dda8ca8585992c1f771af3a2c9709421f
-#+busybox-util-linux-priv.28d5d124181aad8bf03d02a88b837cec959833bf6c527962b3f61f9660faaf1e
-#+busybox-logging.0f3de914920894615b7cf2fc1da575e11daef613db4934bd7c0a5eb9ce1f97af
-#+busybox-cron.20f7b5919c276f669ceed33eac256a6ee548e2efc729150c83fb5b3375405ca6
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+nawk.f13d31fe21bc47400c4a8a33b8c33fdfa9e1a5f0c4fcc5f3e6dd460b368cd5c2
-#+diffutils.300c7d6070fa3f67f80e4db9eb0045da8a29ec664a6158ca32f33930832770cb
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+aat.78d0a18ccbeee979785a37585d82f1be5b008b3a0b60c235170c4e940d5a62f4
-#+fileset.7026d26a38ed1106dd42dcc2014c781dfb43c3a77f98f97acd68a797978f4178
-#+rsync.0c79f9558617b4183d38b3baf33ac6dbf4202593174ac36e138d5225b1a06e58
-#+execline.c021cb4fd44c364d09d3d581b5453eba7ac539af8fcaa45911e9e98e0e3cc3cc
-#+kbd.2f51a13bf4892a56c7e38e7cc43820bd9662d3cba162cc88c35433b41d93cb4f
-#+mdevd.8977e1530144243519622556e82af2519721ec115d384e1f4d21f69bd37ce043
-#+s6-linux-utils.5b3e6ea8e722f5fe607f538fc50f16d70a634e729ee5e81cd5a2bbdb8f8fb109
-#+s6-rc.012bd583d88a517c5afb73399ee4ece632468c1d16f36c5f4c5423147347369b
-#+s6.e35b9ef84fcf9a69e9ef04fd22da5e72b2a917eb341bdbd1e7fb0bfbe641b481
-#+zsh.82e514e97a46638444fd2c4cd350f06448bc0e420106837798f816e61f93a8d8
-#+libcgroup.4924a7f7987795e43cadb8273dfc2798b598c7b20783c8083fff3a59599f37b4
-#+system-config-scripts.c39928f32e47925474e80aa14cf78fce2b7d9b1066865b00b0e5e10fcc6a14f6
-#+logincaps.20a22e5f6ac95ea8aae188f17093be275e92048be7a9da137266d2ca8115ab30
-#+busybox.a01f8444ab1fc4d1d17e0dc88b2db15d8fdd90bb64d18f532f7feb70c742f008
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-dosfstools.eefacf4063a74017ec25edb809e640575e2b39d7b7f9bc64a3b4ab5cff7a7d50
+#+busybox-e2fsprogs.a9a59754385df808bc52f94c0398cbfadaa178600868b8c9f00f4382413e0fc3
+#+busybox-iproute2.4ee9949367b50e9740dc8a72bae9a24448824b40a1d9d26870f816309d1e9ee6
+#+busybox-iputils.8a9de0c1dd9d0aff24e2d61efac1a7a5d0347a8f6bf96ffbaf05f1f741c2f783
+#+busybox-net-misc.635041820b01e5b954b4b9b8210100a82deb8ac763d37542bd20d5a313704fb7
+#+busybox-net-tools.a628d4b7a55aba902488d5d6778fa9ffbb78b6a9f25fff0f37dcd7caf0851a87
+#+busybox-traceroute.90adc3de774bd17af9446c7de7e02e4489866b874dc51519e6855b6fbe8fc573
+#+busybox-wget.eaadf77299148256e47638216c04006c62040940bb73a6c263332d8d8f2a296b
+#+busybox-chpst.ae97b6fb2bade6747667ed6cc67c363a3f24182901c31ada75e998a7b19ea52f
+#+busybox-console.d27cf965d89adf6024676ed416d70991ff5dd7f9ad3d51aeb2598b5357872821
+#+busybox-getty.b90bfb9248f996d6fb13cd2d94b5fca329d085e623fa8a3ed0e86a17d1cc2ea1
+#+busybox-i2c-tools.d146e54f37a421f6ba49bdf7c55c4c8a28c1a97e361cebdc051f4df3050aac11
+#+busybox-linux-extra.b283dc30c75d08daa117331a37e80960edf3f8ab4decabda0af1ac60a0630b90
+#+busybox-mtd-utils.704c58cda7a76ef359e5b11df087b7f8dbfbec536b554a256dc740e079db3bf2
+#+busybox-shadow.752a003fb021d4c38452a64617f5ddfd73322f6fe150bedd3a14663aea3172e6
+#+busybox-su.141ddd2babe7ade8f25c357e3417f63d471522e7e5a7cf36067e1df485c39173
+#+busybox-util-linux-priv.1402e2f690ad55db68f2514075a3a95c96a884a82d1f49cf991172896ccecb39
+#+busybox-logging.63b435942c4ef9b98eb1c52ce009fd765221bd5f2f5f19d5b2bcc878f241d535
+#+busybox-cron.d4aaecca250d5376a54ebf2b7ff4d09263ffdf9ba201e871776afa8d0ff37d48
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+nawk.e1e0ceecd0021f5f6bfad9bd942b5ad4ffc87bc3d1d3784b7491e9ad888e8e52
+#+diffutils.264116b2f8a2a696fcd70230a252a6a0557dfbfee2f0fd2c9e74f95db4f19dfd
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+aat.5f8aedb90767e3d6ddbbfddb69e59bdde7fb7b8faad6bcd91b0be2a6348d0b49
+#+fileset.40cf2a445f4c75f3f486219d6a29fce964bd3d64b767290e23daf814d2c8bc4c
+#+rsync.6127f16f505d7403e4351f91839aa0aca36634b273eb9906cf8b0663f37bfd99
+#+execline.62aa9ddd636b6441ef0e28b1f9d71c135187616424d693b978ddff0c05cf3529
+#+kbd.ac02cd7ee132eae6a82542641071f659f3f3b9dda3d45ec5ffb24728a3edc93a
+#+mdevd.bc5e266a5d997f9601d8320618aade618eb2c46ff47de37dff659b4b32c2bba0
+#+s6-linux-utils.c37a5e327402dc5749d7603bbd71ad439ac5170e5f23a33a5f561945bcf6c0a1
+#+s6-rc.8c9433b6b3974868da0eb771745db7cdb75545b39186b12c43f45a28830c545e
+#+s6.ce7acb6925fe79da8e6e25e0b035488c63c601433054d2910b2eaada965b4589
+#+zsh.314f09fa72addc628a39be341df4fd6a05c86508e74427114ee8ecfad3aa0daf
+#+libcgroup.a87856ea81a4b02289b87aea5543cf911aaec0fb928d055df61bd19f6e12c59d
+#+system-config-scripts.9dc3601801fe0143af4b0581e63a3c9057114daa47012353fca3813626a2a896
+#+logincaps.e683fcea4766a1dfe0b170c58c5c0c5a1b8152e3b245aa11e5b93b46f0e19df4
+#+busybox.bb8729a06821874ffdda0b44281d96c5a935444130c81607f21a25da3629e79b
 #@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.8bf2079f8dd67ec2955d3520237434049c52a3f4280986fdd010383962f4fd4a' \
-	'pthbs_path_mdevd=/home/ccx/versions/env.01842835d8f639a0f265070de98be586e5d8f13a4c386f23dcc9a380d4183867' \
+	'pthbs_path_containers=/home/ccx/versions/env.cda7e0c2cc2611692b5b81513f4cd6094bfcf72c3fff6f0ac7ee7c8346de1d63' \
+	'pthbs_path_mdevd=/home/ccx/versions/env.5a81a11c99adc07cb8a0143678dc077336cddca111803edc26c495d3e3be6f6f' \
 	make -j${JOBS:-1} -l$((1+${JOBS:-1})) all
 
 sort -u build/execfile | while IFS= read exename; do
@@ -161,9 +161,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-dosfstools.082c8505e8504856b248b6f39de79296ab9f7f967c98b907a135abde5e9ff599
-#+busybox-e2fsprogs.586024943410c8938b26e4af2fa01c93c77e95a8e3c727a88feee8763fdf5cd6
-#+busybox-iproute2.c9df1a1c5f61b29ecb0f9ebca71fddde5df330ac45e8aa6b8819c6daf6ed8de7
-#+busybox-iputils.c633b75e059a06fdb639f6e4d51b573b83aa2dbc7db478353a74a4fe16df7954
-#+busybox-net-misc.c82a713ab1239dff7b68347bef7d213c3743fafc70bd2a11a491614a2e70d52b
-#+busybox-net-tools.5a9d16c694cef26b7f17bdde44569e39ed2d9ec848445b728a90058e604cd855
-#+busybox-traceroute.10632edaaec631fed7f3decbf3f1d9432fed3a9d7b22e57de8fdff31f473175f
-#+busybox-wget.55d68755e7797658bd3adbf233e25158d90796da4ffc8f99b813b886c31e9dd9
-#+busybox-chpst.4cd94e4d27a87c4e620a1837eaaa0e60dceef843c7b57bba9be3ccc27c24aad1
-#+busybox-console.d454b6b84deb72034002d720d75ddcef97cb35ddf85fa36226991207319b5fb9
-#+busybox-getty.0d5f3d0cf3b3c7045b8593d17e3fc3f31d3b67a4c8c3351c5bd4e3350f981558
-#+busybox-i2c-tools.503a91d91b19266a775b52d057d92be9fbb0ccab21fe90b8413b829fbd3d44ab
-#+busybox-linux-extra.7d0bbeb541ea411ffb8e4ad2829834036dc10a467b1efba187a3640dd3076dc4
-#+busybox-mtd-utils.8b058942d5aaeacfb96d16df3ef7a2a62e88e1f9ba3fb4cec2f110f48fb333d5
-#+busybox-shadow.73ac712af837e5e783d9e762de8e12721605d8a085665ba2057483119345d4a5
-#+busybox-su.302cb68f398a32d2b353a959dc87d10dda8ca8585992c1f771af3a2c9709421f
-#+busybox-util-linux-priv.28d5d124181aad8bf03d02a88b837cec959833bf6c527962b3f61f9660faaf1e
-#+busybox-logging.0f3de914920894615b7cf2fc1da575e11daef613db4934bd7c0a5eb9ce1f97af
-#+busybox-cron.20f7b5919c276f669ceed33eac256a6ee548e2efc729150c83fb5b3375405ca6
-#+s6.e35b9ef84fcf9a69e9ef04fd22da5e72b2a917eb341bdbd1e7fb0bfbe641b481
-#+s6-rc.012bd583d88a517c5afb73399ee4ece632468c1d16f36c5f4c5423147347369b
-#+s6-portable-utils.282b0e074c758130782d2b6f19494728ce7978b85ab1f76faaadf0af500a708e
-#+s6-linux-init.a256cbc8d3a2f861870673826930c4e809f976bd7809204dc141670c8325a43f
-#+execline.c021cb4fd44c364d09d3d581b5453eba7ac539af8fcaa45911e9e98e0e3cc3cc
-#+system-config-rc.620e776aae49dac979134d16da66a96327bdcb3841b4daca92a3f069606f83dc
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-dosfstools.eefacf4063a74017ec25edb809e640575e2b39d7b7f9bc64a3b4ab5cff7a7d50
+#+busybox-e2fsprogs.a9a59754385df808bc52f94c0398cbfadaa178600868b8c9f00f4382413e0fc3
+#+busybox-iproute2.4ee9949367b50e9740dc8a72bae9a24448824b40a1d9d26870f816309d1e9ee6
+#+busybox-iputils.8a9de0c1dd9d0aff24e2d61efac1a7a5d0347a8f6bf96ffbaf05f1f741c2f783
+#+busybox-net-misc.635041820b01e5b954b4b9b8210100a82deb8ac763d37542bd20d5a313704fb7
+#+busybox-net-tools.a628d4b7a55aba902488d5d6778fa9ffbb78b6a9f25fff0f37dcd7caf0851a87
+#+busybox-traceroute.90adc3de774bd17af9446c7de7e02e4489866b874dc51519e6855b6fbe8fc573
+#+busybox-wget.eaadf77299148256e47638216c04006c62040940bb73a6c263332d8d8f2a296b
+#+busybox-chpst.ae97b6fb2bade6747667ed6cc67c363a3f24182901c31ada75e998a7b19ea52f
+#+busybox-console.d27cf965d89adf6024676ed416d70991ff5dd7f9ad3d51aeb2598b5357872821
+#+busybox-getty.b90bfb9248f996d6fb13cd2d94b5fca329d085e623fa8a3ed0e86a17d1cc2ea1
+#+busybox-i2c-tools.d146e54f37a421f6ba49bdf7c55c4c8a28c1a97e361cebdc051f4df3050aac11
+#+busybox-linux-extra.b283dc30c75d08daa117331a37e80960edf3f8ab4decabda0af1ac60a0630b90
+#+busybox-mtd-utils.704c58cda7a76ef359e5b11df087b7f8dbfbec536b554a256dc740e079db3bf2
+#+busybox-shadow.752a003fb021d4c38452a64617f5ddfd73322f6fe150bedd3a14663aea3172e6
+#+busybox-su.141ddd2babe7ade8f25c357e3417f63d471522e7e5a7cf36067e1df485c39173
+#+busybox-util-linux-priv.1402e2f690ad55db68f2514075a3a95c96a884a82d1f49cf991172896ccecb39
+#+busybox-logging.63b435942c4ef9b98eb1c52ce009fd765221bd5f2f5f19d5b2bcc878f241d535
+#+busybox-cron.d4aaecca250d5376a54ebf2b7ff4d09263ffdf9ba201e871776afa8d0ff37d48
+#+s6.ce7acb6925fe79da8e6e25e0b035488c63c601433054d2910b2eaada965b4589
+#+s6-rc.8c9433b6b3974868da0eb771745db7cdb75545b39186b12c43f45a28830c545e
+#+s6-portable-utils.5a4f55daa1590e74ad5853ae565674567e23902ca38e50c3bbc2f2f27d23fd3c
+#+s6-linux-init.2819c598a774f39a33d05293d26bbf71ad6ef610aaf10a7fd7c88a17487655cb
+#+execline.62aa9ddd636b6441ef0e28b1f9d71c135187616424d693b978ddff0c05cf3529
+#+system-config-rc.1298dcffc3b4a3edec10bcd8bdb45cc28c3d9e6ad5a9201b134576d444e73a8f
 
 
 # - build script start -
@@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-s6rcdb=/home/ccx/versions/system-config-rc.620e776aae49dac979134d16da66a96327bdcb3841b4daca92a3f069606f83dc/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.1298dcffc3b4a3edec10bcd8bdb45cc28c3d9e6ad5a9201b134576d444e73a8f/config/s6-rc-db
 
 # Generate init (${dest} must not exist but parent dir does)
 mkdir -p "$pthbs_destdir//home/ccx/versions"
@@ -204,9 +204,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+s6-rc.012bd583d88a517c5afb73399ee4ece632468c1d16f36c5f4c5423147347369b
-#+fileset.7026d26a38ed1106dd42dcc2014c781dfb43c3a77f98f97acd68a797978f4178
-#+system-config.5b153883b11d485fa5d453c4adc20c9849a8a55c37686f26c33c3abe17a47705
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+s6-rc.8c9433b6b3974868da0eb771745db7cdb75545b39186b12c43f45a28830c545e
+#+fileset.40cf2a445f4c75f3f486219d6a29fce964bd3d64b767290e23daf814d2c8bc4c
+#+system-config.2d4781db2faca22c838a9d3aee9f4a50e829c4081b761fd216c4ebb51301ad7b
 
 
 # - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-src=/home/ccx/versions/system-config.5b153883b11d485fa5d453c4adc20c9849a8a55c37686f26c33c3abe17a47705/config/s6-rc-source
+src=/home/ccx/versions/system-config.2d4781db2faca22c838a9d3aee9f4a50e829c4081b761fd216c4ebb51301ad7b/config/s6-rc-source
 s6-rc-compile ./s6-rc-db "$src"
 mkdir -p "$dest/config"
 mv -v s6-rc-db "$dest/config/"
@@ -79,9 +79,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+zsh.82e514e97a46638444fd2c4cd350f06448bc0e420106837798f816e61f93a8d8
-#+pthbs-banginstall.dfcc9f95868b03f9f1bc27775713d0cf9f38ba973030e0a886e1c34c0c72f413
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+zsh.314f09fa72addc628a39be341df4fd6a05c86508e74427114ee8ecfad3aa0daf
+#+pthbs-banginstall.4b928bbc9f1757434da2b45fab5a8959939348bf367170eaabd97c836be9e43e
 #@git:dc793695cc0632a808af9d4415f3b0cf0f4dfba2:system-config-scripts
 
 
@@ -96,9 +96,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+zsh.82e514e97a46638444fd2c4cd350f06448bc0e420106837798f816e61f93a8d8
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+zsh.314f09fa72addc628a39be341df4fd6a05c86508e74427114ee8ecfad3aa0daf
 #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh
 
 
@@ -75,9 +75,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/tinyssh b/variants/ccx-x86_64/tinyssh
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
 #@untar:-z:sha256:f3ae622c765db4e0d791ea90a9feba39d7f693ef9cb949a797f7ad6b404a2d61:.
 
 
@@ -113,9 +113,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+execline.c021cb4fd44c364d09d3d581b5453eba7ac539af8fcaa45911e9e98e0e3cc3cc
-#+pthbs-banginstall.dfcc9f95868b03f9f1bc27775713d0cf9f38ba973030e0a886e1c34c0c72f413
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+execline.62aa9ddd636b6441ef0e28b1f9d71c135187616424d693b978ddff0c05cf3529
+#+pthbs-banginstall.4b928bbc9f1757434da2b45fab5a8959939348bf367170eaabd97c836be9e43e
 #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env
 
 
@@ -79,9 +79,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-dosfstools.082c8505e8504856b248b6f39de79296ab9f7f967c98b907a135abde5e9ff599
-#+busybox-e2fsprogs.586024943410c8938b26e4af2fa01c93c77e95a8e3c727a88feee8763fdf5cd6
-#+busybox-iproute2.c9df1a1c5f61b29ecb0f9ebca71fddde5df330ac45e8aa6b8819c6daf6ed8de7
-#+busybox-iputils.c633b75e059a06fdb639f6e4d51b573b83aa2dbc7db478353a74a4fe16df7954
-#+busybox-net-misc.c82a713ab1239dff7b68347bef7d213c3743fafc70bd2a11a491614a2e70d52b
-#+busybox-net-tools.5a9d16c694cef26b7f17bdde44569e39ed2d9ec848445b728a90058e604cd855
-#+busybox-traceroute.10632edaaec631fed7f3decbf3f1d9432fed3a9d7b22e57de8fdff31f473175f
-#+busybox-wget.55d68755e7797658bd3adbf233e25158d90796da4ffc8f99b813b886c31e9dd9
-#+busybox-chpst.4cd94e4d27a87c4e620a1837eaaa0e60dceef843c7b57bba9be3ccc27c24aad1
-#+busybox-console.d454b6b84deb72034002d720d75ddcef97cb35ddf85fa36226991207319b5fb9
-#+busybox-getty.0d5f3d0cf3b3c7045b8593d17e3fc3f31d3b67a4c8c3351c5bd4e3350f981558
-#+busybox-i2c-tools.503a91d91b19266a775b52d057d92be9fbb0ccab21fe90b8413b829fbd3d44ab
-#+busybox-linux-extra.7d0bbeb541ea411ffb8e4ad2829834036dc10a467b1efba187a3640dd3076dc4
-#+busybox-mtd-utils.8b058942d5aaeacfb96d16df3ef7a2a62e88e1f9ba3fb4cec2f110f48fb333d5
-#+busybox-shadow.73ac712af837e5e783d9e762de8e12721605d8a085665ba2057483119345d4a5
-#+busybox-su.302cb68f398a32d2b353a959dc87d10dda8ca8585992c1f771af3a2c9709421f
-#+busybox-util-linux-priv.28d5d124181aad8bf03d02a88b837cec959833bf6c527962b3f61f9660faaf1e
-#+busybox-logging.0f3de914920894615b7cf2fc1da575e11daef613db4934bd7c0a5eb9ce1f97af
-#+busybox-cron.20f7b5919c276f669ceed33eac256a6ee548e2efc729150c83fb5b3375405ca6
-#+attr.ae3c7a2a8a562df5e09ea63a9a2ecf5010f23434230ecae0048c74f42dba4256
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+diffutils.300c7d6070fa3f67f80e4db9eb0045da8a29ec664a6158ca32f33930832770cb
-#+patch.06e45503237afc561db0492a9dd6e348344308340d6ba563d670031e4f008894
-#+flex.ecbd2bdcc5abd25d4ef923652fc6c158befdda7084b087db3ab7dda51308afbc
-#+bison.9446cfd6cf4dc7324d6d2069c9abbcbae24c33e96acb4032120af7142b6a5b1e
-#+rsync.0c79f9558617b4183d38b3baf33ac6dbf4202593174ac36e138d5225b1a06e58
-#+execline.c021cb4fd44c364d09d3d581b5453eba7ac539af8fcaa45911e9e98e0e3cc3cc
-#+s6.e35b9ef84fcf9a69e9ef04fd22da5e72b2a917eb341bdbd1e7fb0bfbe641b481
-#+s6-rc.012bd583d88a517c5afb73399ee4ece632468c1d16f36c5f4c5423147347369b
-#+s6-portable-utils.282b0e074c758130782d2b6f19494728ce7978b85ab1f76faaadf0af500a708e
-#+s6-linux-utils.5b3e6ea8e722f5fe607f538fc50f16d70a634e729ee5e81cd5a2bbdb8f8fb109
-#+s6-linux-init.a256cbc8d3a2f861870673826930c4e809f976bd7809204dc141670c8325a43f
-#+mdevd.8977e1530144243519622556e82af2519721ec115d384e1f4d21f69bd37ce043
-#+s6-dns.166bafae66d569f738d150e97c79bf3f124ec2b2f6ef246133d9d585006cd7d6
-#+libressl.17d14a88243c1e6ab03ace6cc1c4b09f44c45ebefb8170d0e0c5c598ac08840a
-#+s6-networking.3d6081057890416a9af62c24c53920c917810e82b2418418723110194a0e77ba
-#+zsh.82e514e97a46638444fd2c4cd350f06448bc0e420106837798f816e61f93a8d8
-#+pthbs-banginstall.dfcc9f95868b03f9f1bc27775713d0cf9f38ba973030e0a886e1c34c0c72f413
-#+aat.78d0a18ccbeee979785a37585d82f1be5b008b3a0b60c235170c4e940d5a62f4
-#+confz.e7f1047b6907b24ab802cb0429ec00381d79463ca8c38911ff0607e72bf4d10e
-#+containers.8026bc4c7f9e98940696277069750f638ab4ff0c9aa7a64cd6f39cd2be867d0b
-#+fileset.7026d26a38ed1106dd42dcc2014c781dfb43c3a77f98f97acd68a797978f4178
-#+logincaps.20a22e5f6ac95ea8aae188f17093be275e92048be7a9da137266d2ca8115ab30
-#+snaprep.d8402e4204644111f87a156041b486f1f1f659b5de6e6ddfa55cd8d427b1d098
-#+curl.3af169f38bdcdc43a00a74b9c8fb65ed96f1ffad59621a0bb0de45e63b47013b
-#+git.de5b94cec317e40461669a51b5701748bffd2ee10846568f6833b3b659b0b00e
-#+xbps.7fb65cd5079b8846fe45be14f871af716a5a9bda5077995fb8a60403a6a3b9fb
-#+apk-tools.9709db335cd8154b09a6ac605f9b847aaa65d3e0f5eb5306ec2a5f6e62747b5d
-#+getent.95c9ace5e25224e5199d3c10a35632f717198de0db8bdafc2ebb836bfc5c429b
-#+getconf.c422b6a1da2c320c7a1b67e8cbf71ae199593fdde1ee478e08e7cf510bce77e0
-#+iconv.74e8751dfa249daba004857134c8307e4b6412d757ec271a8f470fef5d01d493
-#+libcap.59bd3a6538e3e979c913eea22d0c51181ffebd01441f1d6ede9c4849a4e22414
-#+applyuidgid-caps.e2777d9ba79100a8419f5aace207d1fcfe421e02e7dd958d4cd1b71e4339941f
-#+ccx-utils.8e0c384e96ad914f904a592857d5ef3f71d870d86fe4a23a2c32cfb1312b1d20
-#+user-env.efabb13295c7544e99f0c8f96613bcb1ebd6c4f8024290ca4c1242c74a8c105f
-#+strace.40e9d102c40316b3fbaecf7fcb8994569066ea1a1e70a9433bf7a8a8fd4185b8
-#+mlog.72367cff481701d635fae9c6071760ddf98f1965bc0018580ec65d7680239367
-#+findutils.3d20afa11a4d98f0dc7c511f601d602f7ded3485bd164aa362efd0f72fb9521a
-#+nawk.f13d31fe21bc47400c4a8a33b8c33fdfa9e1a5f0c4fcc5f3e6dd460b368cd5c2
-#+squashfs-tools.077ccc4786e6da50b1970f949377e0569e37d1c562653da784fad22626dc7f96
-#+mandoc.8dabaf45cf7b5ea5b68d97d2652d41f4fff205863169c3aa2390d531cf46e0f4
-#+tinyssh.24e9ec76c8584233bec46e54179b54d0f5de0d92da0c0b2666f7994d0b73394f-
\ No newline at end of file
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-dosfstools.eefacf4063a74017ec25edb809e640575e2b39d7b7f9bc64a3b4ab5cff7a7d50
+#+busybox-e2fsprogs.a9a59754385df808bc52f94c0398cbfadaa178600868b8c9f00f4382413e0fc3
+#+busybox-iproute2.4ee9949367b50e9740dc8a72bae9a24448824b40a1d9d26870f816309d1e9ee6
+#+busybox-iputils.8a9de0c1dd9d0aff24e2d61efac1a7a5d0347a8f6bf96ffbaf05f1f741c2f783
+#+busybox-net-misc.635041820b01e5b954b4b9b8210100a82deb8ac763d37542bd20d5a313704fb7
+#+busybox-net-tools.a628d4b7a55aba902488d5d6778fa9ffbb78b6a9f25fff0f37dcd7caf0851a87
+#+busybox-traceroute.90adc3de774bd17af9446c7de7e02e4489866b874dc51519e6855b6fbe8fc573
+#+busybox-wget.eaadf77299148256e47638216c04006c62040940bb73a6c263332d8d8f2a296b
+#+busybox-chpst.ae97b6fb2bade6747667ed6cc67c363a3f24182901c31ada75e998a7b19ea52f
+#+busybox-console.d27cf965d89adf6024676ed416d70991ff5dd7f9ad3d51aeb2598b5357872821
+#+busybox-getty.b90bfb9248f996d6fb13cd2d94b5fca329d085e623fa8a3ed0e86a17d1cc2ea1
+#+busybox-i2c-tools.d146e54f37a421f6ba49bdf7c55c4c8a28c1a97e361cebdc051f4df3050aac11
+#+busybox-linux-extra.b283dc30c75d08daa117331a37e80960edf3f8ab4decabda0af1ac60a0630b90
+#+busybox-mtd-utils.704c58cda7a76ef359e5b11df087b7f8dbfbec536b554a256dc740e079db3bf2
+#+busybox-shadow.752a003fb021d4c38452a64617f5ddfd73322f6fe150bedd3a14663aea3172e6
+#+busybox-su.141ddd2babe7ade8f25c357e3417f63d471522e7e5a7cf36067e1df485c39173
+#+busybox-util-linux-priv.1402e2f690ad55db68f2514075a3a95c96a884a82d1f49cf991172896ccecb39
+#+busybox-logging.63b435942c4ef9b98eb1c52ce009fd765221bd5f2f5f19d5b2bcc878f241d535
+#+busybox-cron.d4aaecca250d5376a54ebf2b7ff4d09263ffdf9ba201e871776afa8d0ff37d48
+#+attr.55ff3226f9c5597bba6cb6b0d46416b2e6d40e47929b8068b22406eb21c1afcf
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+diffutils.264116b2f8a2a696fcd70230a252a6a0557dfbfee2f0fd2c9e74f95db4f19dfd
+#+patch.0e3975ff5b4a302fb8f415e49b4e0a756cd29bca495ef34d9aa1ec23149d0d4a
+#+flex.a8e6330e37a5b68ddcdd60c751957aef251a394ae0293a895274445fc7c4d472
+#+bison.1e46e10492ad00af4eb0af979777e6733dff37acb870a783b5c2778bb8d56cf8
+#+rsync.6127f16f505d7403e4351f91839aa0aca36634b273eb9906cf8b0663f37bfd99
+#+execline.62aa9ddd636b6441ef0e28b1f9d71c135187616424d693b978ddff0c05cf3529
+#+s6.ce7acb6925fe79da8e6e25e0b035488c63c601433054d2910b2eaada965b4589
+#+s6-rc.8c9433b6b3974868da0eb771745db7cdb75545b39186b12c43f45a28830c545e
+#+s6-portable-utils.5a4f55daa1590e74ad5853ae565674567e23902ca38e50c3bbc2f2f27d23fd3c
+#+s6-linux-utils.c37a5e327402dc5749d7603bbd71ad439ac5170e5f23a33a5f561945bcf6c0a1
+#+s6-linux-init.2819c598a774f39a33d05293d26bbf71ad6ef610aaf10a7fd7c88a17487655cb
+#+mdevd.bc5e266a5d997f9601d8320618aade618eb2c46ff47de37dff659b4b32c2bba0
+#+s6-dns.d009f1e7dea48eaead6be8c2f4b2d8119e8f1aa292d6dcb51e6c412009d91f86
+#+libressl.0d257c1736931d70bd42eb2ce09e01a2b608544628a476871207cf9567e49bef
+#+s6-networking.5942f95e84ca87407b2af022e116a8c31a15369796c0536eed42c04b454fa74d
+#+zsh.314f09fa72addc628a39be341df4fd6a05c86508e74427114ee8ecfad3aa0daf
+#+pthbs-banginstall.4b928bbc9f1757434da2b45fab5a8959939348bf367170eaabd97c836be9e43e
+#+aat.5f8aedb90767e3d6ddbbfddb69e59bdde7fb7b8faad6bcd91b0be2a6348d0b49
+#+confz.8ec1173ee5c86b6c24eae60f764ae6a6cfa35760e8fb5ac5cd608c114557189f
+#+containers.40606dcd75ad6d414bd51202b4c310e90fee1440e5e06ff264edd5610d17f610
+#+fileset.40cf2a445f4c75f3f486219d6a29fce964bd3d64b767290e23daf814d2c8bc4c
+#+logincaps.e683fcea4766a1dfe0b170c58c5c0c5a1b8152e3b245aa11e5b93b46f0e19df4
+#+snaprep.57fff42dfbcfdf8af82a2245ab76fdfc1f6131e3bd9148c26c24e608a17dffd2
+#+curl.31622a444019875e19d4d8532feb0d745333c209e7fee7ecd0073151aa43b4a8
+#+git.8b47dd5df033eef7fee57bb66b56aee3fe958650329b2a940ded23d6c0c354dd
+#+xbps.beb27d692aab5937397886d5dae02bb9ae4cde1b38116393419a0f4139c390ec
+#+apk-tools.f5e6eb2c996e52880a4f3ed48eb4c3c4b0f55dfea8c0e9f73442d8f4be272656
+#+getent.d9e96e47f70f93726ae1549177c450abe3dc87fe1a826d540f1bdc403f13002f
+#+getconf.07ea68360c917f8e1fd3024b4dc5973fa3b4747515581bf94af7346dfd6f03b7
+#+iconv.df76c6694d18b9a35dc7ffc190f40b3b67c95fee99baae948a35d00043eca621
+#+libcap.60b73785fae3ea4320bec2661ca30f89feab8325a75639079e2e0c62ca57eb87
+#+applyuidgid-caps.8eb31ae0e7020b3704f7a62b4e0036ab576bf0bf6e01fc7b146af97337b49b61
+#+ccx-utils.5b15d51d4178ffe7503552397b42a33e979f4a3d7e38d4491d16bbbd53aa7e9d
+#+user-env.aa6256771d40eac3b3a15265e082ce805527d5a5578ef12d9bbb2aa646f09fb0
+#+strace.580356767c9d232c405221cd06ee53aaee713221b34a663a8d4305c3a68fff59
+#+mlog.734033e8a7d9428adde6cb2328b9ac1e71a66327d2f3081422c02c9d1e8623e7
+#+findutils.75cf5777af27901d2fbb6b4ec727592b702473d768cec80ad39b4065eec65410
+#+nawk.e1e0ceecd0021f5f6bfad9bd942b5ad4ffc87bc3d1d3784b7491e9ad888e8e52
+#+squashfs-tools.48786b31c536a3780952e78e4cde33b63eeddfb948d2fecf2615ef0ec1326abc
+#+mandoc.cc8b2639f6385687d4a816ecffd10d4fdb874e2d81b12e441e4d623e8cc2ebc0
+#+tinyssh.69c1fd3572b6443c36035edfc82ea571e6baf0286e490fac3bd9c0ccb5c76afb+
\ 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.eadd5356d3a3f62875ef56a11c9f0293937cbe67c91318cac4efcd5aa095f202-
\ No newline at end of file
+#+linux-qemu-guest.0b87e50abd2e72f360d3a14350ab6456b6ba7f4d4fae36e48fdff6d8612dfd94+
\ 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.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+libarchive.59dba4050622e1e03c8a5f77ef9295bcf0ba8723c323cec36820fa06ad846ece
-#+libressl.17d14a88243c1e6ab03ace6cc1c4b09f44c45ebefb8170d0e0c5c598ac08840a
-#+pkgconf-pkg-config.18dceaa29083112da146e7686701eb2035a024bee88b0ef7e4f3d640ee1af9b1
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+libarchive.40bbe22de10c152f99028bbf61872389ee038ec9d1a7b26d325da16738eeec46
+#+libressl.0d257c1736931d70bd42eb2ce09e01a2b608544628a476871207cf9567e49bef
+#+pkgconf-pkg-config.bb0e5a13e9d6d3816f435974a779c013297e262c7fe5a5f9f3325df5dff64e8d
 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:.
 
 
@@ -138,9 +138,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/zsh b/variants/ccx-x86_64/zsh
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+m4.71b0fceb1252909ac3e136c647ee97b6885ebb27cdbd4fb02d14a429f474ffac
-#+netbsd-curses.8bfbf34a00001cde709bde178cb7fcd5f3b991170bc72e8c6b71f30806a1e9a9
-#+libbsd.dd410293e298ed0143098829d439d94ec4085380d44740677963b0c42173dbc2
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+m4.ebe5f39b4a169f768e6ba99d26ff9d39d314f936b14fe49b228a08742e5730b1
+#+netbsd-curses.c3702a0b3a97b5d0e6272a40a23b8f327e4f3eb4b57e87d626c9687a84f7f76a
+#+libbsd.61e482c7c85d98df66ad2f7bbc2486617f85c32fb03d23196e164e31f4fc7364
 #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config
 #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:.
 
@@ -173,9 +173,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/zstd b/variants/ccx-x86_64/zstd
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.ff146bb2e726fdd30204d11ffcabf2ad6e9d1272234938799cc342a689226509
-#+busybox-bzip2.b88084f17f39a2eba2a5100492985979175c5aa4ac14bcedef6ec6e1aaf20043
-#+busybox-gzip.8f3d5600b833e9538116e476ebca4c710944860b7400e0d9b3edc210a26aa7a9
-#+busybox-lzop.dabbd99c6a34186e0cb70131bdfe5b7c296fd862281e9c0f152853ec4800293e
-#+busybox-unzip.434f850d13d5e5c236c5a2faa191662f867c76b47778aabaaebc0426bc412a9c
-#+busybox-xz.63041328bd0793350148b720ae68e335a9db1fd736321c1a1a1498e82a27c1f5
-#+busybox-cpio.2a5a6e34f26961287fa9818b5efc3a1b01a76f482fa46a0eb1ead99bc04a7012
-#+busybox-dpkg.9fbed8090675571efbe2d0e3e36327e101586a10098a4e5881da1f96a186de16
-#+busybox-rpm.74caaf5eaaa0fbe92149989123a4146c606fc6382e44a8d847a11b2fda97eb45
-#+busybox-tar.5fd2175a377a881c8f227385f0337c4c9fa471e445b49186bed2ed8b72f889b1
-#+busybox-ed.95abd237b88406859282b1025f936c65264b151ed8589e3d0b8526e667fe691f
-#+busybox-sed.21d272b574e956ccc8e3788d71c98d111d73bcb7a0c20c3e2e954657ab23454f
-#+busybox-vi.8e5348e5f09a8b28bae3984bf2caf1fa0734c1ca000539210894bd90fb683df5
-#+busybox-xxd.f92480ba172006f92d7fdaaa027cf3371cd8035bf7eae5084407d0992bc70f49
-#+busybox-process-extra.c0e49dd02bac44e772487e6e5dedc117ba56af86bbc2b6fea15ac69038965e10
-#+busybox-procps.3e06da3e6e9a76ce5abfca32abb7a631b3b62cf02424572b1ac41cf1a6032f5b
-#+busybox-psmisc.525f720625dc1dc87cc74d3ffc011c4fa6ac0ff6c0690fd2629032b39f2921e9
-#+busybox-ash.e800bb2796ce031cf0cd28a23a792ae77323282d90c623ad50d4a59945f0fa62
-#+busybox-bc.0015e935a90ddb8033058320c7c85c2e37d2fc00804088686d998f9366dbb0e8
-#+busybox-coreutils.302a87711d1aa9f7587dc6bf011416bb176473c1a25ae9a4fe240124fe0cbbc4
-#+busybox-coreutils-extra.4535674fb576f60a029557ba73a841bfb922e0b514ecf1af99d97f2e7610817d
-#+busybox-daemontools.c95606b16c449d65ce07cb36f5dd1de600d10f94a623462761b09622ce5cf544
-#+busybox-grep.3ceb35c80662c6cb1cf397162766275acc2079e8c27995091ecc7ba1bac9fc7c
-#+busybox-misc.18fc1b4ce69fe190c54f1debdbaea824ea3fca194f009e8eac935ace952f6143
-#+busybox-sh.c232958d7c5d129eb609f4ede0f5ed1d126b9e8fbd44590cea85ac1c9778c1f1
-#+busybox-util-linux-unpriv.05b38087316e64d19383b71c6e35bbcf8d0e26da47b03418d706cf679a4f6ba3
-#+busybox-findutils.b1b4ec30aac8aae2b379a6fde6a3838a563fb44427eb9f26d2590031250c4838
-#+busybox-awk.f4822a574485c0a82ea38b9d2ebbfb8be2f5d1f7020bb3985dd70c6511cd4a30
-#+musl-cross-make.bad589f24201b9a8bdb601277f4f0b622c4da47b58aca19aa13de0eeedb5df9d
-#+gnu-make.4cd9d34c290ad1366e3351693bcd32292dc0a86ba674deb6e8609188fdd795b2
-#+busybox-diffutils.9e8a821c2d8394b453b01a22ef9481f999f9bc2655098ade6af62a84e5e0ab2a
+#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox-bzip2.4b66291312ecdbc6c87d2fd6d5cd92b77b68a91cf8920b05c4dc6bb827f43171
+#+busybox-gzip.3ade909592416e58cd4e2e4971cfd5da414ce7c135bfe9e55aed600ce523a47b
+#+busybox-lzop.1e4df3c3fb6e6def7550ba6048489cb6d8fe334a503a5690c35520114b1bdbd0
+#+busybox-unzip.c93c3d4570dcf6bb0a3cb075ecf416b9bd1eb0cd1633fadd3cc08345a8851682
+#+busybox-xz.b95a888121653c67fe42800f7e99754163aa55673599eb19a67512ed2680c657
+#+busybox-cpio.f911e5c26e5519814c0c8ac77629c19f2667cc41ea54774e8e2f77037212a366
+#+busybox-dpkg.006db84e24875da2964e6fa666836648a09af3ec49ed4918703595af6ac78022
+#+busybox-rpm.22b2edfd17afc1bb58649b5011e2dce7594af89bdaf478a98bb8ff2953c5b51f
+#+busybox-tar.7b8c79c63b421687027fc81972c840708257c0da5b7511d67290654a53103545
+#+busybox-ed.575a18e8dd76cc0fba97d14874856d31f145298e9fbd3b4d93e6ee213b3d22df
+#+busybox-sed.fc3d92c72d745b528b60bf4f4e7da338bfe1d91661bd92f8d5428b2dbd81ce9d
+#+busybox-vi.75add265fb0ea3897a30496a423a8f58d2ae16bb4442a8cd7015c2d8d1238515
+#+busybox-xxd.274ee6a76a75fd6470c3aad6f8b40b2fb3596797926a030360dabc6d72488b93
+#+busybox-process-extra.38788af8797c8c894748d5b0646cbd1c36c00ac230a68a9c408107bf1dc2588d
+#+busybox-procps.0314aaaef18bec9384319523d0f5351870077879eef758b2196e943bb3490501
+#+busybox-psmisc.6281d78c0b375fee2ebfbc0de56ac6e69eda5201883029f04bc8db2afa58e802
+#+busybox-ash.fabcf6c79ba75a43e2bb39269257d1dc7232056b8566e5b828c550cdbd4b2818
+#+busybox-bc.d9fec30c1581fc33641d510cd3de48b9fc08b8f2dc22b42f5151249f2f27b0b9
+#+busybox-coreutils.86f07f3e4ffd2fcc8bf429a64f9c2c82c4594acab513e06e745a3492a67afa2e
+#+busybox-coreutils-extra.6dcf15bd450883ec3177bcba38402c89526ed55a0a88be8ed1c3692c480d1f38
+#+busybox-daemontools.ef2c3bf7495680794912cd827aefe90a4cf566d6107215ea8d8a7715afc7b84f
+#+busybox-grep.15a47c2ca2567604b0f078123574cbabb12cb5a9295b5982cdbeda1816a1c2d3
+#+busybox-misc.96ff3d322d3299763d15bba5566999ad7d8f9b2f5347c6c339db41022d6a26c5
+#+busybox-sh.8abdb2188247bf799334c60d20157e3a4cf74b23b5ab1f2889de1a0524c81476
+#+busybox-util-linux-unpriv.f791769fe6768530df5638b22304b1c30614f5371ff86d6fecceab1c430264ee
+#+busybox-findutils.a344824ec83bdf13dae64688c971e80ca57d565b6026fcb9ef47f46d4a31d1b5
+#+busybox-awk.90674a8be6229b61738b6f0ed1f30e96229028360084a56c06b82d76d72dea14
+#+musl-cross-make.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
+#+gnu-make.f9f5aeab74891145c20bec3af3390ef0685bf1c3ba566fbbd2553d3050b02003
+#+busybox-diffutils.3048e1c035ac8b8276db8ec912a2185e4ff2b0a87ce3e6a9f34051ff13186f9a
 #@untar:-z:sha256:98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1:.
 
 
@@ -111,9 +111,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/aat b/variants/root-x86_64/aat
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+zsh.b294c45b50749a1ecd8ad526a8fc0e9d75d5a98094f6b85dfe2f8524d142d995
-#+pthbs-banginstall.0808643db47f5b10d4f1afac3124074270b46fe3de033d17895315cf797eba96
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+zsh.1a9e6c9c487ff782474a7de120940351054c19445c775c808c1fdd272262c311
+#+pthbs-banginstall.218506c0794f6679abbb9343da26d20157aafedd81266f761eb2696c0a312119
 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat
 
 
@@ -98,9 +98,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/abduco b/variants/root-x86_64/abduco
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
 #@git:8c32909a159aaa9484c82b71f05b7a73321eb491:abduco
 
 
@@ -121,9 +121,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
 #@git:c7b36ed27103ee3f9aa01905ba1fac2d606079cf:alpine-keys
 
 
@@ -79,9 +79,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+patch.4dde0ea6c40f34670986c613217bffa1cb0adbdd46c6f1e5e3708835dbb50f41
-#+libressl.4b4d2aedd3016e7d66bc82165af68bdbfe931bc0b4f093e4290e56b51c56a461
-#+zstd.08a3627a300ce395fbc23d776548e23604c5d2159d06813975a025363e57252b
-#+pkgconf-pkg-config.24b2e23832afdac72a6b277a18c247082819a688fbe710ad00f462cdda2d1fe7
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+patch.37ad4ea29ff465fb5ef543bb5434445296beb16c513eeec5ae6f3e69fa1ed7f0
+#+libressl.13729215dbb743a0fb10127fac6d396c1a140dd3a53b1ed62065472e8586acd0
+#+zstd.e0e066c304f8b662819708767b429ce424651b59529cc64b461d93114713c781
+#+pkgconf-pkg-config.1168c4c769c5a6ca0574996fb5dee2d3fab38d2ecf1a7ba7325154dcb4c31262
 #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch
 #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools
 
@@ -119,9 +119,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+skalibs.2d0f33bac54539bd90ab0d62dc20c207d4ef7a891262780d50a9103acaada8bb
-#+libcap.7ec3e41bbb6e1a01a3133446ab21bf48ea875bb2a55bf95b8de6e672f0bd5935
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+skalibs.f46389b8118622cea646bd3563ba4163989500f391ae34c328a193e26449f01f
+#+libcap.d615b3de2cbbfe88978f4957402e79f535710f4a4044e97e454fd5b341538adb
 #@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c
 
 
@@ -108,9 +108,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+m4.c8d88d8aec319136135088f0afb3abd0c9d406b2e3d6e36ebbdba13c9a6da204
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+m4.1966f1cc47deb93b6cc0630a2b4037285eb5de4080e2152a0e54f0e842b7bee8
 #@untar:-z:sha256:c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6:.
 #@untar::sha256:a4facc0856b512ad8ab5aed7b07e14a9629aaf042b1e92377ba22fcfc4c4205b:argp-standalone-1.5.0
 
@@ -116,9 +116,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/attr b/variants/root-x86_64/attr
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+m4.c8d88d8aec319136135088f0afb3abd0c9d406b2e3d6e36ebbdba13c9a6da204
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+m4.1966f1cc47deb93b6cc0630a2b4037285eb5de4080e2152a0e54f0e842b7bee8
 #@untar:-z:sha256:39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87:.
 
 
@@ -89,7 +89,7 @@ LDFLAGS=--static
 
 build_env_static
 autotools_config_static 
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -136,9 +136,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -147,16 +147,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
diff --git a/variants/root-x86_64/bison b/variants/root-x86_64/bison
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+m4.c8d88d8aec319136135088f0afb3abd0c9d406b2e3d6e36ebbdba13c9a6da204
-#+flex.2ab2d15b849d19051c26ced9a98a12cbe9f8cfeebe08aeb6738236768d62e329
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+m4.1966f1cc47deb93b6cc0630a2b4037285eb5de4080e2152a0e54f0e842b7bee8
+#+flex.ab225b1901dff619996a02fe1050de403a024475c2b6a432707014dc28114d07
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 
@@ -91,7 +91,7 @@ export CPPFLAGS="-D_GNU_SOURCE -DSTDC_HEADERS"
 
 build_env_static
 autotools_config_static --disable-nls
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -138,9 +138,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -149,16 +149,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+gnu-make.e6aa0a74f059daf4032edcd8c80a48bdf701895263b7ddf6b731aba1dd191388
-#+musl-cross-make.fa1f93d71879f2b8fc0311ac8fc611ac295c3cadf750e324afb25af090c90207-
\ No newline at end of file
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+gnu-make.e83ebb5b87ae559c2ea259d37ea642ab860acd75ac003123f100e3c71cf0f901
+#+musl-cross-make.a50ca83c06d31066290d6d9f8fb236667c1b2dbc376cb34377761fe9b87386a1+
\ 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.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.e6aa0a74f059daf4032edcd8c80a48bdf701895263b7ddf6b731aba1dd191388
-#+busybox.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.e83ebb5b87ae559c2ea259d37ea642ab860acd75ac003123f100e3c71cf0f901
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
 #@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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
 
 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.fa1f93d71879f2b8fc0311ac8fc611ac295c3cadf750e324afb25af090c90207
-#+gnu-make.e6aa0a74f059daf4032edcd8c80a48bdf701895263b7ddf6b731aba1dd191388
+#+musl-cross-make.a50ca83c06d31066290d6d9f8fb236667c1b2dbc376cb34377761fe9b87386a1
+#+gnu-make.e83ebb5b87ae559c2ea259d37ea642ab860acd75ac003123f100e3c71cf0f901
 #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox
 #@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config
 
 PATH="$pthbs_build_environment:$PATH"
-mcm=/versions/musl-cross-make.fa1f93d71879f2b8fc0311ac8fc611ac295c3cadf750e324afb25af090c90207
-make=/versions/gnu-make.e6aa0a74f059daf4032edcd8c80a48bdf701895263b7ddf6b731aba1dd191388
+mcm=/versions/musl-cross-make.a50ca83c06d31066290d6d9f8fb236667c1b2dbc376cb34377761fe9b87386a1
+make=/versions/gnu-make.e83ebb5b87ae559c2ea259d37ea642ab860acd75ac003123f100e3c71cf0f901
 
 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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+certdata2pem.bfd281167708608190a9fdf0f2c3e4f8477144778f7fcc00978f7d8f76f09084
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+certdata2pem.87c3dde33176a29b30daaae4f246d92032df89bdf19eacd80228c829b61adedd
 #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:.
 
 
@@ -89,9 +89,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+skalibs.2d0f33bac54539bd90ab0d62dc20c207d4ef7a891262780d50a9103acaada8bb
-#+s6.05eda2316ff21294e6954477f46acbf2d024b362e2ee66611babba7bab02040d
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+skalibs.f46389b8118622cea646bd3563ba4163989500f391ae34c328a193e26449f01f
+#+s6.1ad0b529f4324fda577d196c6994cb0dc32ed7d92f7ba50e1395cdc2374a450a
 #@git:461a9ec198c1e2b9c39a34e21786747dbb8671b4:ccx-utils
 
 
@@ -138,9 +138,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/certdata2pem b/variants/root-x86_64/certdata2pem
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
 #@sha256:064f7d41106cd9efa08b9e68cf049f44e3be55666bd2ab96d02c508293b8dce7:certdata2pem.c
 
 
@@ -106,9 +106,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/confz b/variants/root-x86_64/confz
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+zsh.b294c45b50749a1ecd8ad526a8fc0e9d75d5a98094f6b85dfe2f8524d142d995
-#+pthbs-banginstall.0808643db47f5b10d4f1afac3124074270b46fe3de033d17895315cf797eba96
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+zsh.1a9e6c9c487ff782474a7de120940351054c19445c775c808c1fdd272262c311
+#+pthbs-banginstall.218506c0794f6679abbb9343da26d20157aafedd81266f761eb2696c0a312119
 #@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz
 
 
@@ -95,9 +95,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-dosfstools.b48202c09e25c912ad9c0e6461426e13c076e17b8819cba04d94c1e0721cfe67
-#+busybox-e2fsprogs.aaa3d31e9508708a9c49cd8b4bdb2d312fbedbe4e637f5284c93529702e67ff7
-#+busybox-iproute2.2f457ae49d7fd09d73bbbe5f37410fe82838855fed370ada83336a3e0d4ba19f
-#+busybox-iputils.37c34276542472b7414ceda0430992cc82521f56287295e4c56adb5adc1283a0
-#+busybox-net-misc.bbec677ce1c792fd705e346d6068169cec83d5ef9d025f83fe55a4a2ed75409d
-#+busybox-net-tools.7eadf6e434c14fc58acc02ff5388c5c830300e3030e4e8d0c542b61dd6a4d558
-#+busybox-traceroute.af17725cacaf936501f8f81330d820d725747063f279da83beb3e089d8936839
-#+busybox-wget.26fe7474987360fa5b6029ae0f68ac0f490d94e819872dbfead31189f39fdc6b
-#+busybox-chpst.230a660161659f948ca118624c66549ff55b0ad9c14a925cce6e0a038d40d051
-#+busybox-console.b5eed7352bc618210b3892186a0522c7319183dd5019d461c56cf0e170d9f74c
-#+busybox-getty.51fe8c57e3f49aa8cd5407f09d9ebd147ceede2a22dc062dee7accb1f96178b9
-#+busybox-i2c-tools.1c950c8ee55f1b1fc674d36d2564c70d9499de2e5d0e97031abca88dbf0b137b
-#+busybox-linux-extra.79cba3a2838615a5f28316df027ae3179c84fa97e4317ca080da4204fd400fb3
-#+busybox-mtd-utils.f6ab67f21f65aaa1534a6182164f3374823f7b06e9d6d75935c94c2a56e7c9f0
-#+busybox-shadow.a739aa09ea823c8bfb929f991859b5100dac9dc0e7f922c4479d93e1daa69ce1
-#+busybox-su.3bbbfb7cde5c6ee87932d469da407d14e144cb5838ee58146792e89941feefb4
-#+busybox-util-linux-priv.a28f7271def8401a284a115b91d586fa04509a75b1ffefc9cb73782f743d8d7d
-#+busybox-logging.0ebad270645a8c4b8af8f585d6905cab1f421ff190377eb96ea173b8dacd66bc
-#+busybox-cron.06c301490cf07c74523559c9343f81c4f9c1bbf851a363a1d6996691f67abd10
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-login.981152fba4964d743188af57f1d9906dad4c750d14dfa717e33a8268fac19cf4
-#+execline.a3e0cdff27257fed7b694dd55a62923d9444badaee9c28ea51bd89fbdf8ab14e
-#+s6.05eda2316ff21294e6954477f46acbf2d024b362e2ee66611babba7bab02040d
-#+ccx-utils.a141cc1b0f0cac0ca9773954a20c2f08c239404d3688720849461e459e7287ce
-#+applyuidgid-caps.aa2f81ed7ee561053e65145eeee5fe1e589c5861cc06ff6cbeca18210b2b59b9
-#+easyseccomp.b303d26f9571bd1e868bf2df68ad67d0d87ad9426e0340c20e7e0a100b25772e
-#+mlog.d0aaf29bb6022cce4fe390af7f8170032a891405e1f6dad755327b8a39c259e3
-#+abduco.c7e34c86ef829c624d96a3d2dcb19ff578d2057de65e6c47c298c4e7acbcb5f4
-#+nawk.381177d4e8e6dcb810de62cbc90a14089506be188e708b48036269ac4214995a
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-dosfstools.1aeaa58c3e33924fdb102d5c5ee7221e77f3046b7127f699891bbfbf2304430f
+#+busybox-e2fsprogs.9bc73c56f0e71795ecce4e67f3e0ed1bba064b90bd05449f725239f6c64a9d73
+#+busybox-iproute2.94cb4fb51f4e8a0d2459c02674d17470c783e554087ff8201badaff7b269c914
+#+busybox-iputils.af614e89c894e03924f1c90cf494b8379f9cba70a43d50c1413ab5d85d7e7e11
+#+busybox-net-misc.32acaca88c420a42a7b166f0118aabb51eeb104c08bfd7aa4a63f4a1ac471d90
+#+busybox-net-tools.51bcca55b4cd2941485aa75332689d0b8445ba8701a61cb4e42a56705972d2f3
+#+busybox-traceroute.5257a4b38f73e06d7f7fd9d585ebfbcfca618b2d350708bae6da88db153d915f
+#+busybox-wget.1828a78d247b814352c0a62d0d363fbad588dcef4cd920d35734d41043612277
+#+busybox-chpst.c447fefcd27efbb192d8f3693738b3fa74a2d88da8d9351878d98e52971b5dbb
+#+busybox-console.819f0a43134343586b4831db94dcb6fe8a56b55ca9d5158e788a7d283b7cc55c
+#+busybox-getty.0590f1111800572ba4aa73d33a50585cbbfcd54f5269f2914df0fa2bc1853c57
+#+busybox-i2c-tools.8a7357848cfbc85eba31df4016bd961ed44f8b53101ddcaed371893b5688287e
+#+busybox-linux-extra.5e6dfc5168b8d7a12c1094870e2f72e89dd8508238f3c8f7319bf320d81a6ecf
+#+busybox-mtd-utils.88894a8c9ffbda9751b648fad9d79ef96741f022c748bd3ece9a612db6309f80
+#+busybox-shadow.af645c989b36c12549f4766647014ff09472421ca0a469c1a0f7acfb402ca42c
+#+busybox-su.f808244ad4eb9e8ba65ef85254ce68a2bdd371de9f713697e20f5d2907ead0f2
+#+busybox-util-linux-priv.ba141805065abf2a502b70e7ce955c5165b8725f1a204277b457e238ed24475d
+#+busybox-logging.2fa3102e85347e07f10eb8ac9ca21c478f39f4ea255a4d7ac1ca26016e0da648
+#+busybox-cron.f81b3b6a65ff08e200829e5a2117edef6b38e8ed25f8517ce148a4dbd2ce9696
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-login.3a9035ff4343a424c68b2dd2300b09334dfecd9ce3f5ebddb60c57686d0873d8
+#+execline.d50f3f7a78cfe50b3526c9a877d90f5dd0af60372d717cb6a5e343415e95f50b
+#+s6.1ad0b529f4324fda577d196c6994cb0dc32ed7d92f7ba50e1395cdc2374a450a
+#+ccx-utils.fcf5e926df3e6c3b16f595c2f20c7ac57820eeb59a24f32772ded13f8b779884
+#+applyuidgid-caps.412d5c73f82883f3d8aec924bc7e1f7936132917ca13b2f00a4e2e52e1f9612d
+#+easyseccomp.1e76b92cf7fcc83db3bbb7ec820a79aa529fb10ae0204f369df6d3dbc09ee7d7
+#+mlog.918236ea0c7178227da102ff8731ca783732775cff22f2c8587c7db690ffc641
+#+abduco.651190db6ef573824adbaa5a1d52842029b7bca608d3227bf931939d6f5172a1
+#+nawk.c2c2f30264808844207b675b7651711207891f09daff4fb1f022b305a2003d52
 #@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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+zsh.b294c45b50749a1ecd8ad526a8fc0e9d75d5a98094f6b85dfe2f8524d142d995
-#+pthbs-banginstall.0808643db47f5b10d4f1afac3124074270b46fe3de033d17895315cf797eba96
-#+execline.a3e0cdff27257fed7b694dd55a62923d9444badaee9c28ea51bd89fbdf8ab14e
-#+alpine-keys.45c9e70eb34ed2d414b512d6ff759b85f7c983192585a5eaa114fd7e6e3f0b4d
-#+apk-tools.1b3c49a9e804b0876c5afcd6ee663d0bc768545e8d111fc082fdc1f16e786899
-#+xbps.8f7eaaf659ee1fc8e4913b59a390ad5566c1e4900d2c44380c6631a147c3eb6d
-#+container-bin-image.7cf6d75baf86a548693483de8da1c5aca345a3f7d2373a6a2735aac93fffaefb
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+zsh.1a9e6c9c487ff782474a7de120940351054c19445c775c808c1fdd272262c311
+#+pthbs-banginstall.218506c0794f6679abbb9343da26d20157aafedd81266f761eb2696c0a312119
+#+execline.d50f3f7a78cfe50b3526c9a877d90f5dd0af60372d717cb6a5e343415e95f50b
+#+alpine-keys.f6cf0c450611090e007a46934e5fbe7836b79a7de08dbe6a588ba2d0d32f3cfa
+#+apk-tools.f95a9cc6e15c3caa3fc011561c831baa92ac41bdfd079005198d840f5669d9f2
+#+xbps.aa25bcdd58e8ef03c5170226008cb363f060c026c63345b1483b98e28a6d8d02
+#+container-bin-image.01b80bd586b49aed049605ba7c8649ad99a7642ddeb50a765a857c6a986693cc
 #@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.1b3c49a9e804b0876c5afcd6ee663d0bc768545e8d111fc082fdc1f16e786899/command/apk.static' "${dest}/deps/command/"
-ln -sf '/versions/xbps.8f7eaaf659ee1fc8e4913b59a390ad5566c1e4900d2c44380c6631a147c3eb6d/command/xbps-install.static' "${dest}/deps/command/"
+ln -sf '/versions/apk-tools.f95a9cc6e15c3caa3fc011561c831baa92ac41bdfd079005198d840f5669d9f2/command/apk.static' "${dest}/deps/command/"
+ln -sf '/versions/xbps.aa25bcdd58e8ef03c5170226008cb363f060c026c63345b1483b98e28a6d8d02/command/xbps-install.static' "${dest}/deps/command/"
 
-for f in '/versions/alpine-keys.45c9e70eb34ed2d414b512d6ff759b85f7c983192585a5eaa114fd7e6e3f0b4d'/keys/alpine/*/*; do
+for f in '/versions/alpine-keys.f6cf0c450611090e007a46934e5fbe7836b79a7de08dbe6a588ba2d0d32f3cfa'/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.45c9e70eb34ed2d414b512d6ff759b85f7c983192585a5ea
 done
  
 mkdir -p "${dest}/deps/keys/void"
-for f in '/versions/xbps.8f7eaaf659ee1fc8e4913b59a390ad5566c1e4900d2c44380c6631a147c3eb6d'/keys/void/*; do
+for f in '/versions/xbps.aa25bcdd58e8ef03c5170226008cb363f060c026c63345b1483b98e28a6d8d02'/keys/void/*; do
 	ln -sf "$f" "${dest}/deps/keys/void/"
 done
 
-test -d '/versions/container-bin-image.7cf6d75baf86a548693483de8da1c5aca345a3f7d2373a6a2735aac93fffaefb/container-bin-image'
-test -f '/versions/container-bin-image.7cf6d75baf86a548693483de8da1c5aca345a3f7d2373a6a2735aac93fffaefb/container-bin-image/if'
-ln -sf '/versions/container-bin-image.7cf6d75baf86a548693483de8da1c5aca345a3f7d2373a6a2735aac93fffaefb/container-bin-image' "${dest}/deps/"
+test -d '/versions/container-bin-image.01b80bd586b49aed049605ba7c8649ad99a7642ddeb50a765a857c6a986693cc/container-bin-image'
+test -f '/versions/container-bin-image.01b80bd586b49aed049605ba7c8649ad99a7642ddeb50a765a857c6a986693cc/container-bin-image/if'
+ln -sf '/versions/container-bin-image.01b80bd586b49aed049605ba7c8649ad99a7642ddeb50a765a857c6a986693cc/container-bin-image' "${dest}/deps/"
  
 
 
@@ -137,9 +137,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-dosfstools.b48202c09e25c912ad9c0e6461426e13c076e17b8819cba04d94c1e0721cfe67
-#+busybox-e2fsprogs.aaa3d31e9508708a9c49cd8b4bdb2d312fbedbe4e637f5284c93529702e67ff7
-#+busybox-iproute2.2f457ae49d7fd09d73bbbe5f37410fe82838855fed370ada83336a3e0d4ba19f
-#+busybox-iputils.37c34276542472b7414ceda0430992cc82521f56287295e4c56adb5adc1283a0
-#+busybox-net-misc.bbec677ce1c792fd705e346d6068169cec83d5ef9d025f83fe55a4a2ed75409d
-#+busybox-net-tools.7eadf6e434c14fc58acc02ff5388c5c830300e3030e4e8d0c542b61dd6a4d558
-#+busybox-traceroute.af17725cacaf936501f8f81330d820d725747063f279da83beb3e089d8936839
-#+busybox-wget.26fe7474987360fa5b6029ae0f68ac0f490d94e819872dbfead31189f39fdc6b
-#+busybox-chpst.230a660161659f948ca118624c66549ff55b0ad9c14a925cce6e0a038d40d051
-#+busybox-console.b5eed7352bc618210b3892186a0522c7319183dd5019d461c56cf0e170d9f74c
-#+busybox-getty.51fe8c57e3f49aa8cd5407f09d9ebd147ceede2a22dc062dee7accb1f96178b9
-#+busybox-i2c-tools.1c950c8ee55f1b1fc674d36d2564c70d9499de2e5d0e97031abca88dbf0b137b
-#+busybox-linux-extra.79cba3a2838615a5f28316df027ae3179c84fa97e4317ca080da4204fd400fb3
-#+busybox-mtd-utils.f6ab67f21f65aaa1534a6182164f3374823f7b06e9d6d75935c94c2a56e7c9f0
-#+busybox-shadow.a739aa09ea823c8bfb929f991859b5100dac9dc0e7f922c4479d93e1daa69ce1
-#+busybox-su.3bbbfb7cde5c6ee87932d469da407d14e144cb5838ee58146792e89941feefb4
-#+busybox-util-linux-priv.a28f7271def8401a284a115b91d586fa04509a75b1ffefc9cb73782f743d8d7d
-#+busybox-logging.0ebad270645a8c4b8af8f585d6905cab1f421ff190377eb96ea173b8dacd66bc
-#+busybox-cron.06c301490cf07c74523559c9343f81c4f9c1bbf851a363a1d6996691f67abd10
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+execline.a3e0cdff27257fed7b694dd55a62923d9444badaee9c28ea51bd89fbdf8ab14e
-#+s6.05eda2316ff21294e6954477f46acbf2d024b362e2ee66611babba7bab02040d
-#+s6-portable-utils.a791ce7d06e6cdd1e4627c4ef146c80a4e7f86ddd3c272de45ebb12046a8ca19
-#+s6-linux-utils.65b0c8d0b58c1ad9a9b03d22f5a506c438f58f3c67b8bf44890d5247f30d9296
-#+zsh.b294c45b50749a1ecd8ad526a8fc0e9d75d5a98094f6b85dfe2f8524d142d995
-#+confz.b66cba40f51eac73668554fa6b6d541c99dad451826c853e1dbc61c0f0444012
-#+containers.5e82490e2dbd0ae59b6ca13e017dc4f43f6e0cbd971e5909ad0688666dd8fbe5
-#+xbps.8f7eaaf659ee1fc8e4913b59a390ad5566c1e4900d2c44380c6631a147c3eb6d
-#+zstd.08a3627a300ce395fbc23d776548e23604c5d2159d06813975a025363e57252b
-#+apk-tools.1b3c49a9e804b0876c5afcd6ee663d0bc768545e8d111fc082fdc1f16e786899
-#+alpine-keys.45c9e70eb34ed2d414b512d6ff759b85f7c983192585a5eaa114fd7e6e3f0b4d
-#+getent.eaed56995c394c16ba2f2dac4976ec5eb93b361d1667f0eb4ec3c31b84916b05
-#+fileset.05893c69bc55bc0fe1049569408bf85567bf3dfd434d413cd815005fe1dfab75
-#+ccx-utils.a141cc1b0f0cac0ca9773954a20c2f08c239404d3688720849461e459e7287ce
-#+easyseccomp.b303d26f9571bd1e868bf2df68ad67d0d87ad9426e0340c20e7e0a100b25772e
-#+findutils.dd67659c86ce76a4f29291cab9de3122f814a7ff0b9e33c92e804583558276a2
-#+nawk.381177d4e8e6dcb810de62cbc90a14089506be188e708b48036269ac4214995a-
\ No newline at end of file
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-dosfstools.1aeaa58c3e33924fdb102d5c5ee7221e77f3046b7127f699891bbfbf2304430f
+#+busybox-e2fsprogs.9bc73c56f0e71795ecce4e67f3e0ed1bba064b90bd05449f725239f6c64a9d73
+#+busybox-iproute2.94cb4fb51f4e8a0d2459c02674d17470c783e554087ff8201badaff7b269c914
+#+busybox-iputils.af614e89c894e03924f1c90cf494b8379f9cba70a43d50c1413ab5d85d7e7e11
+#+busybox-net-misc.32acaca88c420a42a7b166f0118aabb51eeb104c08bfd7aa4a63f4a1ac471d90
+#+busybox-net-tools.51bcca55b4cd2941485aa75332689d0b8445ba8701a61cb4e42a56705972d2f3
+#+busybox-traceroute.5257a4b38f73e06d7f7fd9d585ebfbcfca618b2d350708bae6da88db153d915f
+#+busybox-wget.1828a78d247b814352c0a62d0d363fbad588dcef4cd920d35734d41043612277
+#+busybox-chpst.c447fefcd27efbb192d8f3693738b3fa74a2d88da8d9351878d98e52971b5dbb
+#+busybox-console.819f0a43134343586b4831db94dcb6fe8a56b55ca9d5158e788a7d283b7cc55c
+#+busybox-getty.0590f1111800572ba4aa73d33a50585cbbfcd54f5269f2914df0fa2bc1853c57
+#+busybox-i2c-tools.8a7357848cfbc85eba31df4016bd961ed44f8b53101ddcaed371893b5688287e
+#+busybox-linux-extra.5e6dfc5168b8d7a12c1094870e2f72e89dd8508238f3c8f7319bf320d81a6ecf
+#+busybox-mtd-utils.88894a8c9ffbda9751b648fad9d79ef96741f022c748bd3ece9a612db6309f80
+#+busybox-shadow.af645c989b36c12549f4766647014ff09472421ca0a469c1a0f7acfb402ca42c
+#+busybox-su.f808244ad4eb9e8ba65ef85254ce68a2bdd371de9f713697e20f5d2907ead0f2
+#+busybox-util-linux-priv.ba141805065abf2a502b70e7ce955c5165b8725f1a204277b457e238ed24475d
+#+busybox-logging.2fa3102e85347e07f10eb8ac9ca21c478f39f4ea255a4d7ac1ca26016e0da648
+#+busybox-cron.f81b3b6a65ff08e200829e5a2117edef6b38e8ed25f8517ce148a4dbd2ce9696
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+execline.d50f3f7a78cfe50b3526c9a877d90f5dd0af60372d717cb6a5e343415e95f50b
+#+s6.1ad0b529f4324fda577d196c6994cb0dc32ed7d92f7ba50e1395cdc2374a450a
+#+s6-portable-utils.e126bd3cb76653521f81dcdcbf0187628caea370c7c307b4fcc054f72826a849
+#+s6-linux-utils.b13b3c79516949c7945e1bb990982ddb783096ec32ccb85ebcefd97a32362729
+#+zsh.1a9e6c9c487ff782474a7de120940351054c19445c775c808c1fdd272262c311
+#+confz.43c95b2d573592a66a00afa99ae0a5afc57a4a500432bba4e5a235bc8a7eb75c
+#+containers.1d896a59b8849b2a0871ded518c6231775140bb36975acdfc6e4e1e78635d52a
+#+xbps.aa25bcdd58e8ef03c5170226008cb363f060c026c63345b1483b98e28a6d8d02
+#+zstd.e0e066c304f8b662819708767b429ce424651b59529cc64b461d93114713c781
+#+apk-tools.f95a9cc6e15c3caa3fc011561c831baa92ac41bdfd079005198d840f5669d9f2
+#+alpine-keys.f6cf0c450611090e007a46934e5fbe7836b79a7de08dbe6a588ba2d0d32f3cfa
+#+getent.c91398998de3e3a5f0e9426f1af5aa9d89d0929705a593cf3f1e291a79e8a8fa
+#+fileset.3b7f30fce859ff7a545a9ea01ec40d2564f3d7cee9cdc3247d7ac16b7c5cb424
+#+ccx-utils.fcf5e926df3e6c3b16f595c2f20c7ac57820eeb59a24f32772ded13f8b779884
+#+easyseccomp.1e76b92cf7fcc83db3bbb7ec820a79aa529fb10ae0204f369df6d3dbc09ee7d7
+#+findutils.fd67178086fa5852591f7c9c0d407d57d59f52fcb5856644da5141a398331422
+#+nawk.c2c2f30264808844207b675b7651711207891f09daff4fb1f022b305a2003d52+
\ 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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+m4.c8d88d8aec319136135088f0afb3abd0c9d406b2e3d6e36ebbdba13c9a6da204
-#+libressl.4b4d2aedd3016e7d66bc82165af68bdbfe931bc0b4f093e4290e56b51c56a461
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+m4.1966f1cc47deb93b6cc0630a2b4037285eb5de4080e2152a0e54f0e842b7bee8
+#+libressl.13729215dbb743a0fb10127fac6d396c1a140dd3a53b1ed62065472e8586acd0
 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:.
 
 
@@ -157,9 +157,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-dosfstools.b48202c09e25c912ad9c0e6461426e13c076e17b8819cba04d94c1e0721cfe67
-#+busybox-e2fsprogs.aaa3d31e9508708a9c49cd8b4bdb2d312fbedbe4e637f5284c93529702e67ff7
-#+busybox-iproute2.2f457ae49d7fd09d73bbbe5f37410fe82838855fed370ada83336a3e0d4ba19f
-#+busybox-iputils.37c34276542472b7414ceda0430992cc82521f56287295e4c56adb5adc1283a0
-#+busybox-net-misc.bbec677ce1c792fd705e346d6068169cec83d5ef9d025f83fe55a4a2ed75409d
-#+busybox-net-tools.7eadf6e434c14fc58acc02ff5388c5c830300e3030e4e8d0c542b61dd6a4d558
-#+busybox-traceroute.af17725cacaf936501f8f81330d820d725747063f279da83beb3e089d8936839
-#+busybox-wget.26fe7474987360fa5b6029ae0f68ac0f490d94e819872dbfead31189f39fdc6b
-#+busybox-chpst.230a660161659f948ca118624c66549ff55b0ad9c14a925cce6e0a038d40d051
-#+busybox-console.b5eed7352bc618210b3892186a0522c7319183dd5019d461c56cf0e170d9f74c
-#+busybox-getty.51fe8c57e3f49aa8cd5407f09d9ebd147ceede2a22dc062dee7accb1f96178b9
-#+busybox-i2c-tools.1c950c8ee55f1b1fc674d36d2564c70d9499de2e5d0e97031abca88dbf0b137b
-#+busybox-linux-extra.79cba3a2838615a5f28316df027ae3179c84fa97e4317ca080da4204fd400fb3
-#+busybox-mtd-utils.f6ab67f21f65aaa1534a6182164f3374823f7b06e9d6d75935c94c2a56e7c9f0
-#+busybox-shadow.a739aa09ea823c8bfb929f991859b5100dac9dc0e7f922c4479d93e1daa69ce1
-#+busybox-su.3bbbfb7cde5c6ee87932d469da407d14e144cb5838ee58146792e89941feefb4
-#+busybox-util-linux-priv.a28f7271def8401a284a115b91d586fa04509a75b1ffefc9cb73782f743d8d7d
-#+busybox-logging.0ebad270645a8c4b8af8f585d6905cab1f421ff190377eb96ea173b8dacd66bc
-#+busybox-cron.06c301490cf07c74523559c9343f81c4f9c1bbf851a363a1d6996691f67abd10
-#+attr.e1a3bf652e1806d9b1504c53f3aa3e96d2bfedd58fcad78a0753058829ab0760
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+diffutils.33bd942cf2beccc8bb0cb15c8bfb81de161fe69f1e2a518d9d2a0cd05f9fe9ca
-#+patch.4dde0ea6c40f34670986c613217bffa1cb0adbdd46c6f1e5e3708835dbb50f41
-#+flex.2ab2d15b849d19051c26ced9a98a12cbe9f8cfeebe08aeb6738236768d62e329
-#+bison.36e0edcda0fcdd517ef56c5c44f5f49b9673d0dfd3f1f3b1ba47fd399db43437
-#+rsync.6478ab3db3fe93941ea78fb499e91111393aea9b483c0b21dcceb8c23bfe6da8
-#+execline.a3e0cdff27257fed7b694dd55a62923d9444badaee9c28ea51bd89fbdf8ab14e
-#+s6.05eda2316ff21294e6954477f46acbf2d024b362e2ee66611babba7bab02040d
-#+s6-rc.dafa7878177403d9b5985563021df2a9d9054bd38d9f4d64693b37b469ab07ce
-#+s6-portable-utils.a791ce7d06e6cdd1e4627c4ef146c80a4e7f86ddd3c272de45ebb12046a8ca19
-#+s6-linux-utils.65b0c8d0b58c1ad9a9b03d22f5a506c438f58f3c67b8bf44890d5247f30d9296
-#+s6-linux-init.323056acaac79b5adf3afa4a611ae912af8ffb1c655b6c020186b14bcf1a260b
-#+mdevd.ae4edcfd1645b1877245058ea879dc863b4f323235a72c195906ec82d8fa74f5
-#+s6-dns.48edd0a9e976d8b98f504d3edd079c74ee763b17dc588b7fd3b591be94a477db
-#+libressl.4b4d2aedd3016e7d66bc82165af68bdbfe931bc0b4f093e4290e56b51c56a461
-#+s6-networking.fc4e66bf844299774dc3213e76979d232ca21504bacbd8f9881e4d6e9a0d5ae7
-#+zsh.b294c45b50749a1ecd8ad526a8fc0e9d75d5a98094f6b85dfe2f8524d142d995
-#+pthbs-banginstall.0808643db47f5b10d4f1afac3124074270b46fe3de033d17895315cf797eba96
-#+aat.870a020506d1f38703b0c9e0dc0960791feb5531add073d08ea5675d78c0753b
-#+confz.b66cba40f51eac73668554fa6b6d541c99dad451826c853e1dbc61c0f0444012
-#+containers.5e82490e2dbd0ae59b6ca13e017dc4f43f6e0cbd971e5909ad0688666dd8fbe5
-#+fileset.05893c69bc55bc0fe1049569408bf85567bf3dfd434d413cd815005fe1dfab75
-#+logincaps.cbdbe3047d63f97d1baecc7b368709bc884453f0c2993b6e1fb6143677f3a0cf
-#+snaprep.1fac42d0847cab59049f9568ae221dafa1c9d41ed2ee4ca457e1bd9e0a760feb
-#+curl.8e23920a2304d6a2499a567648a9765f7bcf485cdd2421899d231a42d33d0300
-#+git.2099da9e56afa7723cde32ae934159680d8545483fdbfd0189252b11c9544996
-#+xbps.8f7eaaf659ee1fc8e4913b59a390ad5566c1e4900d2c44380c6631a147c3eb6d
-#+apk-tools.1b3c49a9e804b0876c5afcd6ee663d0bc768545e8d111fc082fdc1f16e786899
-#+getent.eaed56995c394c16ba2f2dac4976ec5eb93b361d1667f0eb4ec3c31b84916b05
-#+getconf.255e928fa26a27ec6b7652558576a541b9644981df236bae727137315f8ad6c8
-#+iconv.aa02e892fd78f4cddba02669e7a078e509f777daa278df985ed158b3c65121eb
-#+libcap.7ec3e41bbb6e1a01a3133446ab21bf48ea875bb2a55bf95b8de6e672f0bd5935
-#+applyuidgid-caps.aa2f81ed7ee561053e65145eeee5fe1e589c5861cc06ff6cbeca18210b2b59b9
-#+ccx-utils.a141cc1b0f0cac0ca9773954a20c2f08c239404d3688720849461e459e7287ce
-#+user-env.9f77947975623305fc51870b9fc09dd9a74deec60a2e1ec262eb25ea561e2a1d
-#+strace.ccf19939edfc107b664451c64ceb57c707254d4d060b04e78c0ca7d55e7eb6d1
-#+mlog.d0aaf29bb6022cce4fe390af7f8170032a891405e1f6dad755327b8a39c259e3
-#+findutils.dd67659c86ce76a4f29291cab9de3122f814a7ff0b9e33c92e804583558276a2
-#+nawk.381177d4e8e6dcb810de62cbc90a14089506be188e708b48036269ac4214995a
-#+squashfs-tools.3f0aef2f38a231da2409bde87eb890910fa2d0d4eb0c3feed6e893039bc0378a
-#+mandoc.aed0ef0bf7d9e38cd11346ebb161638d2b221c7e6d8c2f53b2afe741dd2940d7
-#+tinyssh.71e7a06bb87e9ff5ff61286dc561c5d21ec9d2cf0eb5ddac64a1a983749b6763
-#+system-config.a7c4f55369a479e2aa593d563c51b66a37dcbb86e1d86a3c59523860ab4271bf
-#+system-config-rc.51229680c6d1dbad900178878a598904395cf063dc023c855114ea23c1b889d4
-#+system-config-scripts.3d112e57a3bd42d96cc2aec6ff080c7a13be855494a5f718c61bfa47a426b739
-#+system-config-init.d04434ce578929c2908a9ebbac539fb4aae76216c7f9473943dc81cc0bb16f9e
-#+system-config-zsh.8ea01194747d11b9ce57cc8e8d1ac9730cb5742e67a5f25f3f42215c3f2f1283
-#+busybox-modutils.8a367b5a367887504245a84927f064a7009ff88e92ddab28fdd93cb2dd5175a3-
\ No newline at end of file
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-dosfstools.1aeaa58c3e33924fdb102d5c5ee7221e77f3046b7127f699891bbfbf2304430f
+#+busybox-e2fsprogs.9bc73c56f0e71795ecce4e67f3e0ed1bba064b90bd05449f725239f6c64a9d73
+#+busybox-iproute2.94cb4fb51f4e8a0d2459c02674d17470c783e554087ff8201badaff7b269c914
+#+busybox-iputils.af614e89c894e03924f1c90cf494b8379f9cba70a43d50c1413ab5d85d7e7e11
+#+busybox-net-misc.32acaca88c420a42a7b166f0118aabb51eeb104c08bfd7aa4a63f4a1ac471d90
+#+busybox-net-tools.51bcca55b4cd2941485aa75332689d0b8445ba8701a61cb4e42a56705972d2f3
+#+busybox-traceroute.5257a4b38f73e06d7f7fd9d585ebfbcfca618b2d350708bae6da88db153d915f
+#+busybox-wget.1828a78d247b814352c0a62d0d363fbad588dcef4cd920d35734d41043612277
+#+busybox-chpst.c447fefcd27efbb192d8f3693738b3fa74a2d88da8d9351878d98e52971b5dbb
+#+busybox-console.819f0a43134343586b4831db94dcb6fe8a56b55ca9d5158e788a7d283b7cc55c
+#+busybox-getty.0590f1111800572ba4aa73d33a50585cbbfcd54f5269f2914df0fa2bc1853c57
+#+busybox-i2c-tools.8a7357848cfbc85eba31df4016bd961ed44f8b53101ddcaed371893b5688287e
+#+busybox-linux-extra.5e6dfc5168b8d7a12c1094870e2f72e89dd8508238f3c8f7319bf320d81a6ecf
+#+busybox-mtd-utils.88894a8c9ffbda9751b648fad9d79ef96741f022c748bd3ece9a612db6309f80
+#+busybox-shadow.af645c989b36c12549f4766647014ff09472421ca0a469c1a0f7acfb402ca42c
+#+busybox-su.f808244ad4eb9e8ba65ef85254ce68a2bdd371de9f713697e20f5d2907ead0f2
+#+busybox-util-linux-priv.ba141805065abf2a502b70e7ce955c5165b8725f1a204277b457e238ed24475d
+#+busybox-logging.2fa3102e85347e07f10eb8ac9ca21c478f39f4ea255a4d7ac1ca26016e0da648
+#+busybox-cron.f81b3b6a65ff08e200829e5a2117edef6b38e8ed25f8517ce148a4dbd2ce9696
+#+attr.366026274b2318aa68aab95342c0824993cd87b6e8eea9673806e58887ce750d
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+diffutils.f595d46864dea091a112d3ea082ea1d930885e4bfa4298a6c66ce176115df8f7
+#+patch.37ad4ea29ff465fb5ef543bb5434445296beb16c513eeec5ae6f3e69fa1ed7f0
+#+flex.ab225b1901dff619996a02fe1050de403a024475c2b6a432707014dc28114d07
+#+bison.cdff3c99d312ecf9f6b3a714f436e71bae3733bf2355d29e4e11ffe3d50cc0be
+#+rsync.0cb8aadcd0ce6112d97ff4791e1ca60fec23b2f9cfba07f58d3ea1f7b8265660
+#+execline.d50f3f7a78cfe50b3526c9a877d90f5dd0af60372d717cb6a5e343415e95f50b
+#+s6.1ad0b529f4324fda577d196c6994cb0dc32ed7d92f7ba50e1395cdc2374a450a
+#+s6-rc.208d0331edde347fc36cf656d70a96c73dae404c5186cb1bf9e9eaccb42d2572
+#+s6-portable-utils.e126bd3cb76653521f81dcdcbf0187628caea370c7c307b4fcc054f72826a849
+#+s6-linux-utils.b13b3c79516949c7945e1bb990982ddb783096ec32ccb85ebcefd97a32362729
+#+s6-linux-init.9acea68842cdab731dc0da8c064a10dbd98502cca3ac160a277183cd89c88e91
+#+mdevd.89466f2d76dc425aa481ab91d73cd10b5c4c68ece63c90627b75e82bad11ac6c
+#+s6-dns.eaef0d053053fb51e9fc258982d1268c6b26f1babee7818d4663ef61ef8cc407
+#+libressl.13729215dbb743a0fb10127fac6d396c1a140dd3a53b1ed62065472e8586acd0
+#+s6-networking.9654dbc333c7d7f2d8ee32ed269f7fa8e369dabeecc2b844460571acfb9fd465
+#+zsh.1a9e6c9c487ff782474a7de120940351054c19445c775c808c1fdd272262c311
+#+pthbs-banginstall.218506c0794f6679abbb9343da26d20157aafedd81266f761eb2696c0a312119
+#+aat.337d96e3e10fe1efd7993355cac1ace40820cbf3ad0021e15b86692d7712dd25
+#+confz.43c95b2d573592a66a00afa99ae0a5afc57a4a500432bba4e5a235bc8a7eb75c
+#+containers.1d896a59b8849b2a0871ded518c6231775140bb36975acdfc6e4e1e78635d52a
+#+fileset.3b7f30fce859ff7a545a9ea01ec40d2564f3d7cee9cdc3247d7ac16b7c5cb424
+#+logincaps.ec1a2365c69e934d1c800d9d471ebcc81b21b7f9841fd69481db7e595df4830d
+#+snaprep.03a5b919875e375ebe8079ec48e1b2534aabe853e05f25385db6ad2faaebf8b1
+#+curl.44aba2502f0311b606fa89f26132c85bce0dc9e770e4485fef25a7040046b333
+#+git.79d585616a08f2b6dd55c586ced432899c301a68a7f08300b9db8be1117895fa
+#+xbps.aa25bcdd58e8ef03c5170226008cb363f060c026c63345b1483b98e28a6d8d02
+#+apk-tools.f95a9cc6e15c3caa3fc011561c831baa92ac41bdfd079005198d840f5669d9f2
+#+getent.c91398998de3e3a5f0e9426f1af5aa9d89d0929705a593cf3f1e291a79e8a8fa
+#+getconf.348ded15b8ff20d55a9b2466076391f922212fbc24e7e707d6ee9dbf40c4e917
+#+iconv.edf2ef75527d2b3fd3ce0d1c65f74baa766a0dbc5de1cdbe4d5fe4e6bf456df7
+#+libcap.d615b3de2cbbfe88978f4957402e79f535710f4a4044e97e454fd5b341538adb
+#+applyuidgid-caps.412d5c73f82883f3d8aec924bc7e1f7936132917ca13b2f00a4e2e52e1f9612d
+#+ccx-utils.fcf5e926df3e6c3b16f595c2f20c7ac57820eeb59a24f32772ded13f8b779884
+#+user-env.20aa00f639ce9d862cb7ea9566295cb38543942465fca0f692732fd8c4beee2c
+#+strace.65dd9dbfcc4dac9149fbde5c37c8550cebeb5cee016bd272c4f1105d1d307c49
+#+mlog.918236ea0c7178227da102ff8731ca783732775cff22f2c8587c7db690ffc641
+#+findutils.fd67178086fa5852591f7c9c0d407d57d59f52fcb5856644da5141a398331422
+#+nawk.c2c2f30264808844207b675b7651711207891f09daff4fb1f022b305a2003d52
+#+squashfs-tools.979a5b1e5e641d36b5440404df992d77d782cee42d514aaaaa304ea27980f363
+#+mandoc.b72f1759b2fe7143c5cc2488a1be1763db80698b6fb80f9b86d43a0f9eaf1fd2
+#+tinyssh.ff381ab9c4e3239ea7295755cca7f73fcfbe84ece3ee8d769a5022cb722cf95c
+#+system-config.9de5ea8ff4345f002918f91179040f8a73aa1df32ca77a5e6744ce4c409b7792
+#+system-config-rc.1cd9e859572d2445d0b02ed980ca608fe14cfcfae099a916f78e9d3fac18e054
+#+system-config-scripts.073fe0bcc815e32379d73d91267d04dc3412fc52314225afbc6094d453ab3efc
+#+system-config-init.6d3683744d338e56611759208427461b25333a40cdedfa59895ddbe9f3dec641
+#+system-config-zsh.15621d95d285f44a2f9209cd9349b37d29e193fe9cc55d79a9c9f332d0f05e0e
+#+busybox-modutils.d980c823615920904694f8c945834a478d6304e7baf5807279740e991d710803+
\ 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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+m4.c8d88d8aec319136135088f0afb3abd0c9d406b2e3d6e36ebbdba13c9a6da204
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+m4.1966f1cc47deb93b6cc0630a2b4037285eb5de4080e2152a0e54f0e842b7bee8
 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:.
 
 
@@ -87,7 +87,7 @@ cd 'diffutils-3.10'
 
 build_env_static
 autotools_config_static --disable-nls
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -134,9 +134,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -145,16 +145,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
diff --git a/variants/root-x86_64/dune b/variants/root-x86_64/dune
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+ocaml.c447190238b45a8f378d13da2fdac91f4ccc36e9c942125c890e1587ba6ec5b7
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+ocaml.e90dc3a1c334c0eed5b655a830d9a2e3e438a91ab03caff718eda6cb8293862a
 #@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.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/versions/musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
 			return 0
 			;;
 		(*)
@@ -133,9 +133,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/easyseccomp b/variants/root-x86_64/easyseccomp
@@ -1,42 +1,42 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+m4.c8d88d8aec319136135088f0afb3abd0c9d406b2e3d6e36ebbdba13c9a6da204
-#+patch.4dde0ea6c40f34670986c613217bffa1cb0adbdd46c6f1e5e3708835dbb50f41
-#+flex.2ab2d15b849d19051c26ced9a98a12cbe9f8cfeebe08aeb6738236768d62e329
-#+bison.36e0edcda0fcdd517ef56c5c44f5f49b9673d0dfd3f1f3b1ba47fd399db43437
-#+libseccomp.ca728202fc686a63811485554d7223c1644889fe4e1e5193780898dca1077dea
-#+error-standalone.5f5373b99f04556003dd53ee17d71b0ad9440217e383324565dc74649b736ada
-#+argp-standalone.9f86608edf8ea4a4952b3cbab0736e09f618b6dc9e31f5e70e9464c29310532a
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+m4.1966f1cc47deb93b6cc0630a2b4037285eb5de4080e2152a0e54f0e842b7bee8
+#+patch.37ad4ea29ff465fb5ef543bb5434445296beb16c513eeec5ae6f3e69fa1ed7f0
+#+flex.ab225b1901dff619996a02fe1050de403a024475c2b6a432707014dc28114d07
+#+bison.cdff3c99d312ecf9f6b3a714f436e71bae3733bf2355d29e4e11ffe3d50cc0be
+#+libseccomp.f881cb2aefab8a311ce9f2abb846cfe6b62b691bac9aa4873b398c3e47fafc4c
+#+error-standalone.ab3581adeb5d0ca113bbd2526503060e224b6e21f61f3f0f5887828143e2a47d
+#+argp-standalone.80de914d4d306177c3ab4f5a58208ee12d15039dbc9abb63c6ffe30062cf5c92
 #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp
 #@sha256:eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10:easyseccomp_fix_includes.patch
 #@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp
@@ -140,9 +140,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
 #@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:.
 
 
@@ -90,9 +90,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/execline b/variants/root-x86_64/execline
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+skalibs.2d0f33bac54539bd90ab0d62dc20c207d4ef7a891262780d50a9103acaada8bb
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+skalibs.f46389b8118622cea646bd3563ba4163989500f391ae34c328a193e26449f01f
 #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline
 
 
@@ -46,7 +46,7 @@ cd 'execline'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.2d0f33bac54539bd90ab0d62dc20c207d4ef7a891262780d50a9103acaada8bb/sysdeps' \
+	--with-sysdeps='/versions/skalibs.f46389b8118622cea646bd3563ba4163989500f391ae34c328a193e26449f01f/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -100,9 +100,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.fa1f93d71879f2b8fc0311ac8fc611ac295c3cadf750e324afb25af090c90207
-#+gnu-make.e6aa0a74f059daf4032edcd8c80a48bdf701895263b7ddf6b731aba1dd191388
-#+busybox.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+skalibs.9918c06d5fea4c73140602edc462eaf572a2b5d7915caf0463dce11edbc2987a
+#+musl-cross-make.a50ca83c06d31066290d6d9f8fb236667c1b2dbc376cb34377761fe9b87386a1
+#+gnu-make.e83ebb5b87ae559c2ea259d37ea642ab860acd75ac003123f100e3c71cf0f901
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+skalibs.2d5bee0bae3f8e378baf4c0f2db82f35edc9f8fcec4ef73ada0e0f830ed0cac7
 #@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.9918c06d5fea4c73140602edc462eaf572a2b5d7915caf0463dce11edbc2987a/sysdeps' \
+	--with-sysdeps='/versions/skalibs.2d5bee0bae3f8e378baf4c0f2db82f35edc9f8fcec4ef73ada0e0f830ed0cac7/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -72,9 +72,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/fileset b/variants/root-x86_64/fileset
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+zsh.b294c45b50749a1ecd8ad526a8fc0e9d75d5a98094f6b85dfe2f8524d142d995
-#+pthbs-banginstall.0808643db47f5b10d4f1afac3124074270b46fe3de033d17895315cf797eba96
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+zsh.1a9e6c9c487ff782474a7de120940351054c19445c775c808c1fdd272262c311
+#+pthbs-banginstall.218506c0794f6679abbb9343da26d20157aafedd81266f761eb2696c0a312119
 #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset
 
 
@@ -97,9 +97,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/findutils b/variants/root-x86_64/findutils
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+m4.c8d88d8aec319136135088f0afb3abd0c9d406b2e3d6e36ebbdba13c9a6da204
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+m4.1966f1cc47deb93b6cc0630a2b4037285eb5de4080e2152a0e54f0e842b7bee8
 #@untar:-J:sha256:1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5:.
 
 
@@ -87,7 +87,7 @@ cd 'findutils-4.10.0'
 
 build_env_static
 autotools_config_static --disable-nls
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -143,9 +143,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -154,16 +154,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
diff --git a/variants/root-x86_64/flex b/variants/root-x86_64/flex
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+m4.c8d88d8aec319136135088f0afb3abd0c9d406b2e3d6e36ebbdba13c9a6da204
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+m4.1966f1cc47deb93b6cc0630a2b4037285eb5de4080e2152a0e54f0e842b7bee8
 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
 
 
@@ -90,7 +90,7 @@ export LDFLAGS="--static"
 
 build_env_static
 autotools_config_static 
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -138,9 +138,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -149,16 +149,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
diff --git a/variants/root-x86_64/getconf b/variants/root-x86_64/getconf
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
 #@sha256:d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c:getconf.c
 
 
@@ -104,9 +104,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/getent b/variants/root-x86_64/getent
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
 #@sha256:002c1a216f6bed0f816ab1cfebde94a0b127193ef410c36b2190599983e015b8:getent.c
 
 
@@ -104,9 +104,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/git b/variants/root-x86_64/git
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+m4.c8d88d8aec319136135088f0afb3abd0c9d406b2e3d6e36ebbdba13c9a6da204
-#+libressl.4b4d2aedd3016e7d66bc82165af68bdbfe931bc0b4f093e4290e56b51c56a461
-#+curl.8e23920a2304d6a2499a567648a9765f7bcf485cdd2421899d231a42d33d0300
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+m4.1966f1cc47deb93b6cc0630a2b4037285eb5de4080e2152a0e54f0e842b7bee8
+#+libressl.13729215dbb743a0fb10127fac6d396c1a140dd3a53b1ed62065472e8586acd0
+#+curl.44aba2502f0311b606fa89f26132c85bce0dc9e770e4485fef25a7040046b333
 #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:.
 
 
@@ -115,9 +115,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.e6aa0a74f059daf4032edcd8c80a48bdf701895263b7ddf6b731aba1dd191388
-#+busybox.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.e83ebb5b87ae559c2ea259d37ea642ab860acd75ac003123f100e3c71cf0f901
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -58,7 +58,7 @@ cd 'make-4.4.1'
 
 build_env_static
 autotools_config_static --disable-nls
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -104,9 +104,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -115,16 +115,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
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.fa1f93d71879f2b8fc0311ac8fc611ac295c3cadf750e324afb25af090c90207
+#+musl-cross-make.a50ca83c06d31066290d6d9f8fb236667c1b2dbc376cb34377761fe9b87386a1
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -36,7 +36,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'make-4.4.1'
 
 
-mcm=/versions/musl-cross-make.fa1f93d71879f2b8fc0311ac8fc611ac295c3cadf750e324afb25af090c90207
+mcm=/versions/musl-cross-make.a50ca83c06d31066290d6d9f8fb236667c1b2dbc376cb34377761fe9b87386a1
 
 export CC="$mcm/bin/x86_64-linux-musl-gcc"
 export CXX="$mcm/bin/x86_64-linux-musl-g++"
@@ -88,9 +88,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/gperf b/variants/root-x86_64/gperf
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+m4.c8d88d8aec319136135088f0afb3abd0c9d406b2e3d6e36ebbdba13c9a6da204
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+m4.1966f1cc47deb93b6cc0630a2b4037285eb5de4080e2152a0e54f0e842b7bee8
 #@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:.
 
 
@@ -87,7 +87,7 @@ cd 'gperf-3.1'
 
 build_env_static
 autotools_config_static 
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -131,9 +131,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -142,16 +142,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
diff --git a/variants/root-x86_64/iconv b/variants/root-x86_64/iconv
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
 #@sha256:f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7:iconv.c
 
 
@@ -104,9 +104,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/kbd b/variants/root-x86_64/kbd
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+m4.c8d88d8aec319136135088f0afb3abd0c9d406b2e3d6e36ebbdba13c9a6da204
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+m4.1966f1cc47deb93b6cc0630a2b4037285eb5de4080e2152a0e54f0e842b7bee8
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:.
 
@@ -137,9 +137,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/libarchive b/variants/root-x86_64/libarchive
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+m4.c8d88d8aec319136135088f0afb3abd0c9d406b2e3d6e36ebbdba13c9a6da204
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+m4.1966f1cc47deb93b6cc0630a2b4037285eb5de4080e2152a0e54f0e842b7bee8
 #@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:.
 
 
@@ -88,7 +88,7 @@ export LDFLAGS=--static
 
 build_env_static
 autotools_config_static --without-xml2
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -136,9 +136,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -147,16 +147,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
diff --git a/variants/root-x86_64/libbsd b/variants/root-x86_64/libbsd
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+m4.c8d88d8aec319136135088f0afb3abd0c9d406b2e3d6e36ebbdba13c9a6da204
-#+libmd.0a92ac5d5aa0ed046d55853ac276053dfe3b412b15da7a40a8757867f7bc37e7
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+m4.1966f1cc47deb93b6cc0630a2b4037285eb5de4080e2152a0e54f0e842b7bee8
+#+libmd.cbfeb991e41e2072520f9f40b941ee571add626c2a5ffcc49b4485674f17839e
 #@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:.
 
 
@@ -88,7 +88,7 @@ cd 'libbsd-0.11.8'
 
 build_env_static
 autotools_config_static 
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -132,9 +132,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -143,16 +143,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
diff --git a/variants/root-x86_64/libcap b/variants/root-x86_64/libcap
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+pkgconf-pkg-config.24b2e23832afdac72a6b277a18c247082819a688fbe710ad00f462cdda2d1fe7
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+pkgconf-pkg-config.1168c4c769c5a6ca0574996fb5dee2d3fab38d2ecf1a7ba7325154dcb4c31262
 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:.
 
 
@@ -130,9 +130,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.fa1f93d71879f2b8fc0311ac8fc611ac295c3cadf750e324afb25af090c90207
-#+gnu-make.e6aa0a74f059daf4032edcd8c80a48bdf701895263b7ddf6b731aba1dd191388
-#+busybox.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
+#+musl-cross-make.a50ca83c06d31066290d6d9f8fb236667c1b2dbc376cb34377761fe9b87386a1
+#+gnu-make.e83ebb5b87ae559c2ea259d37ea642ab860acd75ac003123f100e3c71cf0f901
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:.
 
 
@@ -79,9 +79,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/libcgroup b/variants/root-x86_64/libcgroup
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+m4.c8d88d8aec319136135088f0afb3abd0c9d406b2e3d6e36ebbdba13c9a6da204
-#+flex.2ab2d15b849d19051c26ced9a98a12cbe9f8cfeebe08aeb6738236768d62e329
-#+bison.36e0edcda0fcdd517ef56c5c44f5f49b9673d0dfd3f1f3b1ba47fd399db43437
-#+musl-fts.d40cee788d9a0a7e387e78766db3c4b2e02010fb59eb2efdb124d286d22231a1
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+m4.1966f1cc47deb93b6cc0630a2b4037285eb5de4080e2152a0e54f0e842b7bee8
+#+flex.ab225b1901dff619996a02fe1050de403a024475c2b6a432707014dc28114d07
+#+bison.cdff3c99d312ecf9f6b3a714f436e71bae3733bf2355d29e4e11ffe3d50cc0be
+#+musl-fts.b7ca20985694e7b599d4e3c10707a006c1af30865b338f4472364733fe205bf7
 #@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:.
 
 
@@ -145,9 +145,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/libelf b/variants/root-x86_64/libelf
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+zstd.08a3627a300ce395fbc23d776548e23604c5d2159d06813975a025363e57252b
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+zstd.e0e066c304f8b662819708767b429ce424651b59529cc64b461d93114713c781
 #@git:288355d104ff9930520c0283fe82556c6cc5c16f:libelf
 
 
@@ -109,9 +109,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/libmd b/variants/root-x86_64/libmd
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+m4.c8d88d8aec319136135088f0afb3abd0c9d406b2e3d6e36ebbdba13c9a6da204
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+m4.1966f1cc47deb93b6cc0630a2b4037285eb5de4080e2152a0e54f0e842b7bee8
 #@untar:-J:sha256:1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332:.
 
 
@@ -87,7 +87,7 @@ cd 'libmd-1.1.0'
 
 build_env_static
 autotools_config_static 
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -132,9 +132,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -143,16 +143,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
diff --git a/variants/root-x86_64/libressl b/variants/root-x86_64/libressl
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+m4.c8d88d8aec319136135088f0afb3abd0c9d406b2e3d6e36ebbdba13c9a6da204
-#+ca-certificates-wip-donotuse.461fb484930e9566e5116f8c6748bb36b0f926c8c8720fb568b0d41eebf30ad2
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+m4.1966f1cc47deb93b6cc0630a2b4037285eb5de4080e2152a0e54f0e842b7bee8
+#+ca-certificates-wip-donotuse.88dd31017b1036079ee4d3c920396c83e7af81e908373d14d368cd6e3497f30d
 #@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.461fb484930e9566e5116f8c6748bb36b0f926c8c8720fb568b0d41eebf30ad2/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
+cp -vs '/versions/ca-certificates-wip-donotuse.88dd31017b1036079ee4d3c920396c83e7af81e908373d14d368cd6e3497f30d/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
@@ -159,9 +159,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/libseccomp b/variants/root-x86_64/libseccomp
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+m4.c8d88d8aec319136135088f0afb3abd0c9d406b2e3d6e36ebbdba13c9a6da204
-#+pkgconf-pkg-config.24b2e23832afdac72a6b277a18c247082819a688fbe710ad00f462cdda2d1fe7
-#+gperf.e8b0c32e32a885300f820746aea89e6b5237f976aa8ada0382345c85a97a5345
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+m4.1966f1cc47deb93b6cc0630a2b4037285eb5de4080e2152a0e54f0e842b7bee8
+#+pkgconf-pkg-config.1168c4c769c5a6ca0574996fb5dee2d3fab38d2ecf1a7ba7325154dcb4c31262
+#+gperf.7b169f39ea4c07075904d6c7fbb788b57d82c7e8c6d7f7c4be583687d6d2af1d
 #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:.
 
 
@@ -91,7 +91,7 @@ export LDFLAGS="--static"
 
 build_env_static
 autotools_config_static 
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -137,9 +137,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -148,16 +148,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
diff --git a/variants/root-x86_64/libunwind b/variants/root-x86_64/libunwind
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+m4.c8d88d8aec319136135088f0afb3abd0c9d406b2e3d6e36ebbdba13c9a6da204
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+m4.1966f1cc47deb93b6cc0630a2b4037285eb5de4080e2152a0e54f0e842b7bee8
 #@untar:-z:sha256:ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157:.
 
 
@@ -92,7 +92,7 @@ autotools_config_static --enable-cxx-exceptions \
 	--enable-setjmp \
 	--enable-zlib
 
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -137,9 +137,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -148,16 +148,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-modutils.8a367b5a367887504245a84927f064a7009ff88e92ddab28fdd93cb2dd5175a3
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+findutils.dd67659c86ce76a4f29291cab9de3122f814a7ff0b9e33c92e804583558276a2
-#+diffutils.33bd942cf2beccc8bb0cb15c8bfb81de161fe69f1e2a518d9d2a0cd05f9fe9ca
-#+patch.4dde0ea6c40f34670986c613217bffa1cb0adbdd46c6f1e5e3708835dbb50f41
-#+flex.2ab2d15b849d19051c26ced9a98a12cbe9f8cfeebe08aeb6738236768d62e329
-#+bison.36e0edcda0fcdd517ef56c5c44f5f49b9673d0dfd3f1f3b1ba47fd399db43437
-#+rsync.6478ab3db3fe93941ea78fb499e91111393aea9b483c0b21dcceb8c23bfe6da8
-#+zstd.08a3627a300ce395fbc23d776548e23604c5d2159d06813975a025363e57252b
-#+libelf.ea49d4c3913827726226d628ea708752bd6b9aff7e5d79077ced76863530f647
-#+pkgconf-pkg-config.24b2e23832afdac72a6b277a18c247082819a688fbe710ad00f462cdda2d1fe7
-#+nawk.381177d4e8e6dcb810de62cbc90a14089506be188e708b48036269ac4214995a
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-modutils.d980c823615920904694f8c945834a478d6304e7baf5807279740e991d710803
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+findutils.fd67178086fa5852591f7c9c0d407d57d59f52fcb5856644da5141a398331422
+#+diffutils.f595d46864dea091a112d3ea082ea1d930885e4bfa4298a6c66ce176115df8f7
+#+patch.37ad4ea29ff465fb5ef543bb5434445296beb16c513eeec5ae6f3e69fa1ed7f0
+#+flex.ab225b1901dff619996a02fe1050de403a024475c2b6a432707014dc28114d07
+#+bison.cdff3c99d312ecf9f6b3a714f436e71bae3733bf2355d29e4e11ffe3d50cc0be
+#+rsync.0cb8aadcd0ce6112d97ff4791e1ca60fec23b2f9cfba07f58d3ea1f7b8265660
+#+zstd.e0e066c304f8b662819708767b429ce424651b59529cc64b461d93114713c781
+#+libelf.fa1ddf7f86ff1ead46b500eb8b0de0a67d390eecaac4440c3532f1b3a6d827c5
+#+pkgconf-pkg-config.1168c4c769c5a6ca0574996fb5dee2d3fab38d2ecf1a7ba7325154dcb4c31262
+#+nawk.c2c2f30264808844207b675b7651711207891f09daff4fb1f022b305a2003d52
 #@untar:-J:sha256:7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764:.
 #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config
 #@sha256:ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417:noobjtool.patch
@@ -133,9 +133,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.fa1f93d71879f2b8fc0311ac8fc611ac295c3cadf750e324afb25af090c90207
-#+gnu-make.e6aa0a74f059daf4032edcd8c80a48bdf701895263b7ddf6b731aba1dd191388
-#+busybox.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+skalibs.9918c06d5fea4c73140602edc462eaf572a2b5d7915caf0463dce11edbc2987a
-#+execline.57eeaf241fccaf36bf325700774a5325858ad0252b56674593bcbbbc16cf924a
-#+libcap.14b1b4ce2e91e2f819f5b7c507dfe843658e0b4a0959c39d0dfc5f44b2e576ab
+#+musl-cross-make.a50ca83c06d31066290d6d9f8fb236667c1b2dbc376cb34377761fe9b87386a1
+#+gnu-make.e83ebb5b87ae559c2ea259d37ea642ab860acd75ac003123f100e3c71cf0f901
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+skalibs.2d5bee0bae3f8e378baf4c0f2db82f35edc9f8fcec4ef73ada0e0f830ed0cac7
+#+execline.75c97cf57ace71efcb6aa51e0b3f53b3eacffbcf859faa366c695b2c7e1feda4
+#+libcap.be24f17de1c2e98a433e4539c25d5582656c989b2b782cdfe2f33e045bb57606
 #@git:7fbfb934cdaa187a063a4df41498c06c46d4a6a9:lnstools
 
 
@@ -71,9 +71,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/logincaps b/variants/root-x86_64/logincaps
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+zsh.b294c45b50749a1ecd8ad526a8fc0e9d75d5a98094f6b85dfe2f8524d142d995
-#+pthbs-banginstall.0808643db47f5b10d4f1afac3124074270b46fe3de033d17895315cf797eba96
-#+execline.a3e0cdff27257fed7b694dd55a62923d9444badaee9c28ea51bd89fbdf8ab14e
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+ccx-utils.a141cc1b0f0cac0ca9773954a20c2f08c239404d3688720849461e459e7287ce
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+zsh.1a9e6c9c487ff782474a7de120940351054c19445c775c808c1fdd272262c311
+#+pthbs-banginstall.218506c0794f6679abbb9343da26d20157aafedd81266f761eb2696c0a312119
+#+execline.d50f3f7a78cfe50b3526c9a877d90f5dd0af60372d717cb6a5e343415e95f50b
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+ccx-utils.fcf5e926df3e6c3b16f595c2f20c7ac57820eeb59a24f32772ded13f8b779884
 #@git:409db79b3e7e5fc6b73305471d9bbb6ac5c14036:logincaps
 
 
@@ -132,9 +132,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
 
 
@@ -86,7 +86,7 @@ cd 'm4-1.4.19'
 
 build_env_static
 autotools_config_static --disable-nls
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -131,9 +131,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -142,16 +142,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
diff --git a/variants/root-x86_64/mandoc b/variants/root-x86_64/mandoc
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
 #@untar:-z:sha256:8bf0d570f01e70a6e124884088870cbed7537f36328d512909eb10cd53179d9c:.
 
 
@@ -124,9 +124,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+zsh.b294c45b50749a1ecd8ad526a8fc0e9d75d5a98094f6b85dfe2f8524d142d995
-#+pthbs-banginstall.0808643db47f5b10d4f1afac3124074270b46fe3de033d17895315cf797eba96
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+zsh.1a9e6c9c487ff782474a7de120940351054c19445c775c808c1fdd272262c311
+#+pthbs-banginstall.218506c0794f6679abbb9343da26d20157aafedd81266f761eb2696c0a312119
 #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts
 
 
@@ -79,9 +79,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/mdevd b/variants/root-x86_64/mdevd
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+skalibs.2d0f33bac54539bd90ab0d62dc20c207d4ef7a891262780d50a9103acaada8bb
-#+execline.a3e0cdff27257fed7b694dd55a62923d9444badaee9c28ea51bd89fbdf8ab14e
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+skalibs.f46389b8118622cea646bd3563ba4163989500f391ae34c328a193e26449f01f
+#+execline.d50f3f7a78cfe50b3526c9a877d90f5dd0af60372d717cb6a5e343415e95f50b
 #@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd
 
 
@@ -47,7 +47,7 @@ cd 'mdevd'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.2d0f33bac54539bd90ab0d62dc20c207d4ef7a891262780d50a9103acaada8bb/sysdeps' \
+	--with-sysdeps='/versions/skalibs.f46389b8118622cea646bd3563ba4163989500f391ae34c328a193e26449f01f/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -93,9 +93,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-dosfstools.b48202c09e25c912ad9c0e6461426e13c076e17b8819cba04d94c1e0721cfe67
-#+busybox-e2fsprogs.aaa3d31e9508708a9c49cd8b4bdb2d312fbedbe4e637f5284c93529702e67ff7
-#+busybox-iproute2.2f457ae49d7fd09d73bbbe5f37410fe82838855fed370ada83336a3e0d4ba19f
-#+busybox-iputils.37c34276542472b7414ceda0430992cc82521f56287295e4c56adb5adc1283a0
-#+busybox-net-misc.bbec677ce1c792fd705e346d6068169cec83d5ef9d025f83fe55a4a2ed75409d
-#+busybox-net-tools.7eadf6e434c14fc58acc02ff5388c5c830300e3030e4e8d0c542b61dd6a4d558
-#+busybox-traceroute.af17725cacaf936501f8f81330d820d725747063f279da83beb3e089d8936839
-#+busybox-wget.26fe7474987360fa5b6029ae0f68ac0f490d94e819872dbfead31189f39fdc6b
-#+busybox-chpst.230a660161659f948ca118624c66549ff55b0ad9c14a925cce6e0a038d40d051
-#+busybox-console.b5eed7352bc618210b3892186a0522c7319183dd5019d461c56cf0e170d9f74c
-#+busybox-getty.51fe8c57e3f49aa8cd5407f09d9ebd147ceede2a22dc062dee7accb1f96178b9
-#+busybox-i2c-tools.1c950c8ee55f1b1fc674d36d2564c70d9499de2e5d0e97031abca88dbf0b137b
-#+busybox-linux-extra.79cba3a2838615a5f28316df027ae3179c84fa97e4317ca080da4204fd400fb3
-#+busybox-mtd-utils.f6ab67f21f65aaa1534a6182164f3374823f7b06e9d6d75935c94c2a56e7c9f0
-#+busybox-shadow.a739aa09ea823c8bfb929f991859b5100dac9dc0e7f922c4479d93e1daa69ce1
-#+busybox-su.3bbbfb7cde5c6ee87932d469da407d14e144cb5838ee58146792e89941feefb4
-#+busybox-util-linux-priv.a28f7271def8401a284a115b91d586fa04509a75b1ffefc9cb73782f743d8d7d
-#+busybox-logging.0ebad270645a8c4b8af8f585d6905cab1f421ff190377eb96ea173b8dacd66bc
-#+busybox-cron.06c301490cf07c74523559c9343f81c4f9c1bbf851a363a1d6996691f67abd10
-#+execline.a3e0cdff27257fed7b694dd55a62923d9444badaee9c28ea51bd89fbdf8ab14e
-#+s6.05eda2316ff21294e6954477f46acbf2d024b362e2ee66611babba7bab02040d
-#+mdev-scripts.a6b648cd6d7951e0fbcab237929e3ea747233c7a0797f0d59e8214129824d26e
-#+mdevd.ae4edcfd1645b1877245058ea879dc863b4f323235a72c195906ec82d8fa74f5
-#+busybox-modutils.8a367b5a367887504245a84927f064a7009ff88e92ddab28fdd93cb2dd5175a3-
\ No newline at end of file
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-dosfstools.1aeaa58c3e33924fdb102d5c5ee7221e77f3046b7127f699891bbfbf2304430f
+#+busybox-e2fsprogs.9bc73c56f0e71795ecce4e67f3e0ed1bba064b90bd05449f725239f6c64a9d73
+#+busybox-iproute2.94cb4fb51f4e8a0d2459c02674d17470c783e554087ff8201badaff7b269c914
+#+busybox-iputils.af614e89c894e03924f1c90cf494b8379f9cba70a43d50c1413ab5d85d7e7e11
+#+busybox-net-misc.32acaca88c420a42a7b166f0118aabb51eeb104c08bfd7aa4a63f4a1ac471d90
+#+busybox-net-tools.51bcca55b4cd2941485aa75332689d0b8445ba8701a61cb4e42a56705972d2f3
+#+busybox-traceroute.5257a4b38f73e06d7f7fd9d585ebfbcfca618b2d350708bae6da88db153d915f
+#+busybox-wget.1828a78d247b814352c0a62d0d363fbad588dcef4cd920d35734d41043612277
+#+busybox-chpst.c447fefcd27efbb192d8f3693738b3fa74a2d88da8d9351878d98e52971b5dbb
+#+busybox-console.819f0a43134343586b4831db94dcb6fe8a56b55ca9d5158e788a7d283b7cc55c
+#+busybox-getty.0590f1111800572ba4aa73d33a50585cbbfcd54f5269f2914df0fa2bc1853c57
+#+busybox-i2c-tools.8a7357848cfbc85eba31df4016bd961ed44f8b53101ddcaed371893b5688287e
+#+busybox-linux-extra.5e6dfc5168b8d7a12c1094870e2f72e89dd8508238f3c8f7319bf320d81a6ecf
+#+busybox-mtd-utils.88894a8c9ffbda9751b648fad9d79ef96741f022c748bd3ece9a612db6309f80
+#+busybox-shadow.af645c989b36c12549f4766647014ff09472421ca0a469c1a0f7acfb402ca42c
+#+busybox-su.f808244ad4eb9e8ba65ef85254ce68a2bdd371de9f713697e20f5d2907ead0f2
+#+busybox-util-linux-priv.ba141805065abf2a502b70e7ce955c5165b8725f1a204277b457e238ed24475d
+#+busybox-logging.2fa3102e85347e07f10eb8ac9ca21c478f39f4ea255a4d7ac1ca26016e0da648
+#+busybox-cron.f81b3b6a65ff08e200829e5a2117edef6b38e8ed25f8517ce148a4dbd2ce9696
+#+execline.d50f3f7a78cfe50b3526c9a877d90f5dd0af60372d717cb6a5e343415e95f50b
+#+s6.1ad0b529f4324fda577d196c6994cb0dc32ed7d92f7ba50e1395cdc2374a450a
+#+mdev-scripts.ed05e92c5536c587908165439e1f56b868eb02c41029707ed765812725ca339d
+#+mdevd.89466f2d76dc425aa481ab91d73cd10b5c4c68ece63c90627b75e82bad11ac6c
+#+busybox-modutils.d980c823615920904694f8c945834a478d6304e7baf5807279740e991d710803+
\ 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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
 #@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog
 
 
@@ -106,9 +106,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.fa1f93d71879f2b8fc0311ac8fc611ac295c3cadf750e324afb25af090c90207
-#+gnu-make.e6aa0a74f059daf4032edcd8c80a48bdf701895263b7ddf6b731aba1dd191388
-#+busybox.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
+#+musl-cross-make.a50ca83c06d31066290d6d9f8fb236667c1b2dbc376cb34377761fe9b87386a1
+#+gnu-make.e83ebb5b87ae559c2ea259d37ea642ab860acd75ac003123f100e3c71cf0f901
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
 #@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
@@ -141,9 +141,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/musl-cross-make:bootstrap-0 b/variants/root-x86_64/musl-cross-make:bootstrap-0
@@ -92,9 +92,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.c326926573612c0c7fde2fd6d35f3a1ca41176e5f666616c1ea1d264da992117
+#+musl-cross-make.d3343d72a8f32f0fb5df1f5fd9784a8567baa5c2e1701c70692b84d45a758658
 #@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.c326926573612c0c7fde2fd6d35f3a1ca41176e5f666616c1ea1d264da992117
+bootstrap=/versions/musl-cross-make.d3343d72a8f32f0fb5df1f5fd9784a8567baa5c2e1701c70692b84d45a758658
 "$bootstrap/bin/x86_64-linux-musl-gcc" --version
 
 cat >musl-cross-make/config.mak <<EOF
@@ -101,9 +101,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
 #@untar:-z:sha256:49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6:.
 
 
@@ -103,9 +103,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/nawk b/variants/root-x86_64/nawk
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+bison.36e0edcda0fcdd517ef56c5c44f5f49b9673d0dfd3f1f3b1ba47fd399db43437
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+bison.cdff3c99d312ecf9f6b3a714f436e71bae3733bf2355d29e4e11ffe3d50cc0be
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
 #@untar:-z:sha256:e031b1e1d2b230f276f975bffb923f0ea15f798c839d15a3f26a1a39448e32d7:.
 
 
@@ -82,9 +82,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
 #@git:51d179dad861640caeb76674b5908ccd79f04fae:netbsd-curses
 
 
@@ -95,9 +95,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+ocaml.c447190238b45a8f378d13da2fdac91f4ccc36e9c942125c890e1587ba6ec5b7
-#+ocaml-findlib.1a942df6f23e209c84ccd0715b5ff01ec200bacd2cf378e104952c1f9388c32e
-#+ocamlbuild.9ae78586c1c207a8eae296e4e22160e930bcbdb6324659b823cf72372f1d14c4
-#+opam.0c66099421a5068670bf29b69be38796dcb0ccfc233e35cdc6f561507a1cda18
-#+ocaml-topkg.dcbe416f117014d935e8897cfc9f9efa814320cf80959922fc174922d2bb49d1
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+ocaml.e90dc3a1c334c0eed5b655a830d9a2e3e438a91ab03caff718eda6cb8293862a
+#+ocaml-findlib.88b45c1d78c2d16c1e7aeb4320373c8c9d090e48f38b93e8d6384388c22fa43a
+#+ocamlbuild.1c3adafd11ef163827a2a00b8f414b9b607688f56e5bb6aaf6d2f154f0cda4e5
+#+opam.c5331efc7d37c171daade52cf469525d256c437a232d25ba2c034d4cba1ab45a
+#+ocaml-topkg.ea7d43bcac3c5593643edc7709228173535b58ea83bf43424609ed4bc681b518
 #@untar:-j:sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa:.
 
 
@@ -99,9 +99,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+ocaml.c447190238b45a8f378d13da2fdac91f4ccc36e9c942125c890e1587ba6ec5b7
-#+dune.abd2703180a464d294f90e2aaddae46547a507f267f8a4f4d2810ea1346fbcb1
-#+ocaml_intrinsics_kernel.2bcd8d5711e722a0911dac45fadaeb2d5a278b2785169c67479b6252148e5c25
-#+ocaml-sexplib0.352c7cb1cfbf51ff9d342fdf7286a3a03ac890f885b3a890641a5249a255f288
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+ocaml.e90dc3a1c334c0eed5b655a830d9a2e3e438a91ab03caff718eda6cb8293862a
+#+dune.0c9a26d1c49b3e5b855f5616d983aa2fd7279152203a04670971cbbb1c13aec3
+#+ocaml_intrinsics_kernel.0bc65611d285f1bda7f0679d4af37aba1ed286f30ae3d52429bf154c32923e57
+#+ocaml-sexplib0.e3cec3571f1416df5f088f3b93bd28d6ef3f5f2c1985bb9a7e0a0220849ac68f
 #@untar:-z:sha256:3f3f64789ab25bb5cb7f5f907dd651dec9cc9440981822fe75df6b94344b7208:.
 
 
@@ -106,9 +106,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+ocaml.c447190238b45a8f378d13da2fdac91f4ccc36e9c942125c890e1587ba6ec5b7
-#+ocaml-findlib.1a942df6f23e209c84ccd0715b5ff01ec200bacd2cf378e104952c1f9388c32e
-#+ocamlbuild.9ae78586c1c207a8eae296e4e22160e930bcbdb6324659b823cf72372f1d14c4
-#+opam.0c66099421a5068670bf29b69be38796dcb0ccfc233e35cdc6f561507a1cda18
-#+ocaml-topkg.dcbe416f117014d935e8897cfc9f9efa814320cf80959922fc174922d2bb49d1
-#+ocaml-astring.45b15cd2e1ecee5f041e686631fef4fdac546bc82116ebd3816a87bf66a96f29
-#+ocaml-fpath.e45924ef7e922fa81fa19a44081882dcc67154c2bb9179d044399cbd907d89b0
-#+ocaml-rresult.f64961c6308e878d58497c1930cfcb11dfe11689916e14ede6d7909e14a46564
-#+ocaml-fmt.72fce201b82904b86adbcae12cb8980745829d8eb68634417d746337ecef8371
-#+ocaml-logs.7b226aaef40b481f623b336c26675f5a94d8758ba28a85653457b6cd900fef4d
-#+ocaml-mtime.b7a0325ca25456c0cadb0d827c6ebc2de38477e94c1dda76f7b7c6a906e2c557
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+ocaml.e90dc3a1c334c0eed5b655a830d9a2e3e438a91ab03caff718eda6cb8293862a
+#+ocaml-findlib.88b45c1d78c2d16c1e7aeb4320373c8c9d090e48f38b93e8d6384388c22fa43a
+#+ocamlbuild.1c3adafd11ef163827a2a00b8f414b9b607688f56e5bb6aaf6d2f154f0cda4e5
+#+opam.c5331efc7d37c171daade52cf469525d256c437a232d25ba2c034d4cba1ab45a
+#+ocaml-topkg.ea7d43bcac3c5593643edc7709228173535b58ea83bf43424609ed4bc681b518
+#+ocaml-astring.38348aacd53e45cffade27fe29c320ac03aefc44ab265eab5d04270f25018497
+#+ocaml-fpath.f99fbbf9e20f21dae8edf43e5d77c0fbf5b665a715466b5decb961082a6df15e
+#+ocaml-rresult.f9850493f8c94b1324cbde73d2f82325354b940f8e655164744f1fc572a7f9e4
+#+ocaml-fmt.6adee388cb9a47a3f6ade41092e4c16aebb792a9a4c2c0d20cd47a9750abd18b
+#+ocaml-logs.68d845de4de271e2883b4f800f994fb3d6d3d6901d1bee0d8d5ebdf95223c6c5
+#+ocaml-mtime.f00fc2d7fab44456b164aafcdf24d36512614fae2e39b45ae41743b8d215cf92
 #@untar:-j:sha256:d8d62e786b10d697e0457205a8eedeaa27ebcc90f1855f18df190cac2e3d8f37:.
 
 
@@ -105,9 +105,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+ocaml.c447190238b45a8f378d13da2fdac91f4ccc36e9c942125c890e1587ba6ec5b7
-#+ocaml-findlib.1a942df6f23e209c84ccd0715b5ff01ec200bacd2cf378e104952c1f9388c32e
-#+ocamlbuild.9ae78586c1c207a8eae296e4e22160e930bcbdb6324659b823cf72372f1d14c4
-#+opam.0c66099421a5068670bf29b69be38796dcb0ccfc233e35cdc6f561507a1cda18
-#+ocaml-topkg.dcbe416f117014d935e8897cfc9f9efa814320cf80959922fc174922d2bb49d1
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+ocaml.e90dc3a1c334c0eed5b655a830d9a2e3e438a91ab03caff718eda6cb8293862a
+#+ocaml-findlib.88b45c1d78c2d16c1e7aeb4320373c8c9d090e48f38b93e8d6384388c22fa43a
+#+ocamlbuild.1c3adafd11ef163827a2a00b8f414b9b607688f56e5bb6aaf6d2f154f0cda4e5
+#+opam.c5331efc7d37c171daade52cf469525d256c437a232d25ba2c034d4cba1ab45a
+#+ocaml-topkg.ea7d43bcac3c5593643edc7709228173535b58ea83bf43424609ed4bc681b518
 #@untar:-j:sha256:4e547a631c36fbaadff60d3bd7724eb3f83ba274e92fb725950bae7868378582:.
 
 
@@ -99,9 +99,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+ocaml.c447190238b45a8f378d13da2fdac91f4ccc36e9c942125c890e1587ba6ec5b7
-#+dune.abd2703180a464d294f90e2aaddae46547a507f267f8a4f4d2810ea1346fbcb1
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+ocaml.e90dc3a1c334c0eed5b655a830d9a2e3e438a91ab03caff718eda6cb8293862a
+#+dune.0c9a26d1c49b3e5b855f5616d983aa2fd7279152203a04670971cbbb1c13aec3
 #@untar:-z:sha256:9b9644d7351db699e57ddba7c767bb4153e6e988ccf45ead2fb238a3bd75cdc7:.
 
 
@@ -102,9 +102,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+ocaml.c447190238b45a8f378d13da2fdac91f4ccc36e9c942125c890e1587ba6ec5b7
-#+dune.abd2703180a464d294f90e2aaddae46547a507f267f8a4f4d2810ea1346fbcb1
-#+ocamlbuild.9ae78586c1c207a8eae296e4e22160e930bcbdb6324659b823cf72372f1d14c4
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+ocaml.e90dc3a1c334c0eed5b655a830d9a2e3e438a91ab03caff718eda6cb8293862a
+#+dune.0c9a26d1c49b3e5b855f5616d983aa2fd7279152203a04670971cbbb1c13aec3
+#+ocamlbuild.1c3adafd11ef163827a2a00b8f414b9b607688f56e5bb6aaf6d2f154f0cda4e5
 #@untar:-z:sha256:6e62a8ee0217c9cc38d5860110eb18eb8d89c05c420353d298e1431fe8bac00f:.
 
 
@@ -107,9 +107,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+m4.c8d88d8aec319136135088f0afb3abd0c9d406b2e3d6e36ebbdba13c9a6da204
-#+netbsd-curses.300413b0c98aa121e0381e1cb84258e15d265efafd955cbf8c60b596d71c6c15
-#+ocaml.c447190238b45a8f378d13da2fdac91f4ccc36e9c942125c890e1587ba6ec5b7
-#+ocamlbuild.9ae78586c1c207a8eae296e4e22160e930bcbdb6324659b823cf72372f1d14c4
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+m4.1966f1cc47deb93b6cc0630a2b4037285eb5de4080e2152a0e54f0e842b7bee8
+#+netbsd-curses.0040aba8c500abe730a1210dd4bd5d531129063562d3d85e354e34853322f48d
+#+ocaml.e90dc3a1c334c0eed5b655a830d9a2e3e438a91ab03caff718eda6cb8293862a
+#+ocamlbuild.1c3adafd11ef163827a2a00b8f414b9b607688f56e5bb6aaf6d2f154f0cda4e5
 #@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.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/versions/musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b/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.c447190238b45a8f378d13da2fdac91f4ccc36e9c942125c890e1587ba6ec5b7"
+stdlib="$pthbs_destdir/versions/ocaml.e90dc3a1c334c0eed5b655a830d9a2e3e438a91ab03caff718eda6cb8293862a"
 mkdir -p "${stdlib%/*}"
 ln -s "$pthbs_package" "$stdlib"
 make install prefix="$pthbs_destdir"
@@ -136,9 +136,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+ocaml.c447190238b45a8f378d13da2fdac91f4ccc36e9c942125c890e1587ba6ec5b7
-#+ocaml-findlib.1a942df6f23e209c84ccd0715b5ff01ec200bacd2cf378e104952c1f9388c32e
-#+ocamlbuild.9ae78586c1c207a8eae296e4e22160e930bcbdb6324659b823cf72372f1d14c4
-#+opam.0c66099421a5068670bf29b69be38796dcb0ccfc233e35cdc6f561507a1cda18
-#+ocaml-topkg.dcbe416f117014d935e8897cfc9f9efa814320cf80959922fc174922d2bb49d1
-#+ocaml-cmdliner.01e2f9366ca4625a412240755f4c8aadb6087fdb45b6ff4eecede9b0073a8c9a
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+ocaml.e90dc3a1c334c0eed5b655a830d9a2e3e438a91ab03caff718eda6cb8293862a
+#+ocaml-findlib.88b45c1d78c2d16c1e7aeb4320373c8c9d090e48f38b93e8d6384388c22fa43a
+#+ocamlbuild.1c3adafd11ef163827a2a00b8f414b9b607688f56e5bb6aaf6d2f154f0cda4e5
+#+opam.c5331efc7d37c171daade52cf469525d256c437a232d25ba2c034d4cba1ab45a
+#+ocaml-topkg.ea7d43bcac3c5593643edc7709228173535b58ea83bf43424609ed4bc681b518
+#+ocaml-cmdliner.d145b0ae60f8a8cf03b5f781a771ab42bbc950a61e78b8d99acfe925cfc94fe1
 #@untar:-j:sha256:857cfd47a54b52429cd9b3e2665e44173cd1bd3b435bece7172f984ad5376a1b:.
 
 
@@ -100,9 +100,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+ocaml.c447190238b45a8f378d13da2fdac91f4ccc36e9c942125c890e1587ba6ec5b7
-#+ocaml-findlib.1a942df6f23e209c84ccd0715b5ff01ec200bacd2cf378e104952c1f9388c32e
-#+ocamlbuild.9ae78586c1c207a8eae296e4e22160e930bcbdb6324659b823cf72372f1d14c4
-#+opam.0c66099421a5068670bf29b69be38796dcb0ccfc233e35cdc6f561507a1cda18
-#+ocaml-topkg.dcbe416f117014d935e8897cfc9f9efa814320cf80959922fc174922d2bb49d1
-#+ocaml-astring.45b15cd2e1ecee5f041e686631fef4fdac546bc82116ebd3816a87bf66a96f29
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+ocaml.e90dc3a1c334c0eed5b655a830d9a2e3e438a91ab03caff718eda6cb8293862a
+#+ocaml-findlib.88b45c1d78c2d16c1e7aeb4320373c8c9d090e48f38b93e8d6384388c22fa43a
+#+ocamlbuild.1c3adafd11ef163827a2a00b8f414b9b607688f56e5bb6aaf6d2f154f0cda4e5
+#+opam.c5331efc7d37c171daade52cf469525d256c437a232d25ba2c034d4cba1ab45a
+#+ocaml-topkg.ea7d43bcac3c5593643edc7709228173535b58ea83bf43424609ed4bc681b518
+#+ocaml-astring.38348aacd53e45cffade27fe29c320ac03aefc44ab265eab5d04270f25018497
 #@untar:-j:sha256:12b08ff192d037d9b6d69e9ca19d1d385184f20b3237c27231e437ac81ace70f:.
 
 
@@ -100,9 +100,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+ocaml.c447190238b45a8f378d13da2fdac91f4ccc36e9c942125c890e1587ba6ec5b7
-#+ocaml-findlib.1a942df6f23e209c84ccd0715b5ff01ec200bacd2cf378e104952c1f9388c32e
-#+ocamlbuild.9ae78586c1c207a8eae296e4e22160e930bcbdb6324659b823cf72372f1d14c4
-#+opam.0c66099421a5068670bf29b69be38796dcb0ccfc233e35cdc6f561507a1cda18
-#+ocaml-topkg.dcbe416f117014d935e8897cfc9f9efa814320cf80959922fc174922d2bb49d1
-#+ocaml-mtime.b7a0325ca25456c0cadb0d827c6ebc2de38477e94c1dda76f7b7c6a906e2c557
-#+ocaml-cmdliner.01e2f9366ca4625a412240755f4c8aadb6087fdb45b6ff4eecede9b0073a8c9a
-#+ocaml-fmt.72fce201b82904b86adbcae12cb8980745829d8eb68634417d746337ecef8371
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+ocaml.e90dc3a1c334c0eed5b655a830d9a2e3e438a91ab03caff718eda6cb8293862a
+#+ocaml-findlib.88b45c1d78c2d16c1e7aeb4320373c8c9d090e48f38b93e8d6384388c22fa43a
+#+ocamlbuild.1c3adafd11ef163827a2a00b8f414b9b607688f56e5bb6aaf6d2f154f0cda4e5
+#+opam.c5331efc7d37c171daade52cf469525d256c437a232d25ba2c034d4cba1ab45a
+#+ocaml-topkg.ea7d43bcac3c5593643edc7709228173535b58ea83bf43424609ed4bc681b518
+#+ocaml-mtime.f00fc2d7fab44456b164aafcdf24d36512614fae2e39b45ae41743b8d215cf92
+#+ocaml-cmdliner.d145b0ae60f8a8cf03b5f781a771ab42bbc950a61e78b8d99acfe925cfc94fe1
+#+ocaml-fmt.6adee388cb9a47a3f6ade41092e4c16aebb792a9a4c2c0d20cd47a9750abd18b
 #@untar:-j:sha256:ee97065ba41ce28f19dea9453c6bec4e0ef26165ad7394c4131ea0c65c0f06d5:.
 
 
@@ -107,9 +107,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+ocaml.c447190238b45a8f378d13da2fdac91f4ccc36e9c942125c890e1587ba6ec5b7
-#+dune.abd2703180a464d294f90e2aaddae46547a507f267f8a4f4d2810ea1346fbcb1
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+ocaml.e90dc3a1c334c0eed5b655a830d9a2e3e438a91ab03caff718eda6cb8293862a
+#+dune.0c9a26d1c49b3e5b855f5616d983aa2fd7279152203a04670971cbbb1c13aec3
 #@untar:-j:sha256:cca8badff83b470fdcfb1840116f8e8a6f2cb86cde2f44ed28cf26cbf692a793:.
 
 
@@ -105,9 +105,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+ocaml.c447190238b45a8f378d13da2fdac91f4ccc36e9c942125c890e1587ba6ec5b7
-#+ocaml-findlib.1a942df6f23e209c84ccd0715b5ff01ec200bacd2cf378e104952c1f9388c32e
-#+ocamlbuild.9ae78586c1c207a8eae296e4e22160e930bcbdb6324659b823cf72372f1d14c4
-#+opam.0c66099421a5068670bf29b69be38796dcb0ccfc233e35cdc6f561507a1cda18
-#+ocaml-topkg.dcbe416f117014d935e8897cfc9f9efa814320cf80959922fc174922d2bb49d1
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+ocaml.e90dc3a1c334c0eed5b655a830d9a2e3e438a91ab03caff718eda6cb8293862a
+#+ocaml-findlib.88b45c1d78c2d16c1e7aeb4320373c8c9d090e48f38b93e8d6384388c22fa43a
+#+ocamlbuild.1c3adafd11ef163827a2a00b8f414b9b607688f56e5bb6aaf6d2f154f0cda4e5
+#+opam.c5331efc7d37c171daade52cf469525d256c437a232d25ba2c034d4cba1ab45a
+#+ocaml-topkg.ea7d43bcac3c5593643edc7709228173535b58ea83bf43424609ed4bc681b518
 #@untar:-j:sha256:097cb2802e3701ead9572e1b483d5a28c6e2f0a39449faaf9b44ad8a89834d88:.
 
 
@@ -99,9 +99,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+ocaml.c447190238b45a8f378d13da2fdac91f4ccc36e9c942125c890e1587ba6ec5b7
-#+dune.abd2703180a464d294f90e2aaddae46547a507f267f8a4f4d2810ea1346fbcb1
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+ocaml.e90dc3a1c334c0eed5b655a830d9a2e3e438a91ab03caff718eda6cb8293862a
+#+dune.0c9a26d1c49b3e5b855f5616d983aa2fd7279152203a04670971cbbb1c13aec3
 #@untar:-z:sha256:b6595ee187dea792b31fc54a0e1524ab1e48bc6068d3066c45215a138cc73b95:.
 
 
@@ -107,9 +107,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+ocaml.c447190238b45a8f378d13da2fdac91f4ccc36e9c942125c890e1587ba6ec5b7
-#+dune.abd2703180a464d294f90e2aaddae46547a507f267f8a4f4d2810ea1346fbcb1
-#+ocaml-compiler-libs.54e4b4a4ec84aa27d1fa7cbd415053a141daedcda25247e9f8f224eff71b0851
-#+ocaml-cppo.a8e491f38dd606a64b138eac5338d1cb9c0d7eadee5d7f0780e9d1924a84e2f7
-#+ocaml-findlib.1a942df6f23e209c84ccd0715b5ff01ec200bacd2cf378e104952c1f9388c32e
-#+ocaml-ppx_derivers.cd9a3527c433d0eaa5d879a5e8d7b25b9f7ff688e6101e7972b131499afb5b34
-#+ocaml-ppxlib.d593d716f4bac675b7d4a40eda78974fcf1f71432cb5bdb24e4070afa9719e03
-#+ocaml-sexplib0.352c7cb1cfbf51ff9d342fdf7286a3a03ac890f885b3a890641a5249a255f288
-#+ocaml-stdlib-shims.c79c8a4109b723f058cf9aa95b1959a13e3cbccbbbf4c43ead089ec7bfab058b
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+ocaml.e90dc3a1c334c0eed5b655a830d9a2e3e438a91ab03caff718eda6cb8293862a
+#+dune.0c9a26d1c49b3e5b855f5616d983aa2fd7279152203a04670971cbbb1c13aec3
+#+ocaml-compiler-libs.7f4089b44ad51c5eede9a77d5aef9d8f4013567544f0ad4310b7a3745f2b30f9
+#+ocaml-cppo.7674c8156d2e88ef01586890c972b64662a790f34e991d7431359e58deecd714
+#+ocaml-findlib.88b45c1d78c2d16c1e7aeb4320373c8c9d090e48f38b93e8d6384388c22fa43a
+#+ocaml-ppx_derivers.dd7c4994cc3814b2f370a3f7fb4792b16d088b84a09f5e489e025a214f3d5198
+#+ocaml-ppxlib.ab7f209d218ba3ee9ade3c8cef77dc5a7dfe043f7d2744f5356d4add23afef5e
+#+ocaml-sexplib0.e3cec3571f1416df5f088f3b93bd28d6ef3f5f2c1985bb9a7e0a0220849ac68f
+#+ocaml-stdlib-shims.f7bf9e59a7520ec85040f32c4316ef5bfd1a71cda657c863af924c460615dc70
 #@untar:-z:sha256:c91d1ea5e15e6928a2f8947dbd135b9f765cc0e2d72be271427981afcd350c24:.
 
 
@@ -109,9 +109,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+ocaml.c447190238b45a8f378d13da2fdac91f4ccc36e9c942125c890e1587ba6ec5b7
-#+dune.abd2703180a464d294f90e2aaddae46547a507f267f8a4f4d2810ea1346fbcb1
-#+ocaml-compiler-libs.54e4b4a4ec84aa27d1fa7cbd415053a141daedcda25247e9f8f224eff71b0851
-#+ocaml-ppx_derivers.cd9a3527c433d0eaa5d879a5e8d7b25b9f7ff688e6101e7972b131499afb5b34
-#+ocaml-sexplib0.352c7cb1cfbf51ff9d342fdf7286a3a03ac890f885b3a890641a5249a255f288
-#+ocaml-stdlib-shims.c79c8a4109b723f058cf9aa95b1959a13e3cbccbbbf4c43ead089ec7bfab058b
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+ocaml.e90dc3a1c334c0eed5b655a830d9a2e3e438a91ab03caff718eda6cb8293862a
+#+dune.0c9a26d1c49b3e5b855f5616d983aa2fd7279152203a04670971cbbb1c13aec3
+#+ocaml-compiler-libs.7f4089b44ad51c5eede9a77d5aef9d8f4013567544f0ad4310b7a3745f2b30f9
+#+ocaml-ppx_derivers.dd7c4994cc3814b2f370a3f7fb4792b16d088b84a09f5e489e025a214f3d5198
+#+ocaml-sexplib0.e3cec3571f1416df5f088f3b93bd28d6ef3f5f2c1985bb9a7e0a0220849ac68f
+#+ocaml-stdlib-shims.f7bf9e59a7520ec85040f32c4316ef5bfd1a71cda657c863af924c460615dc70
 #@untar:-j:sha256:2e223837e7cecc3bc84a432432c0a72f4e1d5be9165c9c33772f156db85db0b3:.
 
 
@@ -107,9 +107,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+ocaml.c447190238b45a8f378d13da2fdac91f4ccc36e9c942125c890e1587ba6ec5b7
-#+ocaml-findlib.1a942df6f23e209c84ccd0715b5ff01ec200bacd2cf378e104952c1f9388c32e
-#+ocamlbuild.9ae78586c1c207a8eae296e4e22160e930bcbdb6324659b823cf72372f1d14c4
-#+opam.0c66099421a5068670bf29b69be38796dcb0ccfc233e35cdc6f561507a1cda18
-#+ocaml-topkg.dcbe416f117014d935e8897cfc9f9efa814320cf80959922fc174922d2bb49d1
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+ocaml.e90dc3a1c334c0eed5b655a830d9a2e3e438a91ab03caff718eda6cb8293862a
+#+ocaml-findlib.88b45c1d78c2d16c1e7aeb4320373c8c9d090e48f38b93e8d6384388c22fa43a
+#+ocamlbuild.1c3adafd11ef163827a2a00b8f414b9b607688f56e5bb6aaf6d2f154f0cda4e5
+#+opam.c5331efc7d37c171daade52cf469525d256c437a232d25ba2c034d4cba1ab45a
+#+ocaml-topkg.ea7d43bcac3c5593643edc7709228173535b58ea83bf43424609ed4bc681b518
 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:.
 
 
@@ -99,9 +99,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+ocaml.c447190238b45a8f378d13da2fdac91f4ccc36e9c942125c890e1587ba6ec5b7
-#+dune.abd2703180a464d294f90e2aaddae46547a507f267f8a4f4d2810ea1346fbcb1
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+ocaml.e90dc3a1c334c0eed5b655a830d9a2e3e438a91ab03caff718eda6cb8293862a
+#+dune.0c9a26d1c49b3e5b855f5616d983aa2fd7279152203a04670971cbbb1c13aec3
 #@untar:-z:sha256:86dba26468194512f789f2fb709063515a9cb4e5c4461c021c239a369590701d:.
 
 
@@ -102,9 +102,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+ocaml.c447190238b45a8f378d13da2fdac91f4ccc36e9c942125c890e1587ba6ec5b7
-#+dune.abd2703180a464d294f90e2aaddae46547a507f267f8a4f4d2810ea1346fbcb1
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+ocaml.e90dc3a1c334c0eed5b655a830d9a2e3e438a91ab03caff718eda6cb8293862a
+#+dune.0c9a26d1c49b3e5b855f5616d983aa2fd7279152203a04670971cbbb1c13aec3
 #@untar:-j:sha256:babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a:.
 
 
@@ -101,9 +101,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+ocaml.c447190238b45a8f378d13da2fdac91f4ccc36e9c942125c890e1587ba6ec5b7
-#+ocaml-findlib.1a942df6f23e209c84ccd0715b5ff01ec200bacd2cf378e104952c1f9388c32e
-#+ocamlbuild.9ae78586c1c207a8eae296e4e22160e930bcbdb6324659b823cf72372f1d14c4
-#+opam.0c66099421a5068670bf29b69be38796dcb0ccfc233e35cdc6f561507a1cda18
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+ocaml.e90dc3a1c334c0eed5b655a830d9a2e3e438a91ab03caff718eda6cb8293862a
+#+ocaml-findlib.88b45c1d78c2d16c1e7aeb4320373c8c9d090e48f38b93e8d6384388c22fa43a
+#+ocamlbuild.1c3adafd11ef163827a2a00b8f414b9b607688f56e5bb6aaf6d2f154f0cda4e5
+#+opam.c5331efc7d37c171daade52cf469525d256c437a232d25ba2c034d4cba1ab45a
 #@untar:-j:sha256:452082626e651ac4b1633c2b4ae4cad7abeb1fb6a13046e699f95eec58b5d1c7:.
 
 
@@ -98,9 +98,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.c447190238b45a8f378d13da2fdac91f4ccc36e9c942125c890e1587ba6ec5b7
-#+dune.abd2703180a464d294f90e2aaddae46547a507f267f8a4f4d2810ea1346fbcb1
-#+ocamlbuild.9ae78586c1c207a8eae296e4e22160e930bcbdb6324659b823cf72372f1d14c4
-#+ocaml-base.03985dcd08c0ebf94d77afd550de5e70eedb9717f0e889e364a63bfc3ace7354
-#+opam.0c66099421a5068670bf29b69be38796dcb0ccfc233e35cdc6f561507a1cda18
-#+ocaml-bos.50593ce83913be86ecbb531e665fa10e58c8b31672f2b792e33df9fe4638e1bd
-#+ocaml-lun.04b49b3be1f1c4403505779a64e6695363be2bf86e665929aa16abe5e4c0cccb
-#+ocaml-ppx_deriving.c7e0f93517e9a5b7c49be213daddada1a73c0710073477cb581f5a1e764ce87b-
\ No newline at end of file
+#+ocaml.e90dc3a1c334c0eed5b655a830d9a2e3e438a91ab03caff718eda6cb8293862a
+#+dune.0c9a26d1c49b3e5b855f5616d983aa2fd7279152203a04670971cbbb1c13aec3
+#+ocamlbuild.1c3adafd11ef163827a2a00b8f414b9b607688f56e5bb6aaf6d2f154f0cda4e5
+#+ocaml-base.61d09eebb77e3fc380338b218295d6256da7fdbaa40988fb15a51675968acbfe
+#+opam.c5331efc7d37c171daade52cf469525d256c437a232d25ba2c034d4cba1ab45a
+#+ocaml-bos.fb29bcff8879ec74699e616001bd991df01df3dbec678bddbc8742c4a2cdf85c
+#+ocaml-lun.5f0d5c3e2c27ea4d64a300bd56e8e84d3d5fde21996c884e48baf41b7b31803a
+#+ocaml-ppx_deriving.8dcf6cf74819db60df843d5ef6ff9b34618dfccd4d70c1145cba1065aa59e6e7+
\ 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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+m4.c8d88d8aec319136135088f0afb3abd0c9d406b2e3d6e36ebbdba13c9a6da204
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+m4.1966f1cc47deb93b6cc0630a2b4037285eb5de4080e2152a0e54f0e842b7bee8
 #@untar:-J:sha256:dfaa8a2e11c799bc1765d8bef44911406ee5f4803027190382a939f88c912266:.
 
 
@@ -117,9 +117,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+ocaml.c447190238b45a8f378d13da2fdac91f4ccc36e9c942125c890e1587ba6ec5b7
-#+dune.abd2703180a464d294f90e2aaddae46547a507f267f8a4f4d2810ea1346fbcb1
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+ocaml.e90dc3a1c334c0eed5b655a830d9a2e3e438a91ab03caff718eda6cb8293862a
+#+dune.0c9a26d1c49b3e5b855f5616d983aa2fd7279152203a04670971cbbb1c13aec3
 #@untar:-z:sha256:c988b7769a59749631c3c98ba5edd1d2fe91f5dc380b5e0593c073c92f4bee01:.
 
 
@@ -95,9 +95,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/ocamlbuild b/variants/root-x86_64/ocamlbuild
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+m4.c8d88d8aec319136135088f0afb3abd0c9d406b2e3d6e36ebbdba13c9a6da204
-#+ocaml.c447190238b45a8f378d13da2fdac91f4ccc36e9c942125c890e1587ba6ec5b7
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+m4.1966f1cc47deb93b6cc0630a2b4037285eb5de4080e2152a0e54f0e842b7bee8
+#+ocaml.e90dc3a1c334c0eed5b655a830d9a2e3e438a91ab03caff718eda6cb8293862a
 #@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.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/versions/musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b/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.c447190238b45a8f378d13da2fdac91f4ccc36e9c942125c890e1587ba6ec5b7"
+stdlib="$pthbs_destdir/versions/ocaml.e90dc3a1c334c0eed5b655a830d9a2e3e438a91ab03caff718eda6cb8293862a"
 mkdir -p "${stdlib%/*}"
 ln -s "$pthbs_package" "$stdlib"
 
@@ -121,9 +121,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/opam b/variants/root-x86_64/opam
@@ -1,39 +1,39 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+diffutils.33bd942cf2beccc8bb0cb15c8bfb81de161fe69f1e2a518d9d2a0cd05f9fe9ca
-#+patch.4dde0ea6c40f34670986c613217bffa1cb0adbdd46c6f1e5e3708835dbb50f41
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+getconf.255e928fa26a27ec6b7652558576a541b9644981df236bae727137315f8ad6c8
-#+ocaml.c447190238b45a8f378d13da2fdac91f4ccc36e9c942125c890e1587ba6ec5b7
-#+dune.abd2703180a464d294f90e2aaddae46547a507f267f8a4f4d2810ea1346fbcb1
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+diffutils.f595d46864dea091a112d3ea082ea1d930885e4bfa4298a6c66ce176115df8f7
+#+patch.37ad4ea29ff465fb5ef543bb5434445296beb16c513eeec5ae6f3e69fa1ed7f0
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+getconf.348ded15b8ff20d55a9b2466076391f922212fbc24e7e707d6ee9dbf40c4e917
+#+ocaml.e90dc3a1c334c0eed5b655a830d9a2e3e438a91ab03caff718eda6cb8293862a
+#+dune.0c9a26d1c49b3e5b855f5616d983aa2fd7279152203a04670971cbbb1c13aec3
 #@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.abd2703180a464d294f90e2aaddae46547a507f267f8a4f4d2810ea1346fbcb1/command/dune' \
+	--with-dune='/versions/dune.0c9a26d1c49b3e5b855f5616d983aa2fd7279152203a04670971cbbb1c13aec3/command/dune' \
 	--with-mccs \
 	--with-vendored-deps \
 	--enable-static
@@ -126,9 +126,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/patch b/variants/root-x86_64/patch
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+m4.c8d88d8aec319136135088f0afb3abd0c9d406b2e3d6e36ebbdba13c9a6da204
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+m4.1966f1cc47deb93b6cc0630a2b4037285eb5de4080e2152a0e54f0e842b7bee8
 #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:.
 
 
@@ -87,7 +87,7 @@ cd 'patch-2.7.6'
 
 build_env_static
 autotools_config_static --disable-nls
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -132,9 +132,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -143,16 +143,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
diff --git a/variants/root-x86_64/pkgconf b/variants/root-x86_64/pkgconf
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+m4.c8d88d8aec319136135088f0afb3abd0c9d406b2e3d6e36ebbdba13c9a6da204
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+m4.1966f1cc47deb93b6cc0630a2b4037285eb5de4080e2152a0e54f0e842b7bee8
 #@untar:-J:sha256:3a224f2accf091b77a5781316e27b9ee3ba82c083cc2e539e08940b68a44fec5:.
 
 
@@ -137,9 +137,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+pkgconf.3f4f83e3eb3a755d0571d5864c67711be2a84be242f1251a8f0422397d44d372
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+pkgconf.74c908f1e5930b7a7c4505c919d3f71ab7b4853c74ab41d257023ca3b8149bef
 
 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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+m4.c8d88d8aec319136135088f0afb3abd0c9d406b2e3d6e36ebbdba13c9a6da204
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+m4.1966f1cc47deb93b6cc0630a2b4037285eb5de4080e2152a0e54f0e842b7bee8
 #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:.
 
 
@@ -87,7 +87,7 @@ cd 'popt-1.19'
 
 build_env_static
 autotools_config_static --disable-nls
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -131,9 +131,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -142,16 +142,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+zsh.b294c45b50749a1ecd8ad526a8fc0e9d75d5a98094f6b85dfe2f8524d142d995
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+zsh.1a9e6c9c487ff782474a7de120940351054c19445c775c808c1fdd272262c311
 #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall
 
 
@@ -77,9 +77,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+execline.57eeaf241fccaf36bf325700774a5325858ad0252b56674593bcbbbc16cf924a
-#+lnstools.4e47860265a990f97727f62ab91f84232a34151b7503a40264ed80ce3e1d473d
-#+sandbox_rootfs.9563d4d968d7b30cad6af684b2f25b4343c453612da2fffdf5b15ac408573869
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+execline.75c97cf57ace71efcb6aa51e0b3f53b3eacffbcf859faa366c695b2c7e1feda4
+#+lnstools.7db5f76b1edfca37adad1539a0137a18107da6406acb965be0bc7b323fc90e45
+#+sandbox_rootfs.a915c31bff9610693b8703920666780ebfc91311c5c4f25087a96c4eb61be6a4
 #@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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+m4.c8d88d8aec319136135088f0afb3abd0c9d406b2e3d6e36ebbdba13c9a6da204
-#+nawk.381177d4e8e6dcb810de62cbc90a14089506be188e708b48036269ac4214995a
-#+popt.2e8d108b4f9653b7be5fb647f5d2b27f85b538f7eba06d153d784c372c688624
-#+libressl.4b4d2aedd3016e7d66bc82165af68bdbfe931bc0b4f093e4290e56b51c56a461
-#+zstd.08a3627a300ce395fbc23d776548e23604c5d2159d06813975a025363e57252b
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+m4.1966f1cc47deb93b6cc0630a2b4037285eb5de4080e2152a0e54f0e842b7bee8
+#+nawk.c2c2f30264808844207b675b7651711207891f09daff4fb1f022b305a2003d52
+#+popt.678aa5c5f143d7d07debd94272077393f6be2a09ca4d3053c321f2e322c0c9d4
+#+libressl.13729215dbb743a0fb10127fac6d396c1a140dd3a53b1ed62065472e8586acd0
+#+zstd.e0e066c304f8b662819708767b429ce424651b59529cc64b461d93114713c781
 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:.
 
 
@@ -95,7 +95,7 @@ autotools_config_static --without-included-popt \
 	--disable-xxhash \
 	--disable-lz4
 
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -141,9 +141,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -152,16 +152,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
diff --git a/variants/root-x86_64/s6 b/variants/root-x86_64/s6
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+skalibs.2d0f33bac54539bd90ab0d62dc20c207d4ef7a891262780d50a9103acaada8bb
-#+execline.a3e0cdff27257fed7b694dd55a62923d9444badaee9c28ea51bd89fbdf8ab14e
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+skalibs.f46389b8118622cea646bd3563ba4163989500f391ae34c328a193e26449f01f
+#+execline.d50f3f7a78cfe50b3526c9a877d90f5dd0af60372d717cb6a5e343415e95f50b
 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6
 
 
@@ -47,7 +47,7 @@ cd 's6'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.2d0f33bac54539bd90ab0d62dc20c207d4ef7a891262780d50a9103acaada8bb/sysdeps' \
+	--with-sysdeps='/versions/skalibs.f46389b8118622cea646bd3563ba4163989500f391ae34c328a193e26449f01f/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -93,9 +93,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+skalibs.2d0f33bac54539bd90ab0d62dc20c207d4ef7a891262780d50a9103acaada8bb
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+skalibs.f46389b8118622cea646bd3563ba4163989500f391ae34c328a193e26449f01f
 #@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns
 
 
@@ -46,7 +46,7 @@ cd 's6-dns'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.2d0f33bac54539bd90ab0d62dc20c207d4ef7a891262780d50a9103acaada8bb/sysdeps' \
+	--with-sysdeps='/versions/skalibs.f46389b8118622cea646bd3563ba4163989500f391ae34c328a193e26449f01f/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -92,9 +92,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+skalibs.2d0f33bac54539bd90ab0d62dc20c207d4ef7a891262780d50a9103acaada8bb
-#+execline.a3e0cdff27257fed7b694dd55a62923d9444badaee9c28ea51bd89fbdf8ab14e
-#+s6.05eda2316ff21294e6954477f46acbf2d024b362e2ee66611babba7bab02040d
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+skalibs.f46389b8118622cea646bd3563ba4163989500f391ae34c328a193e26449f01f
+#+execline.d50f3f7a78cfe50b3526c9a877d90f5dd0af60372d717cb6a5e343415e95f50b
+#+s6.1ad0b529f4324fda577d196c6994cb0dc32ed7d92f7ba50e1395cdc2374a450a
 #@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.2d0f33bac54539bd90ab0d62dc20c207d4ef7a891262780d50a9103acaada8bb/sysdeps' \
+	--with-sysdeps='/versions/skalibs.f46389b8118622cea646bd3563ba4163989500f391ae34c328a193e26449f01f/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -94,9 +94,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+skalibs.2d0f33bac54539bd90ab0d62dc20c207d4ef7a891262780d50a9103acaada8bb
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+skalibs.f46389b8118622cea646bd3563ba4163989500f391ae34c328a193e26449f01f
 #@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.2d0f33bac54539bd90ab0d62dc20c207d4ef7a891262780d50a9103acaada8bb/sysdeps' \
+	--with-sysdeps='/versions/skalibs.f46389b8118622cea646bd3563ba4163989500f391ae34c328a193e26449f01f/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -92,9 +92,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+skalibs.2d0f33bac54539bd90ab0d62dc20c207d4ef7a891262780d50a9103acaada8bb
-#+execline.a3e0cdff27257fed7b694dd55a62923d9444badaee9c28ea51bd89fbdf8ab14e
-#+s6.05eda2316ff21294e6954477f46acbf2d024b362e2ee66611babba7bab02040d
-#+s6-dns.48edd0a9e976d8b98f504d3edd079c74ee763b17dc588b7fd3b591be94a477db
-#+libressl.4b4d2aedd3016e7d66bc82165af68bdbfe931bc0b4f093e4290e56b51c56a461
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+skalibs.f46389b8118622cea646bd3563ba4163989500f391ae34c328a193e26449f01f
+#+execline.d50f3f7a78cfe50b3526c9a877d90f5dd0af60372d717cb6a5e343415e95f50b
+#+s6.1ad0b529f4324fda577d196c6994cb0dc32ed7d92f7ba50e1395cdc2374a450a
+#+s6-dns.eaef0d053053fb51e9fc258982d1268c6b26f1babee7818d4663ef61ef8cc407
+#+libressl.13729215dbb743a0fb10127fac6d396c1a140dd3a53b1ed62065472e8586acd0
 #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking
 
 
@@ -50,7 +50,7 @@ cd 's6-networking'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.2d0f33bac54539bd90ab0d62dc20c207d4ef7a891262780d50a9103acaada8bb/sysdeps' \
+	--with-sysdeps='/versions/skalibs.f46389b8118622cea646bd3563ba4163989500f391ae34c328a193e26449f01f/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -101,9 +101,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+skalibs.2d0f33bac54539bd90ab0d62dc20c207d4ef7a891262780d50a9103acaada8bb
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+skalibs.f46389b8118622cea646bd3563ba4163989500f391ae34c328a193e26449f01f
 #@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.2d0f33bac54539bd90ab0d62dc20c207d4ef7a891262780d50a9103acaada8bb/sysdeps' \
+	--with-sysdeps='/versions/skalibs.f46389b8118622cea646bd3563ba4163989500f391ae34c328a193e26449f01f/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -92,9 +92,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+skalibs.2d0f33bac54539bd90ab0d62dc20c207d4ef7a891262780d50a9103acaada8bb
-#+execline.a3e0cdff27257fed7b694dd55a62923d9444badaee9c28ea51bd89fbdf8ab14e
-#+s6.05eda2316ff21294e6954477f46acbf2d024b362e2ee66611babba7bab02040d
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+skalibs.f46389b8118622cea646bd3563ba4163989500f391ae34c328a193e26449f01f
+#+execline.d50f3f7a78cfe50b3526c9a877d90f5dd0af60372d717cb6a5e343415e95f50b
+#+s6.1ad0b529f4324fda577d196c6994cb0dc32ed7d92f7ba50e1395cdc2374a450a
 #@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc
 
 
@@ -48,7 +48,7 @@ cd 's6-rc'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.2d0f33bac54539bd90ab0d62dc20c207d4ef7a891262780d50a9103acaada8bb/sysdeps' \
+	--with-sysdeps='/versions/skalibs.f46389b8118622cea646bd3563ba4163989500f391ae34c328a193e26449f01f/sysdeps' \
 	--with-include="$pthbs_build_environment/include" \
 	--with-lib="$pthbs_build_environment/library" \
 	--with-dynlib="$pthbs_build_environment/library.so" \
@@ -94,9 +94,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.fa1f93d71879f2b8fc0311ac8fc611ac295c3cadf750e324afb25af090c90207
-#+gnu-make.e6aa0a74f059daf4032edcd8c80a48bdf701895263b7ddf6b731aba1dd191388
-#+busybox.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
-#+skalibs.9918c06d5fea4c73140602edc462eaf572a2b5d7915caf0463dce11edbc2987a
+#+musl-cross-make.a50ca83c06d31066290d6d9f8fb236667c1b2dbc376cb34377761fe9b87386a1
+#+gnu-make.e83ebb5b87ae559c2ea259d37ea642ab860acd75ac003123f100e3c71cf0f901
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+skalibs.2d5bee0bae3f8e378baf4c0f2db82f35edc9f8fcec4ef73ada0e0f830ed0cac7
 #@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.4e47860265a990f97727f62ab91f84232a34151b7503a40264ed80ce3e1d473d
-#+sandbox_rootfs.9563d4d968d7b30cad6af684b2f25b4343c453612da2fffdf5b15ac408573869
-#+pthbs-sandbox-rootns.e4e6775ef2374478a924afa10406577ca835cf86c675b899dec96befc7bd34ae-
\ No newline at end of file
+#+lnstools.7db5f76b1edfca37adad1539a0137a18107da6406acb965be0bc7b323fc90e45
+#+sandbox_rootfs.a915c31bff9610693b8703920666780ebfc91311c5c4f25087a96c4eb61be6a4
+#+pthbs-sandbox-rootns.2e61bf46eac1e8fd5cd2669e8adaad664305b3a6594a7028df2bce50aca479c6+
\ 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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
 #@git:96b537f42695da1b865588baf591fdfcae76bd41:skalibs
 
 
@@ -94,9 +94,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.fa1f93d71879f2b8fc0311ac8fc611ac295c3cadf750e324afb25af090c90207
-#+gnu-make.e6aa0a74f059daf4032edcd8c80a48bdf701895263b7ddf6b731aba1dd191388
-#+busybox.4fba36862e761cec7a534cb1252b9ec5e003871b60161fb1c7326277052b0dfa
+#+musl-cross-make.a50ca83c06d31066290d6d9f8fb236667c1b2dbc376cb34377761fe9b87386a1
+#+gnu-make.e83ebb5b87ae559c2ea259d37ea642ab860acd75ac003123f100e3c71cf0f901
+#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
 #@git:96b537f42695da1b865588baf591fdfcae76bd41:skalibs
 
 
@@ -67,9 +67,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/snaprep b/variants/root-x86_64/snaprep
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+zsh.b294c45b50749a1ecd8ad526a8fc0e9d75d5a98094f6b85dfe2f8524d142d995
-#+pthbs-banginstall.0808643db47f5b10d4f1afac3124074270b46fe3de033d17895315cf797eba96
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+zsh.1a9e6c9c487ff782474a7de120940351054c19445c775c808c1fdd272262c311
+#+pthbs-banginstall.218506c0794f6679abbb9343da26d20157aafedd81266f761eb2696c0a312119
 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep
 
 
@@ -96,9 +96,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+attr.e1a3bf652e1806d9b1504c53f3aa3e96d2bfedd58fcad78a0753058829ab0760
-#+zstd.08a3627a300ce395fbc23d776548e23604c5d2159d06813975a025363e57252b
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+attr.366026274b2318aa68aab95342c0824993cd87b6e8eea9673806e58887ce750d
+#+zstd.e0e066c304f8b662819708767b429ce424651b59529cc64b461d93114713c781
 #@untar:-z:sha256:4672b5c47d9418d3a5ae5b243defc6d9eae8275b9771022247c6a6082c815914:.
 
 
@@ -133,9 +133,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/strace b/variants/root-x86_64/strace
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+m4.c8d88d8aec319136135088f0afb3abd0c9d406b2e3d6e36ebbdba13c9a6da204
-#+patch.4dde0ea6c40f34670986c613217bffa1cb0adbdd46c6f1e5e3708835dbb50f41
-#+libunwind.8cc308f7b52dfdcd115aa2c567b613b8b7c746d1645a1f6c3da0dc70d77ceb38
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+m4.1966f1cc47deb93b6cc0630a2b4037285eb5de4080e2152a0e54f0e842b7bee8
+#+patch.37ad4ea29ff465fb5ef543bb5434445296beb16c513eeec5ae6f3e69fa1ed7f0
+#+libunwind.d585f284f44e698c3de9b7b20897f0f5018c9a46ea5e9662356b762e56b64f8b
 #@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch
 #@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:.
 
@@ -92,7 +92,7 @@ patch -p1 <../strace-6.5-static.patch
 
 build_env_static
 autotools_config_static --with-unwind --without-libdw --enable-mpers=check
-
+ 
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
 
@@ -140,9 +140,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
@@ -151,16 +151,6 @@ $2 == "doc" { link($0); next }
 $2 == "data" { link($0); next }
 $2 == "include" { link($0); next }
 
-$2 == "share" && $3 ~ /^(icons|terminfo)$/ { link(r1($0)); next }
-
-$2 == "library.ocaml" { link($0); next }
-
-$2 == "keys" { link($0); next }
-$2 == "zsh" { link($0); next }
-$2 == "vimfiles" { link($0); next }
-$2 == "icons" { link($0); next }
-$2 == "terminfo" { link($0); next }
-
 
 { printf "genlinks ##%s## skipped\n", $0 >>"/dev/stderr" }
 
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-dosfstools.b48202c09e25c912ad9c0e6461426e13c076e17b8819cba04d94c1e0721cfe67
-#+busybox-e2fsprogs.aaa3d31e9508708a9c49cd8b4bdb2d312fbedbe4e637f5284c93529702e67ff7
-#+busybox-iproute2.2f457ae49d7fd09d73bbbe5f37410fe82838855fed370ada83336a3e0d4ba19f
-#+busybox-iputils.37c34276542472b7414ceda0430992cc82521f56287295e4c56adb5adc1283a0
-#+busybox-net-misc.bbec677ce1c792fd705e346d6068169cec83d5ef9d025f83fe55a4a2ed75409d
-#+busybox-net-tools.7eadf6e434c14fc58acc02ff5388c5c830300e3030e4e8d0c542b61dd6a4d558
-#+busybox-traceroute.af17725cacaf936501f8f81330d820d725747063f279da83beb3e089d8936839
-#+busybox-wget.26fe7474987360fa5b6029ae0f68ac0f490d94e819872dbfead31189f39fdc6b
-#+busybox-chpst.230a660161659f948ca118624c66549ff55b0ad9c14a925cce6e0a038d40d051
-#+busybox-console.b5eed7352bc618210b3892186a0522c7319183dd5019d461c56cf0e170d9f74c
-#+busybox-getty.51fe8c57e3f49aa8cd5407f09d9ebd147ceede2a22dc062dee7accb1f96178b9
-#+busybox-i2c-tools.1c950c8ee55f1b1fc674d36d2564c70d9499de2e5d0e97031abca88dbf0b137b
-#+busybox-linux-extra.79cba3a2838615a5f28316df027ae3179c84fa97e4317ca080da4204fd400fb3
-#+busybox-mtd-utils.f6ab67f21f65aaa1534a6182164f3374823f7b06e9d6d75935c94c2a56e7c9f0
-#+busybox-shadow.a739aa09ea823c8bfb929f991859b5100dac9dc0e7f922c4479d93e1daa69ce1
-#+busybox-su.3bbbfb7cde5c6ee87932d469da407d14e144cb5838ee58146792e89941feefb4
-#+busybox-util-linux-priv.a28f7271def8401a284a115b91d586fa04509a75b1ffefc9cb73782f743d8d7d
-#+busybox-logging.0ebad270645a8c4b8af8f585d6905cab1f421ff190377eb96ea173b8dacd66bc
-#+busybox-cron.06c301490cf07c74523559c9343f81c4f9c1bbf851a363a1d6996691f67abd10
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+nawk.381177d4e8e6dcb810de62cbc90a14089506be188e708b48036269ac4214995a
-#+diffutils.33bd942cf2beccc8bb0cb15c8bfb81de161fe69f1e2a518d9d2a0cd05f9fe9ca
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+aat.870a020506d1f38703b0c9e0dc0960791feb5531add073d08ea5675d78c0753b
-#+fileset.05893c69bc55bc0fe1049569408bf85567bf3dfd434d413cd815005fe1dfab75
-#+rsync.6478ab3db3fe93941ea78fb499e91111393aea9b483c0b21dcceb8c23bfe6da8
-#+execline.a3e0cdff27257fed7b694dd55a62923d9444badaee9c28ea51bd89fbdf8ab14e
-#+kbd.72619126ffcf9088455c005edaf7638c2593c47afa9068f820b319282ac79182
-#+mdevd.ae4edcfd1645b1877245058ea879dc863b4f323235a72c195906ec82d8fa74f5
-#+s6-linux-utils.65b0c8d0b58c1ad9a9b03d22f5a506c438f58f3c67b8bf44890d5247f30d9296
-#+s6-rc.dafa7878177403d9b5985563021df2a9d9054bd38d9f4d64693b37b469ab07ce
-#+s6.05eda2316ff21294e6954477f46acbf2d024b362e2ee66611babba7bab02040d
-#+zsh.b294c45b50749a1ecd8ad526a8fc0e9d75d5a98094f6b85dfe2f8524d142d995
-#+libcgroup.7c541ed682b758728b35f2402471bd5a6b77f5411dd3084b2485cc2bb4de9df0
-#+system-config-scripts.3d112e57a3bd42d96cc2aec6ff080c7a13be855494a5f718c61bfa47a426b739
-#+logincaps.cbdbe3047d63f97d1baecc7b368709bc884453f0c2993b6e1fb6143677f3a0cf
-#+busybox-modutils.8a367b5a367887504245a84927f064a7009ff88e92ddab28fdd93cb2dd5175a3
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-dosfstools.1aeaa58c3e33924fdb102d5c5ee7221e77f3046b7127f699891bbfbf2304430f
+#+busybox-e2fsprogs.9bc73c56f0e71795ecce4e67f3e0ed1bba064b90bd05449f725239f6c64a9d73
+#+busybox-iproute2.94cb4fb51f4e8a0d2459c02674d17470c783e554087ff8201badaff7b269c914
+#+busybox-iputils.af614e89c894e03924f1c90cf494b8379f9cba70a43d50c1413ab5d85d7e7e11
+#+busybox-net-misc.32acaca88c420a42a7b166f0118aabb51eeb104c08bfd7aa4a63f4a1ac471d90
+#+busybox-net-tools.51bcca55b4cd2941485aa75332689d0b8445ba8701a61cb4e42a56705972d2f3
+#+busybox-traceroute.5257a4b38f73e06d7f7fd9d585ebfbcfca618b2d350708bae6da88db153d915f
+#+busybox-wget.1828a78d247b814352c0a62d0d363fbad588dcef4cd920d35734d41043612277
+#+busybox-chpst.c447fefcd27efbb192d8f3693738b3fa74a2d88da8d9351878d98e52971b5dbb
+#+busybox-console.819f0a43134343586b4831db94dcb6fe8a56b55ca9d5158e788a7d283b7cc55c
+#+busybox-getty.0590f1111800572ba4aa73d33a50585cbbfcd54f5269f2914df0fa2bc1853c57
+#+busybox-i2c-tools.8a7357848cfbc85eba31df4016bd961ed44f8b53101ddcaed371893b5688287e
+#+busybox-linux-extra.5e6dfc5168b8d7a12c1094870e2f72e89dd8508238f3c8f7319bf320d81a6ecf
+#+busybox-mtd-utils.88894a8c9ffbda9751b648fad9d79ef96741f022c748bd3ece9a612db6309f80
+#+busybox-shadow.af645c989b36c12549f4766647014ff09472421ca0a469c1a0f7acfb402ca42c
+#+busybox-su.f808244ad4eb9e8ba65ef85254ce68a2bdd371de9f713697e20f5d2907ead0f2
+#+busybox-util-linux-priv.ba141805065abf2a502b70e7ce955c5165b8725f1a204277b457e238ed24475d
+#+busybox-logging.2fa3102e85347e07f10eb8ac9ca21c478f39f4ea255a4d7ac1ca26016e0da648
+#+busybox-cron.f81b3b6a65ff08e200829e5a2117edef6b38e8ed25f8517ce148a4dbd2ce9696
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+nawk.c2c2f30264808844207b675b7651711207891f09daff4fb1f022b305a2003d52
+#+diffutils.f595d46864dea091a112d3ea082ea1d930885e4bfa4298a6c66ce176115df8f7
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+aat.337d96e3e10fe1efd7993355cac1ace40820cbf3ad0021e15b86692d7712dd25
+#+fileset.3b7f30fce859ff7a545a9ea01ec40d2564f3d7cee9cdc3247d7ac16b7c5cb424
+#+rsync.0cb8aadcd0ce6112d97ff4791e1ca60fec23b2f9cfba07f58d3ea1f7b8265660
+#+execline.d50f3f7a78cfe50b3526c9a877d90f5dd0af60372d717cb6a5e343415e95f50b
+#+kbd.98b6b9ab647e1e883914da96bb3ac8e10ed36f4475f460492c0a94024c0354fb
+#+mdevd.89466f2d76dc425aa481ab91d73cd10b5c4c68ece63c90627b75e82bad11ac6c
+#+s6-linux-utils.b13b3c79516949c7945e1bb990982ddb783096ec32ccb85ebcefd97a32362729
+#+s6-rc.208d0331edde347fc36cf656d70a96c73dae404c5186cb1bf9e9eaccb42d2572
+#+s6.1ad0b529f4324fda577d196c6994cb0dc32ed7d92f7ba50e1395cdc2374a450a
+#+zsh.1a9e6c9c487ff782474a7de120940351054c19445c775c808c1fdd272262c311
+#+libcgroup.3f87477d5ce40d9c4caf48fcb5da743c4f166225bad686e97cda2853ac40a064
+#+system-config-scripts.073fe0bcc815e32379d73d91267d04dc3412fc52314225afbc6094d453ab3efc
+#+logincaps.ec1a2365c69e934d1c800d9d471ebcc81b21b7f9841fd69481db7e595df4830d
+#+busybox-modutils.d980c823615920904694f8c945834a478d6304e7baf5807279740e991d710803
 #@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.0463d4048f0d34dda72c3eac34cdaa2caea1145d61000136a2bd59851d71944f' \
-	'pthbs_path_mdevd=/versions/env.0cffacd76776bdf39cb61090eaf2314c2949957c107a4bb11472811c8fcf77f6' \
+	'pthbs_path_containers=/versions/env.12e32e5723edfed482c40bb4b2681edebe76cba7bc998e84a304e5acfe7186e3' \
+	'pthbs_path_mdevd=/versions/env.617513be59acb8250be6941014acd859cab549b38c53beee5c3e08fa6d618237' \
 	make -j${JOBS:-1} -l$((1+${JOBS:-1})) all
 
 sort -u build/execfile | while IFS= read exename; do
@@ -161,9 +161,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-dosfstools.b48202c09e25c912ad9c0e6461426e13c076e17b8819cba04d94c1e0721cfe67
-#+busybox-e2fsprogs.aaa3d31e9508708a9c49cd8b4bdb2d312fbedbe4e637f5284c93529702e67ff7
-#+busybox-iproute2.2f457ae49d7fd09d73bbbe5f37410fe82838855fed370ada83336a3e0d4ba19f
-#+busybox-iputils.37c34276542472b7414ceda0430992cc82521f56287295e4c56adb5adc1283a0
-#+busybox-net-misc.bbec677ce1c792fd705e346d6068169cec83d5ef9d025f83fe55a4a2ed75409d
-#+busybox-net-tools.7eadf6e434c14fc58acc02ff5388c5c830300e3030e4e8d0c542b61dd6a4d558
-#+busybox-traceroute.af17725cacaf936501f8f81330d820d725747063f279da83beb3e089d8936839
-#+busybox-wget.26fe7474987360fa5b6029ae0f68ac0f490d94e819872dbfead31189f39fdc6b
-#+busybox-chpst.230a660161659f948ca118624c66549ff55b0ad9c14a925cce6e0a038d40d051
-#+busybox-console.b5eed7352bc618210b3892186a0522c7319183dd5019d461c56cf0e170d9f74c
-#+busybox-getty.51fe8c57e3f49aa8cd5407f09d9ebd147ceede2a22dc062dee7accb1f96178b9
-#+busybox-i2c-tools.1c950c8ee55f1b1fc674d36d2564c70d9499de2e5d0e97031abca88dbf0b137b
-#+busybox-linux-extra.79cba3a2838615a5f28316df027ae3179c84fa97e4317ca080da4204fd400fb3
-#+busybox-mtd-utils.f6ab67f21f65aaa1534a6182164f3374823f7b06e9d6d75935c94c2a56e7c9f0
-#+busybox-shadow.a739aa09ea823c8bfb929f991859b5100dac9dc0e7f922c4479d93e1daa69ce1
-#+busybox-su.3bbbfb7cde5c6ee87932d469da407d14e144cb5838ee58146792e89941feefb4
-#+busybox-util-linux-priv.a28f7271def8401a284a115b91d586fa04509a75b1ffefc9cb73782f743d8d7d
-#+busybox-logging.0ebad270645a8c4b8af8f585d6905cab1f421ff190377eb96ea173b8dacd66bc
-#+busybox-cron.06c301490cf07c74523559c9343f81c4f9c1bbf851a363a1d6996691f67abd10
-#+s6.05eda2316ff21294e6954477f46acbf2d024b362e2ee66611babba7bab02040d
-#+s6-rc.dafa7878177403d9b5985563021df2a9d9054bd38d9f4d64693b37b469ab07ce
-#+s6-portable-utils.a791ce7d06e6cdd1e4627c4ef146c80a4e7f86ddd3c272de45ebb12046a8ca19
-#+s6-linux-init.323056acaac79b5adf3afa4a611ae912af8ffb1c655b6c020186b14bcf1a260b
-#+execline.a3e0cdff27257fed7b694dd55a62923d9444badaee9c28ea51bd89fbdf8ab14e
-#+system-config-rc.51229680c6d1dbad900178878a598904395cf063dc023c855114ea23c1b889d4
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-dosfstools.1aeaa58c3e33924fdb102d5c5ee7221e77f3046b7127f699891bbfbf2304430f
+#+busybox-e2fsprogs.9bc73c56f0e71795ecce4e67f3e0ed1bba064b90bd05449f725239f6c64a9d73
+#+busybox-iproute2.94cb4fb51f4e8a0d2459c02674d17470c783e554087ff8201badaff7b269c914
+#+busybox-iputils.af614e89c894e03924f1c90cf494b8379f9cba70a43d50c1413ab5d85d7e7e11
+#+busybox-net-misc.32acaca88c420a42a7b166f0118aabb51eeb104c08bfd7aa4a63f4a1ac471d90
+#+busybox-net-tools.51bcca55b4cd2941485aa75332689d0b8445ba8701a61cb4e42a56705972d2f3
+#+busybox-traceroute.5257a4b38f73e06d7f7fd9d585ebfbcfca618b2d350708bae6da88db153d915f
+#+busybox-wget.1828a78d247b814352c0a62d0d363fbad588dcef4cd920d35734d41043612277
+#+busybox-chpst.c447fefcd27efbb192d8f3693738b3fa74a2d88da8d9351878d98e52971b5dbb
+#+busybox-console.819f0a43134343586b4831db94dcb6fe8a56b55ca9d5158e788a7d283b7cc55c
+#+busybox-getty.0590f1111800572ba4aa73d33a50585cbbfcd54f5269f2914df0fa2bc1853c57
+#+busybox-i2c-tools.8a7357848cfbc85eba31df4016bd961ed44f8b53101ddcaed371893b5688287e
+#+busybox-linux-extra.5e6dfc5168b8d7a12c1094870e2f72e89dd8508238f3c8f7319bf320d81a6ecf
+#+busybox-mtd-utils.88894a8c9ffbda9751b648fad9d79ef96741f022c748bd3ece9a612db6309f80
+#+busybox-shadow.af645c989b36c12549f4766647014ff09472421ca0a469c1a0f7acfb402ca42c
+#+busybox-su.f808244ad4eb9e8ba65ef85254ce68a2bdd371de9f713697e20f5d2907ead0f2
+#+busybox-util-linux-priv.ba141805065abf2a502b70e7ce955c5165b8725f1a204277b457e238ed24475d
+#+busybox-logging.2fa3102e85347e07f10eb8ac9ca21c478f39f4ea255a4d7ac1ca26016e0da648
+#+busybox-cron.f81b3b6a65ff08e200829e5a2117edef6b38e8ed25f8517ce148a4dbd2ce9696
+#+s6.1ad0b529f4324fda577d196c6994cb0dc32ed7d92f7ba50e1395cdc2374a450a
+#+s6-rc.208d0331edde347fc36cf656d70a96c73dae404c5186cb1bf9e9eaccb42d2572
+#+s6-portable-utils.e126bd3cb76653521f81dcdcbf0187628caea370c7c307b4fcc054f72826a849
+#+s6-linux-init.9acea68842cdab731dc0da8c064a10dbd98502cca3ac160a277183cd89c88e91
+#+execline.d50f3f7a78cfe50b3526c9a877d90f5dd0af60372d717cb6a5e343415e95f50b
+#+system-config-rc.1cd9e859572d2445d0b02ed980ca608fe14cfcfae099a916f78e9d3fac18e054
 
 
 # - build script start -
@@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-s6rcdb=/versions/system-config-rc.51229680c6d1dbad900178878a598904395cf063dc023c855114ea23c1b889d4/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.1cd9e859572d2445d0b02ed980ca608fe14cfcfae099a916f78e9d3fac18e054/config/s6-rc-db
 
 # Generate init (${dest} must not exist but parent dir does)
 mkdir -p "$pthbs_destdir//versions"
@@ -204,9 +204,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+s6-rc.dafa7878177403d9b5985563021df2a9d9054bd38d9f4d64693b37b469ab07ce
-#+fileset.05893c69bc55bc0fe1049569408bf85567bf3dfd434d413cd815005fe1dfab75
-#+system-config.a7c4f55369a479e2aa593d563c51b66a37dcbb86e1d86a3c59523860ab4271bf
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+s6-rc.208d0331edde347fc36cf656d70a96c73dae404c5186cb1bf9e9eaccb42d2572
+#+fileset.3b7f30fce859ff7a545a9ea01ec40d2564f3d7cee9cdc3247d7ac16b7c5cb424
+#+system-config.9de5ea8ff4345f002918f91179040f8a73aa1df32ca77a5e6744ce4c409b7792
 
 
 # - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-src=/versions/system-config.a7c4f55369a479e2aa593d563c51b66a37dcbb86e1d86a3c59523860ab4271bf/config/s6-rc-source
+src=/versions/system-config.9de5ea8ff4345f002918f91179040f8a73aa1df32ca77a5e6744ce4c409b7792/config/s6-rc-source
 s6-rc-compile ./s6-rc-db "$src"
 mkdir -p "$dest/config"
 mv -v s6-rc-db "$dest/config/"
@@ -79,9 +79,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+zsh.b294c45b50749a1ecd8ad526a8fc0e9d75d5a98094f6b85dfe2f8524d142d995
-#+pthbs-banginstall.0808643db47f5b10d4f1afac3124074270b46fe3de033d17895315cf797eba96
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+zsh.1a9e6c9c487ff782474a7de120940351054c19445c775c808c1fdd272262c311
+#+pthbs-banginstall.218506c0794f6679abbb9343da26d20157aafedd81266f761eb2696c0a312119
 #@git:dc793695cc0632a808af9d4415f3b0cf0f4dfba2:system-config-scripts
 
 
@@ -96,9 +96,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+zsh.b294c45b50749a1ecd8ad526a8fc0e9d75d5a98094f6b85dfe2f8524d142d995
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+zsh.1a9e6c9c487ff782474a7de120940351054c19445c775c808c1fdd272262c311
 #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh
 
 
@@ -75,9 +75,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/tinyssh b/variants/root-x86_64/tinyssh
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
 #@untar:-z:sha256:f3ae622c765db4e0d791ea90a9feba39d7f693ef9cb949a797f7ad6b404a2d61:.
 
 
@@ -113,9 +113,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+execline.a3e0cdff27257fed7b694dd55a62923d9444badaee9c28ea51bd89fbdf8ab14e
-#+pthbs-banginstall.0808643db47f5b10d4f1afac3124074270b46fe3de033d17895315cf797eba96
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+execline.d50f3f7a78cfe50b3526c9a877d90f5dd0af60372d717cb6a5e343415e95f50b
+#+pthbs-banginstall.218506c0794f6679abbb9343da26d20157aafedd81266f761eb2696c0a312119
 #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env
 
 
@@ -79,9 +79,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-dosfstools.b48202c09e25c912ad9c0e6461426e13c076e17b8819cba04d94c1e0721cfe67
-#+busybox-e2fsprogs.aaa3d31e9508708a9c49cd8b4bdb2d312fbedbe4e637f5284c93529702e67ff7
-#+busybox-iproute2.2f457ae49d7fd09d73bbbe5f37410fe82838855fed370ada83336a3e0d4ba19f
-#+busybox-iputils.37c34276542472b7414ceda0430992cc82521f56287295e4c56adb5adc1283a0
-#+busybox-net-misc.bbec677ce1c792fd705e346d6068169cec83d5ef9d025f83fe55a4a2ed75409d
-#+busybox-net-tools.7eadf6e434c14fc58acc02ff5388c5c830300e3030e4e8d0c542b61dd6a4d558
-#+busybox-traceroute.af17725cacaf936501f8f81330d820d725747063f279da83beb3e089d8936839
-#+busybox-wget.26fe7474987360fa5b6029ae0f68ac0f490d94e819872dbfead31189f39fdc6b
-#+busybox-chpst.230a660161659f948ca118624c66549ff55b0ad9c14a925cce6e0a038d40d051
-#+busybox-console.b5eed7352bc618210b3892186a0522c7319183dd5019d461c56cf0e170d9f74c
-#+busybox-getty.51fe8c57e3f49aa8cd5407f09d9ebd147ceede2a22dc062dee7accb1f96178b9
-#+busybox-i2c-tools.1c950c8ee55f1b1fc674d36d2564c70d9499de2e5d0e97031abca88dbf0b137b
-#+busybox-linux-extra.79cba3a2838615a5f28316df027ae3179c84fa97e4317ca080da4204fd400fb3
-#+busybox-mtd-utils.f6ab67f21f65aaa1534a6182164f3374823f7b06e9d6d75935c94c2a56e7c9f0
-#+busybox-shadow.a739aa09ea823c8bfb929f991859b5100dac9dc0e7f922c4479d93e1daa69ce1
-#+busybox-su.3bbbfb7cde5c6ee87932d469da407d14e144cb5838ee58146792e89941feefb4
-#+busybox-util-linux-priv.a28f7271def8401a284a115b91d586fa04509a75b1ffefc9cb73782f743d8d7d
-#+busybox-logging.0ebad270645a8c4b8af8f585d6905cab1f421ff190377eb96ea173b8dacd66bc
-#+busybox-cron.06c301490cf07c74523559c9343f81c4f9c1bbf851a363a1d6996691f67abd10
-#+attr.e1a3bf652e1806d9b1504c53f3aa3e96d2bfedd58fcad78a0753058829ab0760
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+diffutils.33bd942cf2beccc8bb0cb15c8bfb81de161fe69f1e2a518d9d2a0cd05f9fe9ca
-#+patch.4dde0ea6c40f34670986c613217bffa1cb0adbdd46c6f1e5e3708835dbb50f41
-#+flex.2ab2d15b849d19051c26ced9a98a12cbe9f8cfeebe08aeb6738236768d62e329
-#+bison.36e0edcda0fcdd517ef56c5c44f5f49b9673d0dfd3f1f3b1ba47fd399db43437
-#+rsync.6478ab3db3fe93941ea78fb499e91111393aea9b483c0b21dcceb8c23bfe6da8
-#+execline.a3e0cdff27257fed7b694dd55a62923d9444badaee9c28ea51bd89fbdf8ab14e
-#+s6.05eda2316ff21294e6954477f46acbf2d024b362e2ee66611babba7bab02040d
-#+s6-rc.dafa7878177403d9b5985563021df2a9d9054bd38d9f4d64693b37b469ab07ce
-#+s6-portable-utils.a791ce7d06e6cdd1e4627c4ef146c80a4e7f86ddd3c272de45ebb12046a8ca19
-#+s6-linux-utils.65b0c8d0b58c1ad9a9b03d22f5a506c438f58f3c67b8bf44890d5247f30d9296
-#+s6-linux-init.323056acaac79b5adf3afa4a611ae912af8ffb1c655b6c020186b14bcf1a260b
-#+mdevd.ae4edcfd1645b1877245058ea879dc863b4f323235a72c195906ec82d8fa74f5
-#+s6-dns.48edd0a9e976d8b98f504d3edd079c74ee763b17dc588b7fd3b591be94a477db
-#+libressl.4b4d2aedd3016e7d66bc82165af68bdbfe931bc0b4f093e4290e56b51c56a461
-#+s6-networking.fc4e66bf844299774dc3213e76979d232ca21504bacbd8f9881e4d6e9a0d5ae7
-#+zsh.b294c45b50749a1ecd8ad526a8fc0e9d75d5a98094f6b85dfe2f8524d142d995
-#+pthbs-banginstall.0808643db47f5b10d4f1afac3124074270b46fe3de033d17895315cf797eba96
-#+aat.870a020506d1f38703b0c9e0dc0960791feb5531add073d08ea5675d78c0753b
-#+confz.b66cba40f51eac73668554fa6b6d541c99dad451826c853e1dbc61c0f0444012
-#+containers.5e82490e2dbd0ae59b6ca13e017dc4f43f6e0cbd971e5909ad0688666dd8fbe5
-#+fileset.05893c69bc55bc0fe1049569408bf85567bf3dfd434d413cd815005fe1dfab75
-#+logincaps.cbdbe3047d63f97d1baecc7b368709bc884453f0c2993b6e1fb6143677f3a0cf
-#+snaprep.1fac42d0847cab59049f9568ae221dafa1c9d41ed2ee4ca457e1bd9e0a760feb
-#+curl.8e23920a2304d6a2499a567648a9765f7bcf485cdd2421899d231a42d33d0300
-#+git.2099da9e56afa7723cde32ae934159680d8545483fdbfd0189252b11c9544996
-#+xbps.8f7eaaf659ee1fc8e4913b59a390ad5566c1e4900d2c44380c6631a147c3eb6d
-#+apk-tools.1b3c49a9e804b0876c5afcd6ee663d0bc768545e8d111fc082fdc1f16e786899
-#+getent.eaed56995c394c16ba2f2dac4976ec5eb93b361d1667f0eb4ec3c31b84916b05
-#+getconf.255e928fa26a27ec6b7652558576a541b9644981df236bae727137315f8ad6c8
-#+iconv.aa02e892fd78f4cddba02669e7a078e509f777daa278df985ed158b3c65121eb
-#+libcap.7ec3e41bbb6e1a01a3133446ab21bf48ea875bb2a55bf95b8de6e672f0bd5935
-#+applyuidgid-caps.aa2f81ed7ee561053e65145eeee5fe1e589c5861cc06ff6cbeca18210b2b59b9
-#+ccx-utils.a141cc1b0f0cac0ca9773954a20c2f08c239404d3688720849461e459e7287ce
-#+user-env.9f77947975623305fc51870b9fc09dd9a74deec60a2e1ec262eb25ea561e2a1d
-#+strace.ccf19939edfc107b664451c64ceb57c707254d4d060b04e78c0ca7d55e7eb6d1
-#+mlog.d0aaf29bb6022cce4fe390af7f8170032a891405e1f6dad755327b8a39c259e3
-#+findutils.dd67659c86ce76a4f29291cab9de3122f814a7ff0b9e33c92e804583558276a2
-#+nawk.381177d4e8e6dcb810de62cbc90a14089506be188e708b48036269ac4214995a
-#+squashfs-tools.3f0aef2f38a231da2409bde87eb890910fa2d0d4eb0c3feed6e893039bc0378a
-#+mandoc.aed0ef0bf7d9e38cd11346ebb161638d2b221c7e6d8c2f53b2afe741dd2940d7
-#+tinyssh.71e7a06bb87e9ff5ff61286dc561c5d21ec9d2cf0eb5ddac64a1a983749b6763-
\ No newline at end of file
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-dosfstools.1aeaa58c3e33924fdb102d5c5ee7221e77f3046b7127f699891bbfbf2304430f
+#+busybox-e2fsprogs.9bc73c56f0e71795ecce4e67f3e0ed1bba064b90bd05449f725239f6c64a9d73
+#+busybox-iproute2.94cb4fb51f4e8a0d2459c02674d17470c783e554087ff8201badaff7b269c914
+#+busybox-iputils.af614e89c894e03924f1c90cf494b8379f9cba70a43d50c1413ab5d85d7e7e11
+#+busybox-net-misc.32acaca88c420a42a7b166f0118aabb51eeb104c08bfd7aa4a63f4a1ac471d90
+#+busybox-net-tools.51bcca55b4cd2941485aa75332689d0b8445ba8701a61cb4e42a56705972d2f3
+#+busybox-traceroute.5257a4b38f73e06d7f7fd9d585ebfbcfca618b2d350708bae6da88db153d915f
+#+busybox-wget.1828a78d247b814352c0a62d0d363fbad588dcef4cd920d35734d41043612277
+#+busybox-chpst.c447fefcd27efbb192d8f3693738b3fa74a2d88da8d9351878d98e52971b5dbb
+#+busybox-console.819f0a43134343586b4831db94dcb6fe8a56b55ca9d5158e788a7d283b7cc55c
+#+busybox-getty.0590f1111800572ba4aa73d33a50585cbbfcd54f5269f2914df0fa2bc1853c57
+#+busybox-i2c-tools.8a7357848cfbc85eba31df4016bd961ed44f8b53101ddcaed371893b5688287e
+#+busybox-linux-extra.5e6dfc5168b8d7a12c1094870e2f72e89dd8508238f3c8f7319bf320d81a6ecf
+#+busybox-mtd-utils.88894a8c9ffbda9751b648fad9d79ef96741f022c748bd3ece9a612db6309f80
+#+busybox-shadow.af645c989b36c12549f4766647014ff09472421ca0a469c1a0f7acfb402ca42c
+#+busybox-su.f808244ad4eb9e8ba65ef85254ce68a2bdd371de9f713697e20f5d2907ead0f2
+#+busybox-util-linux-priv.ba141805065abf2a502b70e7ce955c5165b8725f1a204277b457e238ed24475d
+#+busybox-logging.2fa3102e85347e07f10eb8ac9ca21c478f39f4ea255a4d7ac1ca26016e0da648
+#+busybox-cron.f81b3b6a65ff08e200829e5a2117edef6b38e8ed25f8517ce148a4dbd2ce9696
+#+attr.366026274b2318aa68aab95342c0824993cd87b6e8eea9673806e58887ce750d
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+diffutils.f595d46864dea091a112d3ea082ea1d930885e4bfa4298a6c66ce176115df8f7
+#+patch.37ad4ea29ff465fb5ef543bb5434445296beb16c513eeec5ae6f3e69fa1ed7f0
+#+flex.ab225b1901dff619996a02fe1050de403a024475c2b6a432707014dc28114d07
+#+bison.cdff3c99d312ecf9f6b3a714f436e71bae3733bf2355d29e4e11ffe3d50cc0be
+#+rsync.0cb8aadcd0ce6112d97ff4791e1ca60fec23b2f9cfba07f58d3ea1f7b8265660
+#+execline.d50f3f7a78cfe50b3526c9a877d90f5dd0af60372d717cb6a5e343415e95f50b
+#+s6.1ad0b529f4324fda577d196c6994cb0dc32ed7d92f7ba50e1395cdc2374a450a
+#+s6-rc.208d0331edde347fc36cf656d70a96c73dae404c5186cb1bf9e9eaccb42d2572
+#+s6-portable-utils.e126bd3cb76653521f81dcdcbf0187628caea370c7c307b4fcc054f72826a849
+#+s6-linux-utils.b13b3c79516949c7945e1bb990982ddb783096ec32ccb85ebcefd97a32362729
+#+s6-linux-init.9acea68842cdab731dc0da8c064a10dbd98502cca3ac160a277183cd89c88e91
+#+mdevd.89466f2d76dc425aa481ab91d73cd10b5c4c68ece63c90627b75e82bad11ac6c
+#+s6-dns.eaef0d053053fb51e9fc258982d1268c6b26f1babee7818d4663ef61ef8cc407
+#+libressl.13729215dbb743a0fb10127fac6d396c1a140dd3a53b1ed62065472e8586acd0
+#+s6-networking.9654dbc333c7d7f2d8ee32ed269f7fa8e369dabeecc2b844460571acfb9fd465
+#+zsh.1a9e6c9c487ff782474a7de120940351054c19445c775c808c1fdd272262c311
+#+pthbs-banginstall.218506c0794f6679abbb9343da26d20157aafedd81266f761eb2696c0a312119
+#+aat.337d96e3e10fe1efd7993355cac1ace40820cbf3ad0021e15b86692d7712dd25
+#+confz.43c95b2d573592a66a00afa99ae0a5afc57a4a500432bba4e5a235bc8a7eb75c
+#+containers.1d896a59b8849b2a0871ded518c6231775140bb36975acdfc6e4e1e78635d52a
+#+fileset.3b7f30fce859ff7a545a9ea01ec40d2564f3d7cee9cdc3247d7ac16b7c5cb424
+#+logincaps.ec1a2365c69e934d1c800d9d471ebcc81b21b7f9841fd69481db7e595df4830d
+#+snaprep.03a5b919875e375ebe8079ec48e1b2534aabe853e05f25385db6ad2faaebf8b1
+#+curl.44aba2502f0311b606fa89f26132c85bce0dc9e770e4485fef25a7040046b333
+#+git.79d585616a08f2b6dd55c586ced432899c301a68a7f08300b9db8be1117895fa
+#+xbps.aa25bcdd58e8ef03c5170226008cb363f060c026c63345b1483b98e28a6d8d02
+#+apk-tools.f95a9cc6e15c3caa3fc011561c831baa92ac41bdfd079005198d840f5669d9f2
+#+getent.c91398998de3e3a5f0e9426f1af5aa9d89d0929705a593cf3f1e291a79e8a8fa
+#+getconf.348ded15b8ff20d55a9b2466076391f922212fbc24e7e707d6ee9dbf40c4e917
+#+iconv.edf2ef75527d2b3fd3ce0d1c65f74baa766a0dbc5de1cdbe4d5fe4e6bf456df7
+#+libcap.d615b3de2cbbfe88978f4957402e79f535710f4a4044e97e454fd5b341538adb
+#+applyuidgid-caps.412d5c73f82883f3d8aec924bc7e1f7936132917ca13b2f00a4e2e52e1f9612d
+#+ccx-utils.fcf5e926df3e6c3b16f595c2f20c7ac57820eeb59a24f32772ded13f8b779884
+#+user-env.20aa00f639ce9d862cb7ea9566295cb38543942465fca0f692732fd8c4beee2c
+#+strace.65dd9dbfcc4dac9149fbde5c37c8550cebeb5cee016bd272c4f1105d1d307c49
+#+mlog.918236ea0c7178227da102ff8731ca783732775cff22f2c8587c7db690ffc641
+#+findutils.fd67178086fa5852591f7c9c0d407d57d59f52fcb5856644da5141a398331422
+#+nawk.c2c2f30264808844207b675b7651711207891f09daff4fb1f022b305a2003d52
+#+squashfs-tools.979a5b1e5e641d36b5440404df992d77d782cee42d514aaaaa304ea27980f363
+#+mandoc.b72f1759b2fe7143c5cc2488a1be1763db80698b6fb80f9b86d43a0f9eaf1fd2
+#+tinyssh.ff381ab9c4e3239ea7295755cca7f73fcfbe84ece3ee8d769a5022cb722cf95c+
\ 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.9dab80ac93aed6230629ecab7255ae7372869b58b46a2de831a686e20c221d67-
\ No newline at end of file
+#+linux-qemu-guest.8a179311599b13c66bd39b94d8087ba37c527bb38996ea9a3bfc71fd21fa271e+
\ 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.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+libarchive.a64e09964f3c30598ebcc71de6698586cea2f1d36a8e4fd84275887ce54a38b3
-#+libressl.4b4d2aedd3016e7d66bc82165af68bdbfe931bc0b4f093e4290e56b51c56a461
-#+pkgconf-pkg-config.24b2e23832afdac72a6b277a18c247082819a688fbe710ad00f462cdda2d1fe7
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+libarchive.25a0001554ed230bb318909b68eeeb86aa4977738f91233517bc8d2a2cf7b81d
+#+libressl.13729215dbb743a0fb10127fac6d396c1a140dd3a53b1ed62065472e8586acd0
+#+pkgconf-pkg-config.1168c4c769c5a6ca0574996fb5dee2d3fab38d2ecf1a7ba7325154dcb4c31262
 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:.
 
 
@@ -138,9 +138,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/zsh b/variants/root-x86_64/zsh
@@ -1,38 +1,38 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+m4.c8d88d8aec319136135088f0afb3abd0c9d406b2e3d6e36ebbdba13c9a6da204
-#+netbsd-curses.300413b0c98aa121e0381e1cb84258e15d265efafd955cbf8c60b596d71c6c15
-#+libbsd.92d6a6492a32ab72b82b4e6a855d66c18b9bbba8cbb142b9805f1ca73821288b
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+m4.1966f1cc47deb93b6cc0630a2b4037285eb5de4080e2152a0e54f0e842b7bee8
+#+netbsd-curses.0040aba8c500abe730a1210dd4bd5d531129063562d3d85e354e34853322f48d
+#+libbsd.845fb62a740434ef5f994720dabd5f5f828041ac2ee16aa468ed01d6bb263b20
 #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config
 #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:.
 
@@ -173,9 +173,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/zstd b/variants/root-x86_64/zstd
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+busybox.e51472910d4424748579e888522c1a944c9cb58f082b1adccf08001f9a3000c9
-#+busybox-bzip2.c7eacd9743e4f3c7c746e27279b02e7573b3009c793eb9c0989e11f8bf2a369a
-#+busybox-gzip.5e41b40430c41a531c939d2229260e26c0bc1028b2bbfc8f501278428fc821f8
-#+busybox-lzop.eb8cfac44e901168075a460e0e86751423060eeb4bde419fc61edf3c951571e1
-#+busybox-unzip.fa81c77f9cfac96031fa0a1ca9ca7c5df6b31935567c1731bac328a45a83e04a
-#+busybox-xz.7bfadb9d36be3b38f28b37668ca5233f823023ed513cf58c6b5367120d18d187
-#+busybox-cpio.8d0d8cbfdd72a452277bbaeb38edc75257be41365bf305d621e3b0b47863cedf
-#+busybox-dpkg.2296458c8c0e206972e1122ad0d6ca22408a9c6a84ae3139a1962449f5ffa6f1
-#+busybox-rpm.fe416af4ee539dd9d07d59a7f92c278957679fa33a48016378c34f072e903860
-#+busybox-tar.c1cc4be9539039d3bf7adcb77c31b3207b07bbee2991b9a4cb28915f566f53e7
-#+busybox-ed.87cafa25ac5637ed143d1d909c5f8915110ce9216e0fecf210e5a81c59fce4a4
-#+busybox-sed.13ec14f2b69fdc23d0acafaa02c3b81971e543281ecb22a846f98feb89fd486d
-#+busybox-vi.0c1dadad19f318a0b7c016d12600e5a33a048b4c347ce26963bd7b4fe872c051
-#+busybox-xxd.656b0c21a0af2afa8379cdbc471afdcb38324a8f2fe8e01b74e44fb2da631b40
-#+busybox-process-extra.f2ecba2d4caf573847c1001fcabfe13c5c9d31f29b42f7d01b6a6124c40f3c53
-#+busybox-procps.d6476b44c5df8542e05371a6d2b38fdccf4ea3bba9fcd1f08c401990aa320a58
-#+busybox-psmisc.c6b46a2c15cced6d3703532e2e43fb0152f63d8b0a9c888f94bc2b51b02e3136
-#+busybox-ash.6a26c74465c22ad6e60d2b7304da2e101d62b6f168b20e859120bd4258a44fa9
-#+busybox-bc.ff9424910f7e0c8d57433fbb8fbbefedbcb841e36755469566bada0a519c9ac0
-#+busybox-coreutils.2a4cefb5b4f8afcf08fcbddf28852700cf2a606b94b28f9f2ba17bfa83382c10
-#+busybox-coreutils-extra.2814880a9591ba590b41f7b690d712ebb02d8b0fef278b5589463c24f04fdef0
-#+busybox-daemontools.d2b8e9b8058703386ca8dcbc4997da47bab35ca5832daf1886e569dde2d7f735
-#+busybox-grep.f241f26d88f14e683c883b44376ab6ef760a039de39ca311deeee78109fce51c
-#+busybox-misc.40991204891ed1bbe75c36206b8a0d61c99b2de75ee5c56f3c0d2613dfcb97c5
-#+busybox-sh.602a3a3a29cbf7342c4a78fab973b01f789569c35447dc44a25c4ab88c7c66fd
-#+busybox-util-linux-unpriv.65a8568a70410fcde076f97652e9b553eb5cb085410d9cef0bdc23ec7cc821c3
-#+busybox-findutils.53b8c052e7d869dcca953f4bcee81977c8b052d0e22549b213ae2483e9a9551d
-#+busybox-awk.835842adac9f9165ba7f318c64cdd51c098be3e24c57c278f88c666b67817687
-#+musl-cross-make.109bd6e70dc3775d64304010d8c5777eadd40bec6f6da9529eff6221d627593c
-#+gnu-make.c14275b2ec55e9e0c2cacf5ffc08ac1384c43df71a69d363bb05aca94a04fb2a
-#+busybox-diffutils.9b6d718e6b4b3101ed627a148eb3327a317a453c4016b9d9162a2fdef9a674a9
+#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox-bzip2.bf6d3fff8a2a592519bfa9a3060947bbd7e89fc459839ce8d60f8e55cd7a17c9
+#+busybox-gzip.2c93b50b6fa564e50f41206806324c1c9157aaca9bd7cc51fda7c65acc5ceb12
+#+busybox-lzop.46efcd17b70bfba81bca083dd063f0495ac603402105e627c1d1f2a0fe080dd2
+#+busybox-unzip.e34e848006dbe144ed3f946dc6b2d1a8b28e021061853762fc482338e122dcc8
+#+busybox-xz.bceab99838e6b5f689559820be23bae1eeaa8f3019b9bbdbd1d4b7c75bae3376
+#+busybox-cpio.673d8a18ffa22193546a489c800ff2ffda498cf78db0d2300938ff0e5a4b8720
+#+busybox-dpkg.d8d7f8d0f7f77ef6098413ba356ddb83776b2f9dc3be7ce3a7a542edac3491d4
+#+busybox-rpm.89674c39f23a941f6319ba37ad6a9f73a77eb7832cc275433e5e8184b8a85562
+#+busybox-tar.58171a5a4818368b65b5b220e230180e4c1d26098ef8d698431891a9908e08bc
+#+busybox-ed.aba4402d6c04bb1e5cc0129967bc0f8ffa6be58e44397f229b8f693692cbde0a
+#+busybox-sed.174f856e57b5c4538131e95fcba94acc2c975554759c02c2586302329eee1861
+#+busybox-vi.4f9320ed934d6cb2da75e531ce1cd34a7f408b62ff8ca33e02fa80ff7c419330
+#+busybox-xxd.d4622001fa57363643918c3e3d06d8c5fca8e9670cf23b98796648e7a446d12c
+#+busybox-process-extra.7d2234c271f90978c13f86369a313a65d9c150e674272ebaeeb228bf3e48ce99
+#+busybox-procps.521db46a21b2708c95cc1407b536a4ddf7deb22b6f761f0c28baf852d3b677db
+#+busybox-psmisc.7c109a32f3f1e4c15099ae389160f1d1d5c89de99d0830f1d762197f1b210d01
+#+busybox-ash.8708a18164637fd8f09cc71207b2904e784a660f34968a6d3330154db2dc35ee
+#+busybox-bc.c255559dab7514bb8f0011056d939ec6dd5a10742a107cf3e946bcbbe57e6be5
+#+busybox-coreutils.e93a3a4a8be0f35be0fb5bda094c7d905aac5c858a4a7bdfe57996ae237e0b89
+#+busybox-coreutils-extra.c6c285f0ce7e6d84502fbe46ec37f0e5bf8bb44bee8d79effaa56f5fbd4ddbc7
+#+busybox-daemontools.45b4e31782885ec185ba4d25d0c711b8699ff626259dfc77a2a7d9388f060196
+#+busybox-grep.ac0b1ef13614f08127319d9d93eb22e027a60aa33ac1ad2967f95630c5d4ef87
+#+busybox-misc.655222d9978e7095b402a19850f09b8b7536e8d2dba53cb711f78d5fc44baa4e
+#+busybox-sh.9cd7ff2ce700651e9c2cf2f651370a6e1f0971679f3ec888682513fb2ac7939f
+#+busybox-util-linux-unpriv.5cef862b87a8993f3895a9f3c21d0b6b0b065d66367fbb47d0e998070518e85c
+#+busybox-findutils.b3e3c38476dd7c213f5672097a515b3f79d542ee8abf870479f4c060c1dcf28e
+#+busybox-awk.6d8df3fb4408d73fae53962f6d07b186fc06c340933d8713c667cd0f56df58ca
+#+musl-cross-make.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
+#+gnu-make.d116c3c80a50940a24034d5edb53db36ff2ff077454d2d2c7f003a1a754fd055
+#+busybox-diffutils.8bcb847574fce517484d1e17cf44fe01afe6094f1815f3508c8a6ff623e59b42
 #@untar:-z:sha256:98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1:.
 
 
@@ -111,9 +111,9 @@ $2 == "library" { link($0); next }
 $2 == "lib" && $NF ~ /\.l?a$/ { link(s1("library", $0)); next }
 $2 == "lib" && $NF ~ /\.so(\..*)?$/ { link(s1("library.so", $0)); next }
 
-$2 == "share" && $3 == "info" { link(s1(r1($0), "info"); next }
-$2 == "share" && $3 == "man" { link(s1(r1($0), "man"); next }
-$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc"); next }
+$2 == "share" && $3 == "info" { link(s1(r1($0), "info")); next }
+$2 == "share" && $3 == "man" { link(s1(r1($0), "man")); next }
+$2 == "share" && $3 == "doc" { link(s1(r1($0), "doc")); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }