mrrl

commit 5658b04274e891b3b7201f49e201f60959ac4c55
parent 939fe60a09e26f619b5b47f13089dc3ac6c3b161
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Sat, 29 Nov 2025 16:09:41 +0000

Fix genlinks substitution rules for man,doc,info

Diffstat:
M
templates/genlinks_mini
 | 
6
+++---
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
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/bison
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
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
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
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
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/flex
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
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
 | 
12
++++++------
M
variants/ccx-x86_64/gnu-make:bootstrap
 | 
10
+++++-----
M
variants/ccx-x86_64/gperf
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/iconv
 | 
64
++++++++++++++++++++++++++++++++--------------------------------
M
variants/ccx-x86_64/kbd
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/kernel.environment
 | 
6
+++---
M
variants/ccx-x86_64/libarchive
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/libbsd
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/ccx-x86_64/libcap
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/libcap:bootstrap
 | 
12
++++++------
M
variants/ccx-x86_64/libcgroup
 | 
76
++++++++++++++++++++++++++++++++++++++--------------------------------------
M
variants/ccx-x86_64/libelf
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/libmd
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/libressl
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/libseccomp
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/ccx-x86_64/libunwind
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/linux
 | 
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
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
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
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/pkgconf
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/pkgconf-pkg-config
 | 
54
+++++++++++++++++++++++++++---------------------------
M
variants/ccx-x86_64/popt
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/ccx-x86_64/pthbs-banginstall
 | 
64
++++++++++++++++++++++++++++++++--------------------------------
M
variants/ccx-x86_64/pthbs-sandbox-rootns
 | 
8
++++----
M
variants/ccx-x86_64/rsync
 | 
76
++++++++++++++++++++++++++++++++++++++--------------------------------------
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
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
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
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/bison
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
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
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
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
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/flex
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
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
 | 
12
++++++------
M
variants/root-x86_64/gnu-make:bootstrap
 | 
10
+++++-----
M
variants/root-x86_64/gperf
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/iconv
 | 
64
++++++++++++++++++++++++++++++++--------------------------------
M
variants/root-x86_64/kbd
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/libarchive
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/libbsd
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/libcap
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/libcap:bootstrap
 | 
12
++++++------
M
variants/root-x86_64/libcgroup
 | 
76
++++++++++++++++++++++++++++++++++++++--------------------------------------
M
variants/root-x86_64/libelf
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/libmd
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/libressl
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/libseccomp
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
M
variants/root-x86_64/libunwind
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/linux-qemu-guest
 | 
84
++++++++++++++++++++++++++++++++++++++++----------------------------------------
M
variants/root-x86_64/lnstools:bootstrap
 | 
18
+++++++++---------
M
variants/root-x86_64/logincaps
 | 
72
++++++++++++++++++++++++++++++++++++------------------------------------
M
variants/root-x86_64/m4
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------
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
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/pkgconf
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/pkgconf-pkg-config
 | 
54
+++++++++++++++++++++++++++---------------------------
M
variants/root-x86_64/popt
 | 
70
+++++++++++++++++++++++++++++++++++-----------------------------------
M
variants/root-x86_64/pthbs-banginstall
 | 
64
++++++++++++++++++++++++++++++++--------------------------------
M
variants/root-x86_64/pthbs-sandbox-rootns
 | 
8
++++----
M
variants/root-x86_64/rsync
 | 
76
++++++++++++++++++++++++++++++++++++++--------------------------------------
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
 | 
74
+++++++++++++++++++++++++++++++++++++-------------------------------------
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
++++++++++++++++++++++++++++++++++----------------------------------

344 files changed, 8192 insertions(+), 8192 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("{{infodir}}", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("{{mandir}}", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("{{docdir}}", r1($0))); next }
 
 $2 == "{{configdir}}" { link($0); next }
 $2 == "{{mandir}}" { link($0); next }
diff --git a/variants/ccx-x86_64/aat b/variants/ccx-x86_64/aat
@@ -1,34 +1,34 @@
 #!/usr/bin/env pthbs-build
-#+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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+zsh.325b93f72e4bf51ac1200fc1ce78c9f5b7816d918e9d0d3039b57c763c566fe8
+#+pthbs-banginstall.7fbeb4606d18d8831fa3a3cd0b54ac8246eb08724658936e2e08d2b70255ae96
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+patch.513284d47e0d58e52d187538123261e101004a56a2a737ee2c0387393bb3b7c6
+#+libressl.192bb08ee9644179a45b7c4366f30513c343ff485bd4dcd7284f4c9f62331b89
+#+zstd.460caa2b685e4a46051699008e5b84dbac41a7864fd6bdfb8b558a7a19b60fb1
+#+pkgconf-pkg-config.eee00cb7c7be3e5f43736405b54c5c2a14023c2a947a07594e3c68e0788f44a3
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+skalibs.30adbb9c3b20a4bea979c7277597614a95300e7de798d62175672185c4368cf3
+#+libcap.f109f8cee8c473196a5ebaedd85fb77711866e995c2f07e8b0325e45333b9db7
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+m4.043d1d87e60653f58d0b677f9067e8bd2b14613473ebbf74e8afe3dfae7c1239
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+m4.043d1d87e60653f58d0b677f9067e8bd2b14613473ebbf74e8afe3dfae7c1239
 #@untar:-z:sha256:39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87:.
 
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/bison b/variants/ccx-x86_64/bison
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+m4.043d1d87e60653f58d0b677f9067e8bd2b14613473ebbf74e8afe3dfae7c1239
+#+flex.362d4cfb0497ec95d8ed3aecf8f68a36951b7ebf163aa7540fff7e3eb02ecbaa
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+gnu-make.e7a4a6e3ee24dee37e06f6aec6ab7d82bb405aeba9b7f07f4efd222033e8a538
-#+musl-cross-make.43fb9dd4736189f7d854bf020f902893965e273641ceac80991bf9070179564b-
\ No newline at end of file
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+gnu-make.7c32a3321e2b2e3520736dbddff3f6c9319224345a1d8b7ce500a5cb3eb34fe9
+#+musl-cross-make.9307d21e825b78aa2ba27cbeeef39903480de54633a757ff3939e9c576fcba60+
\ 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.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
-#+gnu-make.e7a4a6e3ee24dee37e06f6aec6ab7d82bb405aeba9b7f07f4efd222033e8a538
-#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.7c32a3321e2b2e3520736dbddff3f6c9319224345a1d8b7ce500a5cb3eb34fe9
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
 #@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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+busybox.637675fee768a159a41d4ffd1f3bddb6c3af0104612d889709d5746f681f9a53
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
 
 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.43fb9dd4736189f7d854bf020f902893965e273641ceac80991bf9070179564b
-#+gnu-make.e7a4a6e3ee24dee37e06f6aec6ab7d82bb405aeba9b7f07f4efd222033e8a538
+#+musl-cross-make.9307d21e825b78aa2ba27cbeeef39903480de54633a757ff3939e9c576fcba60
+#+gnu-make.7c32a3321e2b2e3520736dbddff3f6c9319224345a1d8b7ce500a5cb3eb34fe9
 #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox
 #@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config
 
 PATH="$pthbs_build_environment:$PATH"
-mcm=/home/ccx/versions/musl-cross-make.43fb9dd4736189f7d854bf020f902893965e273641ceac80991bf9070179564b
-make=/home/ccx/versions/gnu-make.e7a4a6e3ee24dee37e06f6aec6ab7d82bb405aeba9b7f07f4efd222033e8a538
+mcm=/home/ccx/versions/musl-cross-make.9307d21e825b78aa2ba27cbeeef39903480de54633a757ff3939e9c576fcba60
+make=/home/ccx/versions/gnu-make.7c32a3321e2b2e3520736dbddff3f6c9319224345a1d8b7ce500a5cb3eb34fe9
 
 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.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
+#+linux-qemu-guest.58d4f4bad4dd7b92645182d33c8cb9286cadb0bc7d50ca27aaad60b1bdcdb79c
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
 #@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.0b87e50abd2e72f360d3a14350ab6456b6ba7f4d4fae36e48fdff6d8612dfd94"
+CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux-qemu-guest.58d4f4bad4dd7b92645182d33c8cb9286cadb0bc7d50ca27aaad60b1bdcdb79c"
 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+certdata2pem.f8e15405ba876d5216d996e029f7af74a7c824c315661a6ce4ddadfafe89eee1
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+skalibs.30adbb9c3b20a4bea979c7277597614a95300e7de798d62175672185c4368cf3
+#+s6.3b403d7bde45dd92c0e7ff1d1f7a52f99e2a5b12fa95b8428b6f6c9d4aee52e9
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+zsh.325b93f72e4bf51ac1200fc1ce78c9f5b7816d918e9d0d3039b57c763c566fe8
+#+pthbs-banginstall.7fbeb4606d18d8831fa3a3cd0b54ac8246eb08724658936e2e08d2b70255ae96
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-dosfstools.2afdb55891bff57f4b4c599283a23759782dc3e166b477a9b5f36953fadde0bd
+#+busybox-e2fsprogs.7a53ff7c929b1b231da337387efae0e96d7530b416bb8032939fa7af19e82cd8
+#+busybox-iproute2.bb1fe8e36cae2ddd7410b257697ea3d38cf9cf945ce48f6ddc10951608d9b24e
+#+busybox-iputils.8f83589f92fbc2eb3802af721506b147df52000608b2e83f0cebb4c8284d7a7f
+#+busybox-net-misc.4d3ad9dd782f123d153e1cc5e98a46912530e86a77c169d8dfcb4163c848e248
+#+busybox-net-tools.50d06b6df41abd32e728f7e76f712ab96df6111f43db69891aa581a84a7597de
+#+busybox-traceroute.81214a948eb88f57a157110ecbc6d6241b892e31ca90f9d570c54c64ddaa9028
+#+busybox-wget.2f3ec41305642b93750f7c75965c1abdc388a377b2416e0c58e601912c0ce86f
+#+busybox-chpst.2f3c79c5768d66ac864ea1494b09361289d5d5c0ff07ef131e2eb80df9feb27e
+#+busybox-console.d5fd6e246472f48c8cfd5eda826e39dea0a8eb741351a1e64b99e3df205003bd
+#+busybox-getty.41835794fd8b33a890810bf1a293a3b01cee48b5bd54633e58bcf149518f8066
+#+busybox-i2c-tools.0ee2d67f99952b176ee3de457f708be32287505ce72f3f40a1ae294f434f4fbc
+#+busybox-linux-extra.0713f828e91e01a4bd0056a5c744484a0571bca0b01d8050cd3ca846e2163eee
+#+busybox-mtd-utils.54d3cfde3c81042fbedcfc4cdc4673177597961fa058442222c7aaf7e9090d52
+#+busybox-shadow.b9a483c4453d0b8bc756a9f02e39d23dfd4e91268223fa91d31c32a48b5ee7a6
+#+busybox-su.1bd0037874bc8fd6489cb40dcc870e644faa597a77d6af44973b53579b14cb27
+#+busybox-util-linux-priv.dd20997468f14ce4966600ed415628265143ceb4363a15b3f8df57cdbfc10cd6
+#+busybox-logging.68452a1a360d66722153b44198e0e17ded306a7f844ca15918057e152ea1fb23
+#+busybox-cron.a56ca8ab2cdf0fb35717b1a259b924eccf7ab022b2db6fa60fe32f79f864adb2
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-login.8befd51081fec92aa05f49a5c3a06e84ae11c73eb997f40fd4a7b4cce41200b4
+#+execline.6a961c05ada135998914a161cd31f4095a61aa997985c31062308e79f5b1502e
+#+s6.3b403d7bde45dd92c0e7ff1d1f7a52f99e2a5b12fa95b8428b6f6c9d4aee52e9
+#+ccx-utils.79d2595fc3f4d2202135086c75fcdb9358f359309d6829ba10626160d4d7e134
+#+applyuidgid-caps.c368a34f4046173fbd8b5c8bfae2cfa9dc9d78450ad309be6f55709b3053be8b
+#+easyseccomp.877a389282e3693844309ed5b9669aa65d8e39830bb5d4439ce364247d3e969c
+#+mlog.2821606371e8a49b226ed69ebe87c51afc0ecc3ae093156d17db21dc0ac17fc2
+#+abduco.29e012b8fbbc0da623684bf5330ad7e7249cac7186af8339004f4ddfe58450bf
+#+nawk.e43297ba805f35b939ee83a487deb43893662c343cb9ec34f0247546f58369ca
 #@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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+zsh.325b93f72e4bf51ac1200fc1ce78c9f5b7816d918e9d0d3039b57c763c566fe8
+#+pthbs-banginstall.7fbeb4606d18d8831fa3a3cd0b54ac8246eb08724658936e2e08d2b70255ae96
+#+execline.6a961c05ada135998914a161cd31f4095a61aa997985c31062308e79f5b1502e
+#+alpine-keys.2f255a83c1efbe0bd164936966600ce7b06f034c791bd9169cef9bc918c6e11f
+#+apk-tools.6648895144810439fa0861555cd67b4514b75498313b2a58bd0542c322e8049c
+#+xbps.62854402f2d7c6c65348fd8de06cc537bdbd41fdca381b0de879bca1de7e7000
+#+container-bin-image.6858bb13f1418b7cbe9c2952d740e598aade7e4cabf1fc0fe75fffdec49e41f8
 #@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.f5e6eb2c996e52880a4f3ed48eb4c3c4b0f55dfea8c0e9f73442d8f4be272656/command/apk.static' "${dest}/deps/command/"
-ln -sf '/home/ccx/versions/xbps.beb27d692aab5937397886d5dae02bb9ae4cde1b38116393419a0f4139c390ec/command/xbps-install.static' "${dest}/deps/command/"
+ln -sf '/home/ccx/versions/apk-tools.6648895144810439fa0861555cd67b4514b75498313b2a58bd0542c322e8049c/command/apk.static' "${dest}/deps/command/"
+ln -sf '/home/ccx/versions/xbps.62854402f2d7c6c65348fd8de06cc537bdbd41fdca381b0de879bca1de7e7000/command/xbps-install.static' "${dest}/deps/command/"
 
-for f in '/home/ccx/versions/alpine-keys.b69be0462f992a165e9c051911070a16bc72f6d04c5f2c4d5583e8c7dce60650'/keys/alpine/*/*; do
+for f in '/home/ccx/versions/alpine-keys.2f255a83c1efbe0bd164936966600ce7b06f034c791bd9169cef9bc918c6e11f'/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.b69be0462f992a165e9c051911070a16bc72f6d
 done
  
 mkdir -p "${dest}/deps/keys/void"
-for f in '/home/ccx/versions/xbps.beb27d692aab5937397886d5dae02bb9ae4cde1b38116393419a0f4139c390ec'/keys/void/*; do
+for f in '/home/ccx/versions/xbps.62854402f2d7c6c65348fd8de06cc537bdbd41fdca381b0de879bca1de7e7000'/keys/void/*; do
 	ln -sf "$f" "${dest}/deps/keys/void/"
 done
 
-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/"
+test -d '/home/ccx/versions/container-bin-image.6858bb13f1418b7cbe9c2952d740e598aade7e4cabf1fc0fe75fffdec49e41f8/container-bin-image'
+test -f '/home/ccx/versions/container-bin-image.6858bb13f1418b7cbe9c2952d740e598aade7e4cabf1fc0fe75fffdec49e41f8/container-bin-image/if'
+ln -sf '/home/ccx/versions/container-bin-image.6858bb13f1418b7cbe9c2952d740e598aade7e4cabf1fc0fe75fffdec49e41f8/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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-dosfstools.2afdb55891bff57f4b4c599283a23759782dc3e166b477a9b5f36953fadde0bd
+#+busybox-e2fsprogs.7a53ff7c929b1b231da337387efae0e96d7530b416bb8032939fa7af19e82cd8
+#+busybox-iproute2.bb1fe8e36cae2ddd7410b257697ea3d38cf9cf945ce48f6ddc10951608d9b24e
+#+busybox-iputils.8f83589f92fbc2eb3802af721506b147df52000608b2e83f0cebb4c8284d7a7f
+#+busybox-net-misc.4d3ad9dd782f123d153e1cc5e98a46912530e86a77c169d8dfcb4163c848e248
+#+busybox-net-tools.50d06b6df41abd32e728f7e76f712ab96df6111f43db69891aa581a84a7597de
+#+busybox-traceroute.81214a948eb88f57a157110ecbc6d6241b892e31ca90f9d570c54c64ddaa9028
+#+busybox-wget.2f3ec41305642b93750f7c75965c1abdc388a377b2416e0c58e601912c0ce86f
+#+busybox-chpst.2f3c79c5768d66ac864ea1494b09361289d5d5c0ff07ef131e2eb80df9feb27e
+#+busybox-console.d5fd6e246472f48c8cfd5eda826e39dea0a8eb741351a1e64b99e3df205003bd
+#+busybox-getty.41835794fd8b33a890810bf1a293a3b01cee48b5bd54633e58bcf149518f8066
+#+busybox-i2c-tools.0ee2d67f99952b176ee3de457f708be32287505ce72f3f40a1ae294f434f4fbc
+#+busybox-linux-extra.0713f828e91e01a4bd0056a5c744484a0571bca0b01d8050cd3ca846e2163eee
+#+busybox-mtd-utils.54d3cfde3c81042fbedcfc4cdc4673177597961fa058442222c7aaf7e9090d52
+#+busybox-shadow.b9a483c4453d0b8bc756a9f02e39d23dfd4e91268223fa91d31c32a48b5ee7a6
+#+busybox-su.1bd0037874bc8fd6489cb40dcc870e644faa597a77d6af44973b53579b14cb27
+#+busybox-util-linux-priv.dd20997468f14ce4966600ed415628265143ceb4363a15b3f8df57cdbfc10cd6
+#+busybox-logging.68452a1a360d66722153b44198e0e17ded306a7f844ca15918057e152ea1fb23
+#+busybox-cron.a56ca8ab2cdf0fb35717b1a259b924eccf7ab022b2db6fa60fe32f79f864adb2
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+execline.6a961c05ada135998914a161cd31f4095a61aa997985c31062308e79f5b1502e
+#+s6.3b403d7bde45dd92c0e7ff1d1f7a52f99e2a5b12fa95b8428b6f6c9d4aee52e9
+#+s6-portable-utils.3281a60e1816995c0d473674e83b4b95482a6b96d6a5506e46d9551d5615f656
+#+s6-linux-utils.9a130b392bdf9f95ba6a18fed433a20b3fd649f29bbc7601b737af085d4106cd
+#+zsh.325b93f72e4bf51ac1200fc1ce78c9f5b7816d918e9d0d3039b57c763c566fe8
+#+confz.139e00bd49d855c28a33cb98619ee2be7d0a149282f0e4356924a1fabaa5af91
+#+containers.8dc0446fdafe29bd187a5cb761918fe518ac1e380cfa4c451d6e58ff3c6f4a70
+#+xbps.62854402f2d7c6c65348fd8de06cc537bdbd41fdca381b0de879bca1de7e7000
+#+zstd.460caa2b685e4a46051699008e5b84dbac41a7864fd6bdfb8b558a7a19b60fb1
+#+apk-tools.6648895144810439fa0861555cd67b4514b75498313b2a58bd0542c322e8049c
+#+alpine-keys.2f255a83c1efbe0bd164936966600ce7b06f034c791bd9169cef9bc918c6e11f
+#+getent.3d1b3fb3deda54fce59a56c5c8c97280c214ca59f499c366be7cd3d3f6e14eb0
+#+fileset.a9735363c505b2982c53972ef7a482171d3a9af0345b43d3b6d651d346d5941c
+#+ccx-utils.79d2595fc3f4d2202135086c75fcdb9358f359309d6829ba10626160d4d7e134
+#+easyseccomp.877a389282e3693844309ed5b9669aa65d8e39830bb5d4439ce364247d3e969c
+#+findutils.c3c06ad4b97bd2080b8fa42a9a3d8871c88e61f29a3ec4816a7a0fd076de8c22
+#+nawk.e43297ba805f35b939ee83a487deb43893662c343cb9ec34f0247546f58369ca+
\ 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+m4.043d1d87e60653f58d0b677f9067e8bd2b14613473ebbf74e8afe3dfae7c1239
+#+libressl.192bb08ee9644179a45b7c4366f30513c343ff485bd4dcd7284f4c9f62331b89
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-dosfstools.2afdb55891bff57f4b4c599283a23759782dc3e166b477a9b5f36953fadde0bd
+#+busybox-e2fsprogs.7a53ff7c929b1b231da337387efae0e96d7530b416bb8032939fa7af19e82cd8
+#+busybox-iproute2.bb1fe8e36cae2ddd7410b257697ea3d38cf9cf945ce48f6ddc10951608d9b24e
+#+busybox-iputils.8f83589f92fbc2eb3802af721506b147df52000608b2e83f0cebb4c8284d7a7f
+#+busybox-net-misc.4d3ad9dd782f123d153e1cc5e98a46912530e86a77c169d8dfcb4163c848e248
+#+busybox-net-tools.50d06b6df41abd32e728f7e76f712ab96df6111f43db69891aa581a84a7597de
+#+busybox-traceroute.81214a948eb88f57a157110ecbc6d6241b892e31ca90f9d570c54c64ddaa9028
+#+busybox-wget.2f3ec41305642b93750f7c75965c1abdc388a377b2416e0c58e601912c0ce86f
+#+busybox-chpst.2f3c79c5768d66ac864ea1494b09361289d5d5c0ff07ef131e2eb80df9feb27e
+#+busybox-console.d5fd6e246472f48c8cfd5eda826e39dea0a8eb741351a1e64b99e3df205003bd
+#+busybox-getty.41835794fd8b33a890810bf1a293a3b01cee48b5bd54633e58bcf149518f8066
+#+busybox-i2c-tools.0ee2d67f99952b176ee3de457f708be32287505ce72f3f40a1ae294f434f4fbc
+#+busybox-linux-extra.0713f828e91e01a4bd0056a5c744484a0571bca0b01d8050cd3ca846e2163eee
+#+busybox-mtd-utils.54d3cfde3c81042fbedcfc4cdc4673177597961fa058442222c7aaf7e9090d52
+#+busybox-shadow.b9a483c4453d0b8bc756a9f02e39d23dfd4e91268223fa91d31c32a48b5ee7a6
+#+busybox-su.1bd0037874bc8fd6489cb40dcc870e644faa597a77d6af44973b53579b14cb27
+#+busybox-util-linux-priv.dd20997468f14ce4966600ed415628265143ceb4363a15b3f8df57cdbfc10cd6
+#+busybox-logging.68452a1a360d66722153b44198e0e17ded306a7f844ca15918057e152ea1fb23
+#+busybox-cron.a56ca8ab2cdf0fb35717b1a259b924eccf7ab022b2db6fa60fe32f79f864adb2
+#+attr.9d0c903cf179ede18fe1a49a05a195db29ac38b6c6ab5b1abdc7eb9f883ac460
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+diffutils.488c2d2316a0bba9a3c253c29efd82c804e7794ca8113cf88abb3540dc099903
+#+patch.513284d47e0d58e52d187538123261e101004a56a2a737ee2c0387393bb3b7c6
+#+flex.362d4cfb0497ec95d8ed3aecf8f68a36951b7ebf163aa7540fff7e3eb02ecbaa
+#+bison.27c6a83ae0ffae17955433e3ed30e17d0143c6803b5b2d473d37d6f100edbcb6
+#+rsync.56465848eff83f125caa4ac481ead974c48c26531e6d2a8ebf45425e61c20d3b
+#+execline.6a961c05ada135998914a161cd31f4095a61aa997985c31062308e79f5b1502e
+#+s6.3b403d7bde45dd92c0e7ff1d1f7a52f99e2a5b12fa95b8428b6f6c9d4aee52e9
+#+s6-rc.4ca710f925e5d8357b894c10b12fa9c48548ddd27b2d77e02990ee8ac16f885d
+#+s6-portable-utils.3281a60e1816995c0d473674e83b4b95482a6b96d6a5506e46d9551d5615f656
+#+s6-linux-utils.9a130b392bdf9f95ba6a18fed433a20b3fd649f29bbc7601b737af085d4106cd
+#+s6-linux-init.ad9d70580e0db34c6e9e3d84c5dd57f95393be34868a7d036fecc93648b3f792
+#+mdevd.e4aaf518def9d1f2cb518449eb7f1da85cdb62f0c6562a18d44fdebd4f7ddf88
+#+s6-dns.05c425a7ac82606861034a694c69baef28ae0878a73e8c6eaa381e87b77a17c7
+#+libressl.192bb08ee9644179a45b7c4366f30513c343ff485bd4dcd7284f4c9f62331b89
+#+s6-networking.0de05c36fa94c4ffdb1a185c7c505c704d2c4e42da3559f22c67e0a3928283d9
+#+zsh.325b93f72e4bf51ac1200fc1ce78c9f5b7816d918e9d0d3039b57c763c566fe8
+#+pthbs-banginstall.7fbeb4606d18d8831fa3a3cd0b54ac8246eb08724658936e2e08d2b70255ae96
+#+aat.df44e5b97fabecb1f061a37548b7372e5d0e547248bc31264c66827ef2d12764
+#+confz.139e00bd49d855c28a33cb98619ee2be7d0a149282f0e4356924a1fabaa5af91
+#+containers.8dc0446fdafe29bd187a5cb761918fe518ac1e380cfa4c451d6e58ff3c6f4a70
+#+fileset.a9735363c505b2982c53972ef7a482171d3a9af0345b43d3b6d651d346d5941c
+#+logincaps.520c76d68ea509e78a03f12c611f3044d49f5a6b35699eb26af9309f1e8525d8
+#+snaprep.049a076fdd3363cad8b1aaf1e00036de11e7f373402edc4d41dfecc2f7737b7d
+#+curl.0c5e42c8cc613077680c6606fc878714cf6bfdc8c5a4ea061250578e81cc2b13
+#+git.34c2a544a8e966d6792b75de37dc26a26453159597174e6a062a2654e3125288
+#+xbps.62854402f2d7c6c65348fd8de06cc537bdbd41fdca381b0de879bca1de7e7000
+#+apk-tools.6648895144810439fa0861555cd67b4514b75498313b2a58bd0542c322e8049c
+#+getent.3d1b3fb3deda54fce59a56c5c8c97280c214ca59f499c366be7cd3d3f6e14eb0
+#+getconf.2da75acbe7122ec3e7fcbf54a9ad3a490d74a901c94119aa6f435358c2caffe1
+#+iconv.6a91649dfb45df135e39ecf7859f15bdb9e40f117c98baf944d5b9a6996f0aa9
+#+libcap.f109f8cee8c473196a5ebaedd85fb77711866e995c2f07e8b0325e45333b9db7
+#+applyuidgid-caps.c368a34f4046173fbd8b5c8bfae2cfa9dc9d78450ad309be6f55709b3053be8b
+#+ccx-utils.79d2595fc3f4d2202135086c75fcdb9358f359309d6829ba10626160d4d7e134
+#+user-env.db2836582c0aace28657b35226bffc93cc78b80899690dcf64d343bd2c6186c9
+#+strace.b44d044db708bc3657c7e9f97e92dda6f422e995a46e964b5a9ea4cd8266e809
+#+mlog.2821606371e8a49b226ed69ebe87c51afc0ecc3ae093156d17db21dc0ac17fc2
+#+findutils.c3c06ad4b97bd2080b8fa42a9a3d8871c88e61f29a3ec4816a7a0fd076de8c22
+#+nawk.e43297ba805f35b939ee83a487deb43893662c343cb9ec34f0247546f58369ca
+#+squashfs-tools.7a859b7fcce2e4df8a87e416205401801c639e10c2a2afa1c2a46a322f2f4873
+#+mandoc.f5b2212c82d76d145e40b24adedef2c96ddd4e3a441f3b05fd45aca877a51918
+#+tinyssh.9d9b719dfa34659b9546b09a6ff6e6055309e10894174c6b07f14e4b2a039ea0
+#+system-config.029e0a223dcf9d156f1e73da3695a48df45b4960bc6ebf2197b3dbe44a5e3d4f
+#+system-config-rc.3e6af4a5580da88aeb8a628c770112c9b9326caeb2de199c95118312f1d4d68e
+#+system-config-scripts.03b8a58efe12880493ac44046d874ab73073373989f9ddf03fcede89058fcbe9
+#+system-config-init.c82765d42da63ec41f74c8ff9b9febc8014ad1b3370d6714f26ee38f12eaef4a
+#+system-config-zsh.3165460b37a82b8db837ddacaac9d96011f5268121ddc56b32386855b3ee8c73
+#+busybox.2facf193831d021e16efbb1e2b978030a288672b9fccc062fe94da15c1f76df8+
\ 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+m4.043d1d87e60653f58d0b677f9067e8bd2b14613473ebbf74e8afe3dfae7c1239
 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:.
 
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/dune b/variants/ccx-x86_64/dune
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+ocaml.87086971378f65d79ad102ad7a7e9fa89d5c72ccf1c2ec10958224d573cb65a5
 #@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.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/home/ccx/versions/musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6/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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+m4.043d1d87e60653f58d0b677f9067e8bd2b14613473ebbf74e8afe3dfae7c1239
+#+patch.513284d47e0d58e52d187538123261e101004a56a2a737ee2c0387393bb3b7c6
+#+flex.362d4cfb0497ec95d8ed3aecf8f68a36951b7ebf163aa7540fff7e3eb02ecbaa
+#+bison.27c6a83ae0ffae17955433e3ed30e17d0143c6803b5b2d473d37d6f100edbcb6
+#+libseccomp.d110ccc3ef668358d4b11644f4903d9827ede4d58e90003dd091461a72ca0d6a
+#+error-standalone.99fcf5486410e0761afd06ce93240fa69b57bcdddfdf78516b055009126c57b0
+#+argp-standalone.58f6442454cb6a6f06bddfd8e3386caf55ea6da2a25a39b996ed742853c9db6c
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+skalibs.30adbb9c3b20a4bea979c7277597614a95300e7de798d62175672185c4368cf3
 #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline
 
 
@@ -46,7 +46,7 @@ cd 'execline'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.8261b51ea57569b4b9b73580d7d818bb048f30c489e5204b0b4e2507214a1d97/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.30adbb9c3b20a4bea979c7277597614a95300e7de798d62175672185c4368cf3/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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.43fb9dd4736189f7d854bf020f902893965e273641ceac80991bf9070179564b
-#+gnu-make.e7a4a6e3ee24dee37e06f6aec6ab7d82bb405aeba9b7f07f4efd222033e8a538
-#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+skalibs.8295b5524c8ec0f55727d5f04618f407e72d7656a6c794ddbb706e64f2eae71f
+#+musl-cross-make.9307d21e825b78aa2ba27cbeeef39903480de54633a757ff3939e9c576fcba60
+#+gnu-make.7c32a3321e2b2e3520736dbddff3f6c9319224345a1d8b7ce500a5cb3eb34fe9
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+skalibs.d02daef67b1cb24a3b88d1e5882dbfd0bc1421ab54eb688b3db53a7398fd7d5f
 #@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.8295b5524c8ec0f55727d5f04618f407e72d7656a6c794ddbb706e64f2eae71f/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.d02daef67b1cb24a3b88d1e5882dbfd0bc1421ab54eb688b3db53a7398fd7d5f/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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+zsh.325b93f72e4bf51ac1200fc1ce78c9f5b7816d918e9d0d3039b57c763c566fe8
+#+pthbs-banginstall.7fbeb4606d18d8831fa3a3cd0b54ac8246eb08724658936e2e08d2b70255ae96
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+m4.043d1d87e60653f58d0b677f9067e8bd2b14613473ebbf74e8afe3dfae7c1239
 #@untar:-J:sha256:1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5:.
 
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/flex b/variants/ccx-x86_64/flex
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+m4.043d1d87e60653f58d0b677f9067e8bd2b14613473ebbf74e8afe3dfae7c1239
 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
 
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/getconf b/variants/ccx-x86_64/getconf
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+m4.043d1d87e60653f58d0b677f9067e8bd2b14613473ebbf74e8afe3dfae7c1239
+#+libressl.192bb08ee9644179a45b7c4366f30513c343ff485bd4dcd7284f4c9f62331b89
+#+curl.0c5e42c8cc613077680c6606fc878714cf6bfdc8c5a4ea061250578e81cc2b13
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59
-#+gnu-make.e7a4a6e3ee24dee37e06f6aec6ab7d82bb405aeba9b7f07f4efd222033e8a538
-#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.7c32a3321e2b2e3520736dbddff3f6c9319224345a1d8b7ce500a5cb3eb34fe9
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.43fb9dd4736189f7d854bf020f902893965e273641ceac80991bf9070179564b
+#+musl-cross-make.9307d21e825b78aa2ba27cbeeef39903480de54633a757ff3939e9c576fcba60
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -36,7 +36,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'make-4.4.1'
 
 
-mcm=/home/ccx/versions/musl-cross-make.43fb9dd4736189f7d854bf020f902893965e273641ceac80991bf9070179564b
+mcm=/home/ccx/versions/musl-cross-make.9307d21e825b78aa2ba27cbeeef39903480de54633a757ff3939e9c576fcba60
 
 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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+m4.043d1d87e60653f58d0b677f9067e8bd2b14613473ebbf74e8afe3dfae7c1239
 #@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:.
 
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/iconv b/variants/ccx-x86_64/iconv
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+m4.043d1d87e60653f58d0b677f9067e8bd2b14613473ebbf74e8afe3dfae7c1239
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.0b87e50abd2e72f360d3a14350ab6456b6ba7f4d4fae36e48fdff6d8612dfd94
-#+busybox.bb8729a06821874ffdda0b44281d96c5a935444130c81607f21a25da3629e79b-
\ No newline at end of file
+#+linux-qemu-guest.58d4f4bad4dd7b92645182d33c8cb9286cadb0bc7d50ca27aaad60b1bdcdb79c
+#+busybox.2facf193831d021e16efbb1e2b978030a288672b9fccc062fe94da15c1f76df8+
\ 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+m4.043d1d87e60653f58d0b677f9067e8bd2b14613473ebbf74e8afe3dfae7c1239
 #@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:.
 
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/libbsd b/variants/ccx-x86_64/libbsd
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+m4.043d1d87e60653f58d0b677f9067e8bd2b14613473ebbf74e8afe3dfae7c1239
+#+libmd.5f2331c613014726d9a0e256c779f1e4959c66ba6c5200ef2d6b71d9edda145c
 #@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:.
 
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/libcap b/variants/ccx-x86_64/libcap
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+pkgconf-pkg-config.eee00cb7c7be3e5f43736405b54c5c2a14023c2a947a07594e3c68e0788f44a3
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.43fb9dd4736189f7d854bf020f902893965e273641ceac80991bf9070179564b
-#+gnu-make.e7a4a6e3ee24dee37e06f6aec6ab7d82bb405aeba9b7f07f4efd222033e8a538
-#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+musl-cross-make.9307d21e825b78aa2ba27cbeeef39903480de54633a757ff3939e9c576fcba60
+#+gnu-make.7c32a3321e2b2e3520736dbddff3f6c9319224345a1d8b7ce500a5cb3eb34fe9
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+m4.043d1d87e60653f58d0b677f9067e8bd2b14613473ebbf74e8afe3dfae7c1239
+#+flex.362d4cfb0497ec95d8ed3aecf8f68a36951b7ebf163aa7540fff7e3eb02ecbaa
+#+bison.27c6a83ae0ffae17955433e3ed30e17d0143c6803b5b2d473d37d6f100edbcb6
+#+musl-fts.30b5cb045402962ace69616973997a85e7b8935da5e60605ff3892b0774c06f3
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+zstd.460caa2b685e4a46051699008e5b84dbac41a7864fd6bdfb8b558a7a19b60fb1
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+m4.043d1d87e60653f58d0b677f9067e8bd2b14613473ebbf74e8afe3dfae7c1239
 #@untar:-J:sha256:1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332:.
 
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/libressl b/variants/ccx-x86_64/libressl
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+m4.043d1d87e60653f58d0b677f9067e8bd2b14613473ebbf74e8afe3dfae7c1239
+#+ca-certificates-wip-donotuse.5c3db3677d5fa554c96831eea23af247fc4f7c02e15a1a6f844ff74e94ce043c
 #@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.f309d585e790ddd4652142fbb13effe141e3e3632da7d5c4e44d4b2c3d5aabdd/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
+cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.5c3db3677d5fa554c96831eea23af247fc4f7c02e15a1a6f844ff74e94ce043c/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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+m4.043d1d87e60653f58d0b677f9067e8bd2b14613473ebbf74e8afe3dfae7c1239
+#+pkgconf-pkg-config.eee00cb7c7be3e5f43736405b54c5c2a14023c2a947a07594e3c68e0788f44a3
+#+gperf.d7025f0b012771c52a628dfdeab6a48390c80f6cff0f63e4bbdbaeb5a507e216
 #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:.
 
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/libunwind b/variants/ccx-x86_64/libunwind
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+m4.043d1d87e60653f58d0b677f9067e8bd2b14613473ebbf74e8afe3dfae7c1239
 #@untar:-z:sha256:ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157:.
 
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/linux b/variants/ccx-x86_64/linux
@@ -1,43 +1,43 @@
 #!/usr/bin/env pthbs-build
-#+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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-modutils.c04b5ad58d9aa10f0cb35da21a8c5dc40242b751ef339fa71205c3ced838556d
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+findutils.c3c06ad4b97bd2080b8fa42a9a3d8871c88e61f29a3ec4816a7a0fd076de8c22
+#+diffutils.488c2d2316a0bba9a3c253c29efd82c804e7794ca8113cf88abb3540dc099903
+#+patch.513284d47e0d58e52d187538123261e101004a56a2a737ee2c0387393bb3b7c6
+#+flex.362d4cfb0497ec95d8ed3aecf8f68a36951b7ebf163aa7540fff7e3eb02ecbaa
+#+bison.27c6a83ae0ffae17955433e3ed30e17d0143c6803b5b2d473d37d6f100edbcb6
+#+rsync.56465848eff83f125caa4ac481ead974c48c26531e6d2a8ebf45425e61c20d3b
+#+zstd.460caa2b685e4a46051699008e5b84dbac41a7864fd6bdfb8b558a7a19b60fb1
+#+libelf.9d648794d3b1e0eaac89edb3bcaba665237e3261993ac82d47bc3b88ec677eb4
+#+pkgconf-pkg-config.eee00cb7c7be3e5f43736405b54c5c2a14023c2a947a07594e3c68e0788f44a3
+#+nawk.e43297ba805f35b939ee83a487deb43893662c343cb9ec34f0247546f58369ca
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-modutils.c04b5ad58d9aa10f0cb35da21a8c5dc40242b751ef339fa71205c3ced838556d
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+findutils.c3c06ad4b97bd2080b8fa42a9a3d8871c88e61f29a3ec4816a7a0fd076de8c22
+#+diffutils.488c2d2316a0bba9a3c253c29efd82c804e7794ca8113cf88abb3540dc099903
+#+patch.513284d47e0d58e52d187538123261e101004a56a2a737ee2c0387393bb3b7c6
+#+flex.362d4cfb0497ec95d8ed3aecf8f68a36951b7ebf163aa7540fff7e3eb02ecbaa
+#+bison.27c6a83ae0ffae17955433e3ed30e17d0143c6803b5b2d473d37d6f100edbcb6
+#+rsync.56465848eff83f125caa4ac481ead974c48c26531e6d2a8ebf45425e61c20d3b
+#+zstd.460caa2b685e4a46051699008e5b84dbac41a7864fd6bdfb8b558a7a19b60fb1
+#+libelf.9d648794d3b1e0eaac89edb3bcaba665237e3261993ac82d47bc3b88ec677eb4
+#+pkgconf-pkg-config.eee00cb7c7be3e5f43736405b54c5c2a14023c2a947a07594e3c68e0788f44a3
+#+nawk.e43297ba805f35b939ee83a487deb43893662c343cb9ec34f0247546f58369ca
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.43fb9dd4736189f7d854bf020f902893965e273641ceac80991bf9070179564b
-#+gnu-make.e7a4a6e3ee24dee37e06f6aec6ab7d82bb405aeba9b7f07f4efd222033e8a538
-#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+skalibs.8295b5524c8ec0f55727d5f04618f407e72d7656a6c794ddbb706e64f2eae71f
-#+execline.cacbf244584ed78052217c951ba9788d9e5ec4d2516bfeb23ef9f1bd33e436e5
-#+libcap.b49a295e717ceddd36bef9932f574331ab63a78f6826d8b629c443e20b695e89
+#+musl-cross-make.9307d21e825b78aa2ba27cbeeef39903480de54633a757ff3939e9c576fcba60
+#+gnu-make.7c32a3321e2b2e3520736dbddff3f6c9319224345a1d8b7ce500a5cb3eb34fe9
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+skalibs.d02daef67b1cb24a3b88d1e5882dbfd0bc1421ab54eb688b3db53a7398fd7d5f
+#+execline.4016a36eae95a3085253dac7fd988a68209a87595e51633988e05e0bf9e0c01e
+#+libcap.6dae9927a122ed21678ec79e6b04070ca87193c22b6c0804846902e60675ae8b
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+zsh.325b93f72e4bf51ac1200fc1ce78c9f5b7816d918e9d0d3039b57c763c566fe8
+#+pthbs-banginstall.7fbeb4606d18d8831fa3a3cd0b54ac8246eb08724658936e2e08d2b70255ae96
+#+execline.6a961c05ada135998914a161cd31f4095a61aa997985c31062308e79f5b1502e
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+ccx-utils.79d2595fc3f4d2202135086c75fcdb9358f359309d6829ba10626160d4d7e134
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
 
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/mandoc b/variants/ccx-x86_64/mandoc
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+zsh.325b93f72e4bf51ac1200fc1ce78c9f5b7816d918e9d0d3039b57c763c566fe8
+#+pthbs-banginstall.7fbeb4606d18d8831fa3a3cd0b54ac8246eb08724658936e2e08d2b70255ae96
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+skalibs.30adbb9c3b20a4bea979c7277597614a95300e7de798d62175672185c4368cf3
+#+execline.6a961c05ada135998914a161cd31f4095a61aa997985c31062308e79f5b1502e
 #@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd
 
 
@@ -47,7 +47,7 @@ cd 'mdevd'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.8261b51ea57569b4b9b73580d7d818bb048f30c489e5204b0b4e2507214a1d97/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.30adbb9c3b20a4bea979c7277597614a95300e7de798d62175672185c4368cf3/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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-dosfstools.2afdb55891bff57f4b4c599283a23759782dc3e166b477a9b5f36953fadde0bd
+#+busybox-e2fsprogs.7a53ff7c929b1b231da337387efae0e96d7530b416bb8032939fa7af19e82cd8
+#+busybox-iproute2.bb1fe8e36cae2ddd7410b257697ea3d38cf9cf945ce48f6ddc10951608d9b24e
+#+busybox-iputils.8f83589f92fbc2eb3802af721506b147df52000608b2e83f0cebb4c8284d7a7f
+#+busybox-net-misc.4d3ad9dd782f123d153e1cc5e98a46912530e86a77c169d8dfcb4163c848e248
+#+busybox-net-tools.50d06b6df41abd32e728f7e76f712ab96df6111f43db69891aa581a84a7597de
+#+busybox-traceroute.81214a948eb88f57a157110ecbc6d6241b892e31ca90f9d570c54c64ddaa9028
+#+busybox-wget.2f3ec41305642b93750f7c75965c1abdc388a377b2416e0c58e601912c0ce86f
+#+busybox-chpst.2f3c79c5768d66ac864ea1494b09361289d5d5c0ff07ef131e2eb80df9feb27e
+#+busybox-console.d5fd6e246472f48c8cfd5eda826e39dea0a8eb741351a1e64b99e3df205003bd
+#+busybox-getty.41835794fd8b33a890810bf1a293a3b01cee48b5bd54633e58bcf149518f8066
+#+busybox-i2c-tools.0ee2d67f99952b176ee3de457f708be32287505ce72f3f40a1ae294f434f4fbc
+#+busybox-linux-extra.0713f828e91e01a4bd0056a5c744484a0571bca0b01d8050cd3ca846e2163eee
+#+busybox-mtd-utils.54d3cfde3c81042fbedcfc4cdc4673177597961fa058442222c7aaf7e9090d52
+#+busybox-shadow.b9a483c4453d0b8bc756a9f02e39d23dfd4e91268223fa91d31c32a48b5ee7a6
+#+busybox-su.1bd0037874bc8fd6489cb40dcc870e644faa597a77d6af44973b53579b14cb27
+#+busybox-util-linux-priv.dd20997468f14ce4966600ed415628265143ceb4363a15b3f8df57cdbfc10cd6
+#+busybox-logging.68452a1a360d66722153b44198e0e17ded306a7f844ca15918057e152ea1fb23
+#+busybox-cron.a56ca8ab2cdf0fb35717b1a259b924eccf7ab022b2db6fa60fe32f79f864adb2
+#+execline.6a961c05ada135998914a161cd31f4095a61aa997985c31062308e79f5b1502e
+#+s6.3b403d7bde45dd92c0e7ff1d1f7a52f99e2a5b12fa95b8428b6f6c9d4aee52e9
+#+mdev-scripts.2d0a9b8fb8739967d10de60df0da80cf9e890e90b4609baa18f12230ac560e5b
+#+mdevd.e4aaf518def9d1f2cb518449eb7f1da85cdb62f0c6562a18d44fdebd4f7ddf88
+#+busybox.2facf193831d021e16efbb1e2b978030a288672b9fccc062fe94da15c1f76df8+
\ 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.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.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.43fb9dd4736189f7d854bf020f902893965e273641ceac80991bf9070179564b
-#+gnu-make.e7a4a6e3ee24dee37e06f6aec6ab7d82bb405aeba9b7f07f4efd222033e8a538
-#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+musl-cross-make.9307d21e825b78aa2ba27cbeeef39903480de54633a757ff3939e9c576fcba60
+#+gnu-make.7c32a3321e2b2e3520736dbddff3f6c9319224345a1d8b7ce500a5cb3eb34fe9
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.3608404e2923765f631cb9a26ae8fd4d3cb181bd27480a0d5a254386f8a1c1b6
+#+musl-cross-make.ae638ef07501fd236261b3960f550da3f6eb5e30234ff7d1a17571387186eb01
 #@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.3608404e2923765f631cb9a26ae8fd4d3cb181bd27480a0d5a254386f8a1c1b6
+bootstrap=/home/ccx/versions/musl-cross-make.ae638ef07501fd236261b3960f550da3f6eb5e30234ff7d1a17571387186eb01
 "$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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+bison.27c6a83ae0ffae17955433e3ed30e17d0143c6803b5b2d473d37d6f100edbcb6
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+ocaml.87086971378f65d79ad102ad7a7e9fa89d5c72ccf1c2ec10958224d573cb65a5
+#+ocaml-findlib.326125d4799dd85f1b25a7dd87a207d0a833db301930cc1b581100e4f8290048
+#+ocamlbuild.7a3e256f02085e044f42aef32dbdb6448be5e5d159e96c090a583b89b885f2b8
+#+opam.03e014a40476a9d54a503b925b61c5f76d7d4030f6f19954c5c433033c99379b
+#+ocaml-topkg.d3169bbdcd32295764e120930f9adbcad9cbcbd67ef682cda75af3287fa6784e
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+ocaml.87086971378f65d79ad102ad7a7e9fa89d5c72ccf1c2ec10958224d573cb65a5
+#+dune.d5bc1b7ef84642af6766c185b7e614dc599904309d41d1ca77bcf15f0b376d7c
+#+ocaml_intrinsics_kernel.fb501a1017e8a40c388d410e508f32e68929bb902ae20318e2d9a25d39d26591
+#+ocaml-sexplib0.c4f005d21818dbb01f58c6da1a4516baebde0ab369e364b81ee1ab9ced776866
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+ocaml.87086971378f65d79ad102ad7a7e9fa89d5c72ccf1c2ec10958224d573cb65a5
+#+ocaml-findlib.326125d4799dd85f1b25a7dd87a207d0a833db301930cc1b581100e4f8290048
+#+ocamlbuild.7a3e256f02085e044f42aef32dbdb6448be5e5d159e96c090a583b89b885f2b8
+#+opam.03e014a40476a9d54a503b925b61c5f76d7d4030f6f19954c5c433033c99379b
+#+ocaml-topkg.d3169bbdcd32295764e120930f9adbcad9cbcbd67ef682cda75af3287fa6784e
+#+ocaml-astring.3b0e93e23dfb8368f0ca637997709d00ad08dd6b6499a77a5456f5fce63b2b56
+#+ocaml-fpath.d13c2c132941878eae74c1a30f6b6f573bc8d82e0d5d5357dc1b151a74948c22
+#+ocaml-rresult.e6b14ebe8666e66feaf259effd90eabdc70f1fd8b99351653220a34f0d9867cc
+#+ocaml-fmt.16492b475a3c8dc1867a1e5102343553997877fda4b76c231f01a0e515241567
+#+ocaml-logs.221e0d6b5c119a871ee54e9cb83e924d361efe01e17255d956911267a752626e
+#+ocaml-mtime.1b96594dbb362a9ab735e7c7e7706bc0dd822a3ebfe815c435b30e074c742197
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+ocaml.87086971378f65d79ad102ad7a7e9fa89d5c72ccf1c2ec10958224d573cb65a5
+#+ocaml-findlib.326125d4799dd85f1b25a7dd87a207d0a833db301930cc1b581100e4f8290048
+#+ocamlbuild.7a3e256f02085e044f42aef32dbdb6448be5e5d159e96c090a583b89b885f2b8
+#+opam.03e014a40476a9d54a503b925b61c5f76d7d4030f6f19954c5c433033c99379b
+#+ocaml-topkg.d3169bbdcd32295764e120930f9adbcad9cbcbd67ef682cda75af3287fa6784e
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+ocaml.87086971378f65d79ad102ad7a7e9fa89d5c72ccf1c2ec10958224d573cb65a5
+#+dune.d5bc1b7ef84642af6766c185b7e614dc599904309d41d1ca77bcf15f0b376d7c
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+ocaml.87086971378f65d79ad102ad7a7e9fa89d5c72ccf1c2ec10958224d573cb65a5
+#+dune.d5bc1b7ef84642af6766c185b7e614dc599904309d41d1ca77bcf15f0b376d7c
+#+ocamlbuild.7a3e256f02085e044f42aef32dbdb6448be5e5d159e96c090a583b89b885f2b8
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+m4.043d1d87e60653f58d0b677f9067e8bd2b14613473ebbf74e8afe3dfae7c1239
+#+netbsd-curses.e1d103e29c89220f0a91f68c41827bd5f3562de54ea28f2b7446ecd9ba6e795f
+#+ocaml.87086971378f65d79ad102ad7a7e9fa89d5c72ccf1c2ec10958224d573cb65a5
+#+ocamlbuild.7a3e256f02085e044f42aef32dbdb6448be5e5d159e96c090a583b89b885f2b8
 #@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.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/home/ccx/versions/musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6/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.cf80a8e71deab5590a05d466358db911292818232925c185d49ecaaaeeb962a5"
+stdlib="$pthbs_destdir/home/ccx/versions/ocaml.87086971378f65d79ad102ad7a7e9fa89d5c72ccf1c2ec10958224d573cb65a5"
 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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+ocaml.87086971378f65d79ad102ad7a7e9fa89d5c72ccf1c2ec10958224d573cb65a5
+#+ocaml-findlib.326125d4799dd85f1b25a7dd87a207d0a833db301930cc1b581100e4f8290048
+#+ocamlbuild.7a3e256f02085e044f42aef32dbdb6448be5e5d159e96c090a583b89b885f2b8
+#+opam.03e014a40476a9d54a503b925b61c5f76d7d4030f6f19954c5c433033c99379b
+#+ocaml-topkg.d3169bbdcd32295764e120930f9adbcad9cbcbd67ef682cda75af3287fa6784e
+#+ocaml-cmdliner.bcf2573a5c2d069dd749c986f93c74a29c1a3653489f8312113e855576ed7b90
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+ocaml.87086971378f65d79ad102ad7a7e9fa89d5c72ccf1c2ec10958224d573cb65a5
+#+ocaml-findlib.326125d4799dd85f1b25a7dd87a207d0a833db301930cc1b581100e4f8290048
+#+ocamlbuild.7a3e256f02085e044f42aef32dbdb6448be5e5d159e96c090a583b89b885f2b8
+#+opam.03e014a40476a9d54a503b925b61c5f76d7d4030f6f19954c5c433033c99379b
+#+ocaml-topkg.d3169bbdcd32295764e120930f9adbcad9cbcbd67ef682cda75af3287fa6784e
+#+ocaml-astring.3b0e93e23dfb8368f0ca637997709d00ad08dd6b6499a77a5456f5fce63b2b56
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+ocaml.87086971378f65d79ad102ad7a7e9fa89d5c72ccf1c2ec10958224d573cb65a5
+#+ocaml-findlib.326125d4799dd85f1b25a7dd87a207d0a833db301930cc1b581100e4f8290048
+#+ocamlbuild.7a3e256f02085e044f42aef32dbdb6448be5e5d159e96c090a583b89b885f2b8
+#+opam.03e014a40476a9d54a503b925b61c5f76d7d4030f6f19954c5c433033c99379b
+#+ocaml-topkg.d3169bbdcd32295764e120930f9adbcad9cbcbd67ef682cda75af3287fa6784e
+#+ocaml-mtime.1b96594dbb362a9ab735e7c7e7706bc0dd822a3ebfe815c435b30e074c742197
+#+ocaml-cmdliner.bcf2573a5c2d069dd749c986f93c74a29c1a3653489f8312113e855576ed7b90
+#+ocaml-fmt.16492b475a3c8dc1867a1e5102343553997877fda4b76c231f01a0e515241567
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+ocaml.87086971378f65d79ad102ad7a7e9fa89d5c72ccf1c2ec10958224d573cb65a5
+#+dune.d5bc1b7ef84642af6766c185b7e614dc599904309d41d1ca77bcf15f0b376d7c
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+ocaml.87086971378f65d79ad102ad7a7e9fa89d5c72ccf1c2ec10958224d573cb65a5
+#+ocaml-findlib.326125d4799dd85f1b25a7dd87a207d0a833db301930cc1b581100e4f8290048
+#+ocamlbuild.7a3e256f02085e044f42aef32dbdb6448be5e5d159e96c090a583b89b885f2b8
+#+opam.03e014a40476a9d54a503b925b61c5f76d7d4030f6f19954c5c433033c99379b
+#+ocaml-topkg.d3169bbdcd32295764e120930f9adbcad9cbcbd67ef682cda75af3287fa6784e
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+ocaml.87086971378f65d79ad102ad7a7e9fa89d5c72ccf1c2ec10958224d573cb65a5
+#+dune.d5bc1b7ef84642af6766c185b7e614dc599904309d41d1ca77bcf15f0b376d7c
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+ocaml.87086971378f65d79ad102ad7a7e9fa89d5c72ccf1c2ec10958224d573cb65a5
+#+dune.d5bc1b7ef84642af6766c185b7e614dc599904309d41d1ca77bcf15f0b376d7c
+#+ocaml-compiler-libs.0d3b614780657746d46d34012e157252a43c033f784e1d9b641c55e797e15e55
+#+ocaml-cppo.91c31406d67b5c32660d7cdf7816951fe21636bb95af07a0de1e34324cc1ee64
+#+ocaml-findlib.326125d4799dd85f1b25a7dd87a207d0a833db301930cc1b581100e4f8290048
+#+ocaml-ppx_derivers.a7558ef799ef64035220bf95d21b6c387d82a3cb4a71bd3d0d8813045bde41ea
+#+ocaml-ppxlib.6ab3b1f95311bac95c864a65c8983b68659a29ded6b363eec2ac440381e87082
+#+ocaml-sexplib0.c4f005d21818dbb01f58c6da1a4516baebde0ab369e364b81ee1ab9ced776866
+#+ocaml-stdlib-shims.0574f8ebbbf7f5f6d075c87e7bb9926141a610331c0e1909b7982d26f89170e2
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+ocaml.87086971378f65d79ad102ad7a7e9fa89d5c72ccf1c2ec10958224d573cb65a5
+#+dune.d5bc1b7ef84642af6766c185b7e614dc599904309d41d1ca77bcf15f0b376d7c
+#+ocaml-compiler-libs.0d3b614780657746d46d34012e157252a43c033f784e1d9b641c55e797e15e55
+#+ocaml-ppx_derivers.a7558ef799ef64035220bf95d21b6c387d82a3cb4a71bd3d0d8813045bde41ea
+#+ocaml-sexplib0.c4f005d21818dbb01f58c6da1a4516baebde0ab369e364b81ee1ab9ced776866
+#+ocaml-stdlib-shims.0574f8ebbbf7f5f6d075c87e7bb9926141a610331c0e1909b7982d26f89170e2
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+ocaml.87086971378f65d79ad102ad7a7e9fa89d5c72ccf1c2ec10958224d573cb65a5
+#+ocaml-findlib.326125d4799dd85f1b25a7dd87a207d0a833db301930cc1b581100e4f8290048
+#+ocamlbuild.7a3e256f02085e044f42aef32dbdb6448be5e5d159e96c090a583b89b885f2b8
+#+opam.03e014a40476a9d54a503b925b61c5f76d7d4030f6f19954c5c433033c99379b
+#+ocaml-topkg.d3169bbdcd32295764e120930f9adbcad9cbcbd67ef682cda75af3287fa6784e
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+ocaml.87086971378f65d79ad102ad7a7e9fa89d5c72ccf1c2ec10958224d573cb65a5
+#+dune.d5bc1b7ef84642af6766c185b7e614dc599904309d41d1ca77bcf15f0b376d7c
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+ocaml.87086971378f65d79ad102ad7a7e9fa89d5c72ccf1c2ec10958224d573cb65a5
+#+dune.d5bc1b7ef84642af6766c185b7e614dc599904309d41d1ca77bcf15f0b376d7c
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+ocaml.87086971378f65d79ad102ad7a7e9fa89d5c72ccf1c2ec10958224d573cb65a5
+#+ocaml-findlib.326125d4799dd85f1b25a7dd87a207d0a833db301930cc1b581100e4f8290048
+#+ocamlbuild.7a3e256f02085e044f42aef32dbdb6448be5e5d159e96c090a583b89b885f2b8
+#+opam.03e014a40476a9d54a503b925b61c5f76d7d4030f6f19954c5c433033c99379b
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+ocaml.87086971378f65d79ad102ad7a7e9fa89d5c72ccf1c2ec10958224d573cb65a5
+#+dune.d5bc1b7ef84642af6766c185b7e614dc599904309d41d1ca77bcf15f0b376d7c
+#+ocamlbuild.7a3e256f02085e044f42aef32dbdb6448be5e5d159e96c090a583b89b885f2b8
+#+ocaml-base.6143485fbb56350cd8b900ef7426b99624471096aab025a854e7d70d77d817d3
+#+opam.03e014a40476a9d54a503b925b61c5f76d7d4030f6f19954c5c433033c99379b
+#+ocaml-bos.e25ea9cb5682612b74e3800163ab60891eea19240a87ccf670ac16ff0838e4c5
+#+ocaml-lun.36a092ee0a8fe9b6443f2fb3d83b36ae155588aa4bb499c7b2f3d5f8f4707515
+#+ocaml-ppx_deriving.360543698fffa73f082ffd07e011e67f3d3443c4b927055e530a565b6c045b04+
\ 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+m4.043d1d87e60653f58d0b677f9067e8bd2b14613473ebbf74e8afe3dfae7c1239
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+ocaml.87086971378f65d79ad102ad7a7e9fa89d5c72ccf1c2ec10958224d573cb65a5
+#+dune.d5bc1b7ef84642af6766c185b7e614dc599904309d41d1ca77bcf15f0b376d7c
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+m4.043d1d87e60653f58d0b677f9067e8bd2b14613473ebbf74e8afe3dfae7c1239
+#+ocaml.87086971378f65d79ad102ad7a7e9fa89d5c72ccf1c2ec10958224d573cb65a5
 #@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.3360ba89cca34ba70f5f4748d3d5c439c73f7508ef6256fe550dca96f17bda59/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/home/ccx/versions/musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6/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.cf80a8e71deab5590a05d466358db911292818232925c185d49ecaaaeeb962a5"
+stdlib="$pthbs_destdir/home/ccx/versions/ocaml.87086971378f65d79ad102ad7a7e9fa89d5c72ccf1c2ec10958224d573cb65a5"
 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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+diffutils.488c2d2316a0bba9a3c253c29efd82c804e7794ca8113cf88abb3540dc099903
+#+patch.513284d47e0d58e52d187538123261e101004a56a2a737ee2c0387393bb3b7c6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+getconf.2da75acbe7122ec3e7fcbf54a9ad3a490d74a901c94119aa6f435358c2caffe1
+#+ocaml.87086971378f65d79ad102ad7a7e9fa89d5c72ccf1c2ec10958224d573cb65a5
+#+dune.d5bc1b7ef84642af6766c185b7e614dc599904309d41d1ca77bcf15f0b376d7c
 #@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.8cc3ee9698ee2c21a43a8349242fd7f24e1102e508797014486e3f5e3fd68b15/command/dune' \
+	--with-dune='/home/ccx/versions/dune.d5bc1b7ef84642af6766c185b7e614dc599904309d41d1ca77bcf15f0b376d7c/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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+m4.043d1d87e60653f58d0b677f9067e8bd2b14613473ebbf74e8afe3dfae7c1239
 #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:.
 
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/pkgconf b/variants/ccx-x86_64/pkgconf
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+m4.043d1d87e60653f58d0b677f9067e8bd2b14613473ebbf74e8afe3dfae7c1239
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+pkgconf.a5f2c4a283c6ccdef6f121f270083f2e6cdb718a34230f23434279c0b8ed02e7
 
 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+m4.043d1d87e60653f58d0b677f9067e8bd2b14613473ebbf74e8afe3dfae7c1239
 #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:.
 
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+zsh.325b93f72e4bf51ac1200fc1ce78c9f5b7816d918e9d0d3039b57c763c566fe8
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+execline.cacbf244584ed78052217c951ba9788d9e5ec4d2516bfeb23ef9f1bd33e436e5
-#+lnstools.727f3883d0ff11cecd3b6178e79fe8e15d92006235ccd2d49d292a1c15e729aa
-#+sandbox_rootfs.0b3114837abba0997788de96861cdb32119ff2d8af8bead14abd8730bffbee2f
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+execline.4016a36eae95a3085253dac7fd988a68209a87595e51633988e05e0bf9e0c01e
+#+lnstools.9f2d95f1c5864a25af055abbd89e5f70c96cf64b10dd4d21fcd728b642858053
+#+sandbox_rootfs.a0204bbe8bac31baf0717643b65082a377b91a85d8ae4b4fdb52b738c1a61c7c
 #@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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+m4.043d1d87e60653f58d0b677f9067e8bd2b14613473ebbf74e8afe3dfae7c1239
+#+nawk.e43297ba805f35b939ee83a487deb43893662c343cb9ec34f0247546f58369ca
+#+popt.b376d3668110e301705f790d96bf5de25654597579fd15483acfbfb6f942b594
+#+libressl.192bb08ee9644179a45b7c4366f30513c343ff485bd4dcd7284f4c9f62331b89
+#+zstd.460caa2b685e4a46051699008e5b84dbac41a7864fd6bdfb8b558a7a19b60fb1
 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:.
 
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/ccx-x86_64/s6 b/variants/ccx-x86_64/s6
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+skalibs.30adbb9c3b20a4bea979c7277597614a95300e7de798d62175672185c4368cf3
+#+execline.6a961c05ada135998914a161cd31f4095a61aa997985c31062308e79f5b1502e
 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6
 
 
@@ -47,7 +47,7 @@ cd 's6'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/home/ccx/versions/skalibs.8261b51ea57569b4b9b73580d7d818bb048f30c489e5204b0b4e2507214a1d97/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.30adbb9c3b20a4bea979c7277597614a95300e7de798d62175672185c4368cf3/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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+skalibs.30adbb9c3b20a4bea979c7277597614a95300e7de798d62175672185c4368cf3
 #@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.8261b51ea57569b4b9b73580d7d818bb048f30c489e5204b0b4e2507214a1d97/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.30adbb9c3b20a4bea979c7277597614a95300e7de798d62175672185c4368cf3/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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+skalibs.30adbb9c3b20a4bea979c7277597614a95300e7de798d62175672185c4368cf3
+#+execline.6a961c05ada135998914a161cd31f4095a61aa997985c31062308e79f5b1502e
+#+s6.3b403d7bde45dd92c0e7ff1d1f7a52f99e2a5b12fa95b8428b6f6c9d4aee52e9
 #@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.8261b51ea57569b4b9b73580d7d818bb048f30c489e5204b0b4e2507214a1d97/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.30adbb9c3b20a4bea979c7277597614a95300e7de798d62175672185c4368cf3/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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+skalibs.30adbb9c3b20a4bea979c7277597614a95300e7de798d62175672185c4368cf3
 #@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.8261b51ea57569b4b9b73580d7d818bb048f30c489e5204b0b4e2507214a1d97/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.30adbb9c3b20a4bea979c7277597614a95300e7de798d62175672185c4368cf3/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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+skalibs.30adbb9c3b20a4bea979c7277597614a95300e7de798d62175672185c4368cf3
+#+execline.6a961c05ada135998914a161cd31f4095a61aa997985c31062308e79f5b1502e
+#+s6.3b403d7bde45dd92c0e7ff1d1f7a52f99e2a5b12fa95b8428b6f6c9d4aee52e9
+#+s6-dns.05c425a7ac82606861034a694c69baef28ae0878a73e8c6eaa381e87b77a17c7
+#+libressl.192bb08ee9644179a45b7c4366f30513c343ff485bd4dcd7284f4c9f62331b89
 #@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.8261b51ea57569b4b9b73580d7d818bb048f30c489e5204b0b4e2507214a1d97/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.30adbb9c3b20a4bea979c7277597614a95300e7de798d62175672185c4368cf3/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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+skalibs.30adbb9c3b20a4bea979c7277597614a95300e7de798d62175672185c4368cf3
 #@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.8261b51ea57569b4b9b73580d7d818bb048f30c489e5204b0b4e2507214a1d97/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.30adbb9c3b20a4bea979c7277597614a95300e7de798d62175672185c4368cf3/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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+skalibs.30adbb9c3b20a4bea979c7277597614a95300e7de798d62175672185c4368cf3
+#+execline.6a961c05ada135998914a161cd31f4095a61aa997985c31062308e79f5b1502e
+#+s6.3b403d7bde45dd92c0e7ff1d1f7a52f99e2a5b12fa95b8428b6f6c9d4aee52e9
 #@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.8261b51ea57569b4b9b73580d7d818bb048f30c489e5204b0b4e2507214a1d97/sysdeps' \
+	--with-sysdeps='/home/ccx/versions/skalibs.30adbb9c3b20a4bea979c7277597614a95300e7de798d62175672185c4368cf3/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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.43fb9dd4736189f7d854bf020f902893965e273641ceac80991bf9070179564b
-#+gnu-make.e7a4a6e3ee24dee37e06f6aec6ab7d82bb405aeba9b7f07f4efd222033e8a538
-#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
-#+skalibs.8295b5524c8ec0f55727d5f04618f407e72d7656a6c794ddbb706e64f2eae71f
+#+musl-cross-make.9307d21e825b78aa2ba27cbeeef39903480de54633a757ff3939e9c576fcba60
+#+gnu-make.7c32a3321e2b2e3520736dbddff3f6c9319224345a1d8b7ce500a5cb3eb34fe9
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
+#+skalibs.d02daef67b1cb24a3b88d1e5882dbfd0bc1421ab54eb688b3db53a7398fd7d5f
 #@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.727f3883d0ff11cecd3b6178e79fe8e15d92006235ccd2d49d292a1c15e729aa
-#+sandbox_rootfs.0b3114837abba0997788de96861cdb32119ff2d8af8bead14abd8730bffbee2f
-#+pthbs-sandbox-rootns.c5b43608101ad7efb5649bd988337f15f00fea9f26f96f6b3898650f91f40145-
\ No newline at end of file
+#+lnstools.9f2d95f1c5864a25af055abbd89e5f70c96cf64b10dd4d21fcd728b642858053
+#+sandbox_rootfs.a0204bbe8bac31baf0717643b65082a377b91a85d8ae4b4fdb52b738c1a61c7c
+#+pthbs-sandbox-rootns.845cf117c0e33754785344829c1314272277e0d7b12e688d1ffd2349b38f14e8+
\ 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.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.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.43fb9dd4736189f7d854bf020f902893965e273641ceac80991bf9070179564b
-#+gnu-make.e7a4a6e3ee24dee37e06f6aec6ab7d82bb405aeba9b7f07f4efd222033e8a538
-#+busybox.4fee9558562858184459a4dbc5a4542e2e4622e0dd75b0d020f43cb573f15f06
+#+musl-cross-make.9307d21e825b78aa2ba27cbeeef39903480de54633a757ff3939e9c576fcba60
+#+gnu-make.7c32a3321e2b2e3520736dbddff3f6c9319224345a1d8b7ce500a5cb3eb34fe9
+#+busybox.0a1f9a8f63a95a2fff657a6ae9e7bef48748f363d92b9ec1aa2f0e233922af20
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+zsh.325b93f72e4bf51ac1200fc1ce78c9f5b7816d918e9d0d3039b57c763c566fe8
+#+pthbs-banginstall.7fbeb4606d18d8831fa3a3cd0b54ac8246eb08724658936e2e08d2b70255ae96
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+attr.9d0c903cf179ede18fe1a49a05a195db29ac38b6c6ab5b1abdc7eb9f883ac460
+#+zstd.460caa2b685e4a46051699008e5b84dbac41a7864fd6bdfb8b558a7a19b60fb1
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+m4.043d1d87e60653f58d0b677f9067e8bd2b14613473ebbf74e8afe3dfae7c1239
+#+patch.513284d47e0d58e52d187538123261e101004a56a2a737ee2c0387393bb3b7c6
+#+libunwind.bab6922e0933215a95c443f1c4ce35054b85ad0a877f8cff5caf941e2133f5b1
 #@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch
 #@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:.
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-dosfstools.2afdb55891bff57f4b4c599283a23759782dc3e166b477a9b5f36953fadde0bd
+#+busybox-e2fsprogs.7a53ff7c929b1b231da337387efae0e96d7530b416bb8032939fa7af19e82cd8
+#+busybox-iproute2.bb1fe8e36cae2ddd7410b257697ea3d38cf9cf945ce48f6ddc10951608d9b24e
+#+busybox-iputils.8f83589f92fbc2eb3802af721506b147df52000608b2e83f0cebb4c8284d7a7f
+#+busybox-net-misc.4d3ad9dd782f123d153e1cc5e98a46912530e86a77c169d8dfcb4163c848e248
+#+busybox-net-tools.50d06b6df41abd32e728f7e76f712ab96df6111f43db69891aa581a84a7597de
+#+busybox-traceroute.81214a948eb88f57a157110ecbc6d6241b892e31ca90f9d570c54c64ddaa9028
+#+busybox-wget.2f3ec41305642b93750f7c75965c1abdc388a377b2416e0c58e601912c0ce86f
+#+busybox-chpst.2f3c79c5768d66ac864ea1494b09361289d5d5c0ff07ef131e2eb80df9feb27e
+#+busybox-console.d5fd6e246472f48c8cfd5eda826e39dea0a8eb741351a1e64b99e3df205003bd
+#+busybox-getty.41835794fd8b33a890810bf1a293a3b01cee48b5bd54633e58bcf149518f8066
+#+busybox-i2c-tools.0ee2d67f99952b176ee3de457f708be32287505ce72f3f40a1ae294f434f4fbc
+#+busybox-linux-extra.0713f828e91e01a4bd0056a5c744484a0571bca0b01d8050cd3ca846e2163eee
+#+busybox-mtd-utils.54d3cfde3c81042fbedcfc4cdc4673177597961fa058442222c7aaf7e9090d52
+#+busybox-shadow.b9a483c4453d0b8bc756a9f02e39d23dfd4e91268223fa91d31c32a48b5ee7a6
+#+busybox-su.1bd0037874bc8fd6489cb40dcc870e644faa597a77d6af44973b53579b14cb27
+#+busybox-util-linux-priv.dd20997468f14ce4966600ed415628265143ceb4363a15b3f8df57cdbfc10cd6
+#+busybox-logging.68452a1a360d66722153b44198e0e17ded306a7f844ca15918057e152ea1fb23
+#+busybox-cron.a56ca8ab2cdf0fb35717b1a259b924eccf7ab022b2db6fa60fe32f79f864adb2
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+nawk.e43297ba805f35b939ee83a487deb43893662c343cb9ec34f0247546f58369ca
+#+diffutils.488c2d2316a0bba9a3c253c29efd82c804e7794ca8113cf88abb3540dc099903
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+aat.df44e5b97fabecb1f061a37548b7372e5d0e547248bc31264c66827ef2d12764
+#+fileset.a9735363c505b2982c53972ef7a482171d3a9af0345b43d3b6d651d346d5941c
+#+rsync.56465848eff83f125caa4ac481ead974c48c26531e6d2a8ebf45425e61c20d3b
+#+execline.6a961c05ada135998914a161cd31f4095a61aa997985c31062308e79f5b1502e
+#+kbd.85c3e620d2dd7387fb9a8610f3ff1b203ea50d99cb836fbf644601bab6f35ee3
+#+mdevd.e4aaf518def9d1f2cb518449eb7f1da85cdb62f0c6562a18d44fdebd4f7ddf88
+#+s6-linux-utils.9a130b392bdf9f95ba6a18fed433a20b3fd649f29bbc7601b737af085d4106cd
+#+s6-rc.4ca710f925e5d8357b894c10b12fa9c48548ddd27b2d77e02990ee8ac16f885d
+#+s6.3b403d7bde45dd92c0e7ff1d1f7a52f99e2a5b12fa95b8428b6f6c9d4aee52e9
+#+zsh.325b93f72e4bf51ac1200fc1ce78c9f5b7816d918e9d0d3039b57c763c566fe8
+#+libcgroup.985af0a037e71e594d524f7e7030618db4bac52f42a75cb8b6f546e148a5ef96
+#+system-config-scripts.03b8a58efe12880493ac44046d874ab73073373989f9ddf03fcede89058fcbe9
+#+logincaps.520c76d68ea509e78a03f12c611f3044d49f5a6b35699eb26af9309f1e8525d8
+#+busybox.2facf193831d021e16efbb1e2b978030a288672b9fccc062fe94da15c1f76df8
 #@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.cda7e0c2cc2611692b5b81513f4cd6094bfcf72c3fff6f0ac7ee7c8346de1d63' \
-	'pthbs_path_mdevd=/home/ccx/versions/env.5a81a11c99adc07cb8a0143678dc077336cddca111803edc26c495d3e3be6f6f' \
+	'pthbs_path_containers=/home/ccx/versions/env.9108d629dfb3763943205ec65ea3a27c473dc82209023c5a6bacbe7ef03c6972' \
+	'pthbs_path_mdevd=/home/ccx/versions/env.c251873d42d430ada2859b6cb74892af8b8f1fa718e2cf7f9a6dcd27677596d1' \
 	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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-dosfstools.2afdb55891bff57f4b4c599283a23759782dc3e166b477a9b5f36953fadde0bd
+#+busybox-e2fsprogs.7a53ff7c929b1b231da337387efae0e96d7530b416bb8032939fa7af19e82cd8
+#+busybox-iproute2.bb1fe8e36cae2ddd7410b257697ea3d38cf9cf945ce48f6ddc10951608d9b24e
+#+busybox-iputils.8f83589f92fbc2eb3802af721506b147df52000608b2e83f0cebb4c8284d7a7f
+#+busybox-net-misc.4d3ad9dd782f123d153e1cc5e98a46912530e86a77c169d8dfcb4163c848e248
+#+busybox-net-tools.50d06b6df41abd32e728f7e76f712ab96df6111f43db69891aa581a84a7597de
+#+busybox-traceroute.81214a948eb88f57a157110ecbc6d6241b892e31ca90f9d570c54c64ddaa9028
+#+busybox-wget.2f3ec41305642b93750f7c75965c1abdc388a377b2416e0c58e601912c0ce86f
+#+busybox-chpst.2f3c79c5768d66ac864ea1494b09361289d5d5c0ff07ef131e2eb80df9feb27e
+#+busybox-console.d5fd6e246472f48c8cfd5eda826e39dea0a8eb741351a1e64b99e3df205003bd
+#+busybox-getty.41835794fd8b33a890810bf1a293a3b01cee48b5bd54633e58bcf149518f8066
+#+busybox-i2c-tools.0ee2d67f99952b176ee3de457f708be32287505ce72f3f40a1ae294f434f4fbc
+#+busybox-linux-extra.0713f828e91e01a4bd0056a5c744484a0571bca0b01d8050cd3ca846e2163eee
+#+busybox-mtd-utils.54d3cfde3c81042fbedcfc4cdc4673177597961fa058442222c7aaf7e9090d52
+#+busybox-shadow.b9a483c4453d0b8bc756a9f02e39d23dfd4e91268223fa91d31c32a48b5ee7a6
+#+busybox-su.1bd0037874bc8fd6489cb40dcc870e644faa597a77d6af44973b53579b14cb27
+#+busybox-util-linux-priv.dd20997468f14ce4966600ed415628265143ceb4363a15b3f8df57cdbfc10cd6
+#+busybox-logging.68452a1a360d66722153b44198e0e17ded306a7f844ca15918057e152ea1fb23
+#+busybox-cron.a56ca8ab2cdf0fb35717b1a259b924eccf7ab022b2db6fa60fe32f79f864adb2
+#+s6.3b403d7bde45dd92c0e7ff1d1f7a52f99e2a5b12fa95b8428b6f6c9d4aee52e9
+#+s6-rc.4ca710f925e5d8357b894c10b12fa9c48548ddd27b2d77e02990ee8ac16f885d
+#+s6-portable-utils.3281a60e1816995c0d473674e83b4b95482a6b96d6a5506e46d9551d5615f656
+#+s6-linux-init.ad9d70580e0db34c6e9e3d84c5dd57f95393be34868a7d036fecc93648b3f792
+#+execline.6a961c05ada135998914a161cd31f4095a61aa997985c31062308e79f5b1502e
+#+system-config-rc.3e6af4a5580da88aeb8a628c770112c9b9326caeb2de199c95118312f1d4d68e
 
 
 # - build script start -
@@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-s6rcdb=/home/ccx/versions/system-config-rc.1298dcffc3b4a3edec10bcd8bdb45cc28c3d9e6ad5a9201b134576d444e73a8f/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.3e6af4a5580da88aeb8a628c770112c9b9326caeb2de199c95118312f1d4d68e/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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+s6-rc.4ca710f925e5d8357b894c10b12fa9c48548ddd27b2d77e02990ee8ac16f885d
+#+fileset.a9735363c505b2982c53972ef7a482171d3a9af0345b43d3b6d651d346d5941c
+#+system-config.029e0a223dcf9d156f1e73da3695a48df45b4960bc6ebf2197b3dbe44a5e3d4f
 
 
 # - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-src=/home/ccx/versions/system-config.2d4781db2faca22c838a9d3aee9f4a50e829c4081b761fd216c4ebb51301ad7b/config/s6-rc-source
+src=/home/ccx/versions/system-config.029e0a223dcf9d156f1e73da3695a48df45b4960bc6ebf2197b3dbe44a5e3d4f/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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+zsh.325b93f72e4bf51ac1200fc1ce78c9f5b7816d918e9d0d3039b57c763c566fe8
+#+pthbs-banginstall.7fbeb4606d18d8831fa3a3cd0b54ac8246eb08724658936e2e08d2b70255ae96
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+zsh.325b93f72e4bf51ac1200fc1ce78c9f5b7816d918e9d0d3039b57c763c566fe8
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+execline.6a961c05ada135998914a161cd31f4095a61aa997985c31062308e79f5b1502e
+#+pthbs-banginstall.7fbeb4606d18d8831fa3a3cd0b54ac8246eb08724658936e2e08d2b70255ae96
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-dosfstools.2afdb55891bff57f4b4c599283a23759782dc3e166b477a9b5f36953fadde0bd
+#+busybox-e2fsprogs.7a53ff7c929b1b231da337387efae0e96d7530b416bb8032939fa7af19e82cd8
+#+busybox-iproute2.bb1fe8e36cae2ddd7410b257697ea3d38cf9cf945ce48f6ddc10951608d9b24e
+#+busybox-iputils.8f83589f92fbc2eb3802af721506b147df52000608b2e83f0cebb4c8284d7a7f
+#+busybox-net-misc.4d3ad9dd782f123d153e1cc5e98a46912530e86a77c169d8dfcb4163c848e248
+#+busybox-net-tools.50d06b6df41abd32e728f7e76f712ab96df6111f43db69891aa581a84a7597de
+#+busybox-traceroute.81214a948eb88f57a157110ecbc6d6241b892e31ca90f9d570c54c64ddaa9028
+#+busybox-wget.2f3ec41305642b93750f7c75965c1abdc388a377b2416e0c58e601912c0ce86f
+#+busybox-chpst.2f3c79c5768d66ac864ea1494b09361289d5d5c0ff07ef131e2eb80df9feb27e
+#+busybox-console.d5fd6e246472f48c8cfd5eda826e39dea0a8eb741351a1e64b99e3df205003bd
+#+busybox-getty.41835794fd8b33a890810bf1a293a3b01cee48b5bd54633e58bcf149518f8066
+#+busybox-i2c-tools.0ee2d67f99952b176ee3de457f708be32287505ce72f3f40a1ae294f434f4fbc
+#+busybox-linux-extra.0713f828e91e01a4bd0056a5c744484a0571bca0b01d8050cd3ca846e2163eee
+#+busybox-mtd-utils.54d3cfde3c81042fbedcfc4cdc4673177597961fa058442222c7aaf7e9090d52
+#+busybox-shadow.b9a483c4453d0b8bc756a9f02e39d23dfd4e91268223fa91d31c32a48b5ee7a6
+#+busybox-su.1bd0037874bc8fd6489cb40dcc870e644faa597a77d6af44973b53579b14cb27
+#+busybox-util-linux-priv.dd20997468f14ce4966600ed415628265143ceb4363a15b3f8df57cdbfc10cd6
+#+busybox-logging.68452a1a360d66722153b44198e0e17ded306a7f844ca15918057e152ea1fb23
+#+busybox-cron.a56ca8ab2cdf0fb35717b1a259b924eccf7ab022b2db6fa60fe32f79f864adb2
+#+attr.9d0c903cf179ede18fe1a49a05a195db29ac38b6c6ab5b1abdc7eb9f883ac460
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+diffutils.488c2d2316a0bba9a3c253c29efd82c804e7794ca8113cf88abb3540dc099903
+#+patch.513284d47e0d58e52d187538123261e101004a56a2a737ee2c0387393bb3b7c6
+#+flex.362d4cfb0497ec95d8ed3aecf8f68a36951b7ebf163aa7540fff7e3eb02ecbaa
+#+bison.27c6a83ae0ffae17955433e3ed30e17d0143c6803b5b2d473d37d6f100edbcb6
+#+rsync.56465848eff83f125caa4ac481ead974c48c26531e6d2a8ebf45425e61c20d3b
+#+execline.6a961c05ada135998914a161cd31f4095a61aa997985c31062308e79f5b1502e
+#+s6.3b403d7bde45dd92c0e7ff1d1f7a52f99e2a5b12fa95b8428b6f6c9d4aee52e9
+#+s6-rc.4ca710f925e5d8357b894c10b12fa9c48548ddd27b2d77e02990ee8ac16f885d
+#+s6-portable-utils.3281a60e1816995c0d473674e83b4b95482a6b96d6a5506e46d9551d5615f656
+#+s6-linux-utils.9a130b392bdf9f95ba6a18fed433a20b3fd649f29bbc7601b737af085d4106cd
+#+s6-linux-init.ad9d70580e0db34c6e9e3d84c5dd57f95393be34868a7d036fecc93648b3f792
+#+mdevd.e4aaf518def9d1f2cb518449eb7f1da85cdb62f0c6562a18d44fdebd4f7ddf88
+#+s6-dns.05c425a7ac82606861034a694c69baef28ae0878a73e8c6eaa381e87b77a17c7
+#+libressl.192bb08ee9644179a45b7c4366f30513c343ff485bd4dcd7284f4c9f62331b89
+#+s6-networking.0de05c36fa94c4ffdb1a185c7c505c704d2c4e42da3559f22c67e0a3928283d9
+#+zsh.325b93f72e4bf51ac1200fc1ce78c9f5b7816d918e9d0d3039b57c763c566fe8
+#+pthbs-banginstall.7fbeb4606d18d8831fa3a3cd0b54ac8246eb08724658936e2e08d2b70255ae96
+#+aat.df44e5b97fabecb1f061a37548b7372e5d0e547248bc31264c66827ef2d12764
+#+confz.139e00bd49d855c28a33cb98619ee2be7d0a149282f0e4356924a1fabaa5af91
+#+containers.8dc0446fdafe29bd187a5cb761918fe518ac1e380cfa4c451d6e58ff3c6f4a70
+#+fileset.a9735363c505b2982c53972ef7a482171d3a9af0345b43d3b6d651d346d5941c
+#+logincaps.520c76d68ea509e78a03f12c611f3044d49f5a6b35699eb26af9309f1e8525d8
+#+snaprep.049a076fdd3363cad8b1aaf1e00036de11e7f373402edc4d41dfecc2f7737b7d
+#+curl.0c5e42c8cc613077680c6606fc878714cf6bfdc8c5a4ea061250578e81cc2b13
+#+git.34c2a544a8e966d6792b75de37dc26a26453159597174e6a062a2654e3125288
+#+xbps.62854402f2d7c6c65348fd8de06cc537bdbd41fdca381b0de879bca1de7e7000
+#+apk-tools.6648895144810439fa0861555cd67b4514b75498313b2a58bd0542c322e8049c
+#+getent.3d1b3fb3deda54fce59a56c5c8c97280c214ca59f499c366be7cd3d3f6e14eb0
+#+getconf.2da75acbe7122ec3e7fcbf54a9ad3a490d74a901c94119aa6f435358c2caffe1
+#+iconv.6a91649dfb45df135e39ecf7859f15bdb9e40f117c98baf944d5b9a6996f0aa9
+#+libcap.f109f8cee8c473196a5ebaedd85fb77711866e995c2f07e8b0325e45333b9db7
+#+applyuidgid-caps.c368a34f4046173fbd8b5c8bfae2cfa9dc9d78450ad309be6f55709b3053be8b
+#+ccx-utils.79d2595fc3f4d2202135086c75fcdb9358f359309d6829ba10626160d4d7e134
+#+user-env.db2836582c0aace28657b35226bffc93cc78b80899690dcf64d343bd2c6186c9
+#+strace.b44d044db708bc3657c7e9f97e92dda6f422e995a46e964b5a9ea4cd8266e809
+#+mlog.2821606371e8a49b226ed69ebe87c51afc0ecc3ae093156d17db21dc0ac17fc2
+#+findutils.c3c06ad4b97bd2080b8fa42a9a3d8871c88e61f29a3ec4816a7a0fd076de8c22
+#+nawk.e43297ba805f35b939ee83a487deb43893662c343cb9ec34f0247546f58369ca
+#+squashfs-tools.7a859b7fcce2e4df8a87e416205401801c639e10c2a2afa1c2a46a322f2f4873
+#+mandoc.f5b2212c82d76d145e40b24adedef2c96ddd4e3a441f3b05fd45aca877a51918
+#+tinyssh.9d9b719dfa34659b9546b09a6ff6e6055309e10894174c6b07f14e4b2a039ea0+
\ 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.0b87e50abd2e72f360d3a14350ab6456b6ba7f4d4fae36e48fdff6d8612dfd94-
\ No newline at end of file
+#+linux-qemu-guest.58d4f4bad4dd7b92645182d33c8cb9286cadb0bc7d50ca27aaad60b1bdcdb79c+
\ 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+libarchive.36f56aea4d08a802f6cbf5e6201c6f0c35db07ddfb020051fbd5e5d3ee61508a
+#+libressl.192bb08ee9644179a45b7c4366f30513c343ff485bd4dcd7284f4c9f62331b89
+#+pkgconf-pkg-config.eee00cb7c7be3e5f43736405b54c5c2a14023c2a947a07594e3c68e0788f44a3
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+m4.043d1d87e60653f58d0b677f9067e8bd2b14613473ebbf74e8afe3dfae7c1239
+#+netbsd-curses.e1d103e29c89220f0a91f68c41827bd5f3562de54ea28f2b7446ecd9ba6e795f
+#+libbsd.fbab302a0a65ed00691b733a4ec6dbffae1e0971e7e93fefcc16228d5b831050
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.0bf515cd527b198b2557ef3c0d43ea43f48159e1fa0a4d0029acd19b59261fe9
+#+busybox-bzip2.adee60185257c5effb5d68a94fea068240c6f660b90907377cdac65990bba423
+#+busybox-gzip.3dbedf315e7be543328498f902305a58fe1cd34dcd726845af3774ad30feb948
+#+busybox-lzop.5783fdba24d094c978bd7fd834169f76ccaf6fa31bfc4c1365863d65326cd8d6
+#+busybox-unzip.f62732b64c19c0f12902e4711e77d322158aeddcb5bb6d8a3fdd64d5a94d26fd
+#+busybox-xz.424a8c6f702e2f2947c9401ca7f546115450520d7663ad9e60b9565ef72cd9b5
+#+busybox-cpio.c23f9357d4f9b823531060523438eddb3aa3276841301ad046ccadf0e970f970
+#+busybox-dpkg.2ad6d249a76d0af33807778173bed3cb327a8d9817aaf0416b90210552926b69
+#+busybox-rpm.f8e0cada135174d7857d850e3b2954682ba95a40ebebbb86299798bfefaf701e
+#+busybox-tar.63365bede682420261f6bd84b550c2fe28abe5358f994847c3af4bc0fb040dff
+#+busybox-ed.7f2efadfcbe58c521747b6c0dd1dcebc49832e5bdd5786d044b72ec6d753af06
+#+busybox-sed.42cb1a876550da25830a5c04912dfd1ad7908219d9a50d84c7a908979799e2c2
+#+busybox-vi.b0d6ecfa71f32998b9dd1af2fa08a56f900d796edb55c96b1f3c273adca4514c
+#+busybox-xxd.13c9968b02f30710b589c62b844ad4945debb757c3a2d6c2a4e3198cd7e0e6b7
+#+busybox-process-extra.dd1698ad3a397a06e76a1f358c35ccb760c245ccd1cb5407d419dbfd9f626649
+#+busybox-procps.afcdba6ad03d8e438a1b340d4c0bb21be495cd0ed91e9827b4a7927fb81dbd2f
+#+busybox-psmisc.e94738c4c2452fd1e3c96ac31faf39a8adbf792f827c322ab23383b80d80a9af
+#+busybox-ash.6a90e4f086482305041de3058e27b35dff3cb4f9d40db5afd84c2caad44e339b
+#+busybox-bc.3aab21628504e5bd9d51e27704ecd52f053ccaff700ee533fab512405ba465ba
+#+busybox-coreutils.0063e60961af5d061b54db06dda0218359de5fca7e3e221509c7ea2704f83b95
+#+busybox-coreutils-extra.3634a8694d65a5951fd8d70316ba37eeaf2a5b07423013b2d5c0affc5fb0699a
+#+busybox-daemontools.721579426f6949bfe549716c78e861c3bd23bf735c27c881862c74349392ca0d
+#+busybox-grep.e1d6182b8109c28fbf0a2345e5c433c6814df42830b50dd750089948d339729c
+#+busybox-misc.7c29ec4f08dfe263922c34d487857622d874f91615d792f72685f409ea116bd7
+#+busybox-sh.6de80e3133deebf7bfb2b75290d9b67a2ec5bb2e0c3a7f898b30483bf677e7ee
+#+busybox-util-linux-unpriv.e8ba09d66087ec991af1617272a5ff509d2d5d91fe5ad32beb66b6e70bf73d55
+#+busybox-findutils.8b7d8e24a5d948526cb5f6d8aad001e1844266ea099221274e3c2603f1b9245a
+#+busybox-awk.b2988d8e47b258529e449890b4c6061fe96acc1a9eef52bf4a9a829fa632e570
+#+musl-cross-make.30e9d4b20f900eb82e01c8e4b5688dade2a46cc5da389d9ce9e6b585ae3bf1b6
+#+gnu-make.27930b13be2577aa1a3f36ac78bf945254b383ef26dfeaae7638697733384979
+#+busybox-diffutils.bac328cd9ee1d49d79af5f5804662776a744af8b7182f01f3077d4317496a9c0
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+zsh.540039c98b70e47532a72be5dafe678c7b165feebd9c8b374bcdadcc7bba4a40
+#+pthbs-banginstall.a744e9974338508052e962b094707ab231b8fdec7c9cbea15deb0d8d79b65e3c
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+patch.c2eafb0af80edc263a0c7a7e4311554a76529b412207d92880b4642ff1cb6a89
+#+libressl.e5f4ef808fde8a321adf88593cc91d2940ff2d376bb90fb8def2da02b60aeea5
+#+zstd.af63d098b4c4a19b1f6775488728adcb555098ad40381a058a310e8841575b81
+#+pkgconf-pkg-config.f0b276f1c7da4c4cddbfdeb52abf0d140b197bb5d8b7f54b41c3cffd94a5e9ae
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+skalibs.0765b819dcf970c1470e7866122824b9cf5852d78710d53e4b006e517b157e62
+#+libcap.ef2569f121242904c707e8268b835d0360ef9dc4a3b5c71658aedc6ec134f9ae
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+m4.654bbae705a59fd6d5bbdfa3b16b355b26abb93a85734293bdeda145bcd6bb2d
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+m4.654bbae705a59fd6d5bbdfa3b16b355b26abb93a85734293bdeda145bcd6bb2d
 #@untar:-z:sha256:39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87:.
 
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/bison b/variants/root-x86_64/bison
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+m4.654bbae705a59fd6d5bbdfa3b16b355b26abb93a85734293bdeda145bcd6bb2d
+#+flex.5c7504dfb9483dd305d2d9cb9c6ec60ea19f890835b2e0477c06f3cfb7b7347b
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:.
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+gnu-make.e83ebb5b87ae559c2ea259d37ea642ab860acd75ac003123f100e3c71cf0f901
-#+musl-cross-make.a50ca83c06d31066290d6d9f8fb236667c1b2dbc376cb34377761fe9b87386a1-
\ No newline at end of file
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+gnu-make.fe79d231925f61f60baf2f41d7bca8bca4f3227f86f0cd94531b2ca3afa50e28
+#+musl-cross-make.d2e5b6677277a6b1413b8b876a3be3d52f9ef52b90e96606caf9de61c8a27c78+
\ 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.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
-#+gnu-make.e83ebb5b87ae559c2ea259d37ea642ab860acd75ac003123f100e3c71cf0f901
-#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.fe79d231925f61f60baf2f41d7bca8bca4f3227f86f0cd94531b2ca3afa50e28
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
 #@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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+busybox.ff3b16946cdbf2ce7343381ed70a7f750879abc75038de247746048203841b05
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
 
 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.a50ca83c06d31066290d6d9f8fb236667c1b2dbc376cb34377761fe9b87386a1
-#+gnu-make.e83ebb5b87ae559c2ea259d37ea642ab860acd75ac003123f100e3c71cf0f901
+#+musl-cross-make.d2e5b6677277a6b1413b8b876a3be3d52f9ef52b90e96606caf9de61c8a27c78
+#+gnu-make.fe79d231925f61f60baf2f41d7bca8bca4f3227f86f0cd94531b2ca3afa50e28
 #@git:aa4d303a3139107919f73cece4eaf85a7dc75db6:busybox
 #@sha256:9ee52091d7a41e7e492d508574573fbebe64155d85a07980128f21105eaad1e2:busybox/.config
 
 PATH="$pthbs_build_environment:$PATH"
-mcm=/versions/musl-cross-make.a50ca83c06d31066290d6d9f8fb236667c1b2dbc376cb34377761fe9b87386a1
-make=/versions/gnu-make.e83ebb5b87ae559c2ea259d37ea642ab860acd75ac003123f100e3c71cf0f901
+mcm=/versions/musl-cross-make.d2e5b6677277a6b1413b8b876a3be3d52f9ef52b90e96606caf9de61c8a27c78
+make=/versions/gnu-make.fe79d231925f61f60baf2f41d7bca8bca4f3227f86f0cd94531b2ca3afa50e28
 
 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+certdata2pem.5c0c258b4d16212610a91d35efc8c9f83bc62e2f3136ec40e88fa704cd3af74e
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+skalibs.0765b819dcf970c1470e7866122824b9cf5852d78710d53e4b006e517b157e62
+#+s6.0a0809f9fb8a1af7fe836a604ee2958c32e226a0925c44ae36eaf8e6b3ad1235
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+zsh.540039c98b70e47532a72be5dafe678c7b165feebd9c8b374bcdadcc7bba4a40
+#+pthbs-banginstall.a744e9974338508052e962b094707ab231b8fdec7c9cbea15deb0d8d79b65e3c
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-dosfstools.646d5c5e72133c818963a9e99e89826208f8b481264b68973af6502ea42a778d
+#+busybox-e2fsprogs.1150e03ef66b3494a302ef348c5399cd83f8d187ec18be83e33622d79a124a8f
+#+busybox-iproute2.2d69338f1b06e866017d36427806fc4bd48cd0cf8c4b80bed0775b7626827186
+#+busybox-iputils.f9835ea350d820450fb8cba35a9530d249ba8ef1bfe8703d4c70bacd54e57aa9
+#+busybox-net-misc.a8624aa97680dd779a32643c64ecd8a11d985384f17273c3746f3fb92f5f3dac
+#+busybox-net-tools.df7805e87eead933e460970c073fde5f21bb7d9495c6689465a3ebc7658624cd
+#+busybox-traceroute.d77fb46c3e861e5e572baf8d44ca7ccfa0fecb660a2a3e98b47ec2c4cebbfe3d
+#+busybox-wget.453f723f71f19960fb26fce47ec35bdf51d43d6a8cfd21186b66592b85ee987e
+#+busybox-chpst.1a4be71c4516915a05bc95711ec6d6611062606f3a2d8ce1ea9ecb058aa6bf34
+#+busybox-console.38293edc2a7a6357820019da727bbd8b2e63548090f1543c307221acd086050f
+#+busybox-getty.ea7b660a1d1681f82dcfebccc456ed55586e14846c595047b61ba5450d8e412d
+#+busybox-i2c-tools.8b131a7b0b9047c3fd8f14787b86106ef79093ad89cd344c8569d583009e4317
+#+busybox-linux-extra.080f32bd4efc218bc95bdeea764c4b4b37983c808e82340755384e465b64b1fd
+#+busybox-mtd-utils.45d39cf0caa4a45c1d8ca211998fac4b1d263deca315e7998020e5f5be68f561
+#+busybox-shadow.2a21f788fbc92521fcd91ec2e094b010d093ea6971fb13553fe9a8130033570c
+#+busybox-su.6ef785ed674f201f7fa58e905c356b53de0954919b04ca87672c613d26e22913
+#+busybox-util-linux-priv.3ba100180ff712ad28626879a33d4a7cd66403e0977ec3bb2dc68b522fe9356b
+#+busybox-logging.0d2bde1abe8660e90380e4167e50771bfc15103e40f02e11a1254021d05f901b
+#+busybox-cron.5a60c95ba65f20cd5b11bf51249cb963f54c136eb11a862f2f57e8e9cce90c6a
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-login.2a55efdab8b34596743c732f5c77944e672ec1f1c795feb6f8d6a9abc6720410
+#+execline.358837544764a0f03735d410243ed0ed6f3c2c48749599f066376cf9c6ba62d4
+#+s6.0a0809f9fb8a1af7fe836a604ee2958c32e226a0925c44ae36eaf8e6b3ad1235
+#+ccx-utils.a5d57ca05a16568bba38b02cbfa642b546765fa2936e8019776f4226ccd85ab7
+#+applyuidgid-caps.fd8054ef4976e91b3a5e66a85180d6b2b84ee709c5754642a99f3f091623a267
+#+easyseccomp.23840732a9b63e0c1163a29c932b5721524349f4caf12f1b244f1dede026ed7c
+#+mlog.4d6490fa0722447a611cb1de1c1e96dbf9962fb65bbc3a8d5f793cc9bb1a23fe
+#+abduco.bbbefa6a4526b005f1e44e069af516812bddb017c810696713b04c060de677f9
+#+nawk.0cc8367178cb3621115e6b34905bc0ca9f8f235a834dbac171da0709aba0e1cf
 #@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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+zsh.540039c98b70e47532a72be5dafe678c7b165feebd9c8b374bcdadcc7bba4a40
+#+pthbs-banginstall.a744e9974338508052e962b094707ab231b8fdec7c9cbea15deb0d8d79b65e3c
+#+execline.358837544764a0f03735d410243ed0ed6f3c2c48749599f066376cf9c6ba62d4
+#+alpine-keys.c4418e6de79ddedc408dd6793ca296eabedbde0422d59bff30d353b1919ce9ca
+#+apk-tools.d85a4c6d0e33e280a24523589a1d041854ae11d8d0a1bdef03366aa873577172
+#+xbps.77bdcd4b90d34491b6766f33ae63cad0a9748ccc1a60edfad89ef2262b8e47a3
+#+container-bin-image.df87e977549df09aed77628011fa32824e39c97a4b111239fbfdf98706028228
 #@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.f95a9cc6e15c3caa3fc011561c831baa92ac41bdfd079005198d840f5669d9f2/command/apk.static' "${dest}/deps/command/"
-ln -sf '/versions/xbps.aa25bcdd58e8ef03c5170226008cb363f060c026c63345b1483b98e28a6d8d02/command/xbps-install.static' "${dest}/deps/command/"
+ln -sf '/versions/apk-tools.d85a4c6d0e33e280a24523589a1d041854ae11d8d0a1bdef03366aa873577172/command/apk.static' "${dest}/deps/command/"
+ln -sf '/versions/xbps.77bdcd4b90d34491b6766f33ae63cad0a9748ccc1a60edfad89ef2262b8e47a3/command/xbps-install.static' "${dest}/deps/command/"
 
-for f in '/versions/alpine-keys.f6cf0c450611090e007a46934e5fbe7836b79a7de08dbe6a588ba2d0d32f3cfa'/keys/alpine/*/*; do
+for f in '/versions/alpine-keys.c4418e6de79ddedc408dd6793ca296eabedbde0422d59bff30d353b1919ce9ca'/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.f6cf0c450611090e007a46934e5fbe7836b79a7de08dbe6a
 done
  
 mkdir -p "${dest}/deps/keys/void"
-for f in '/versions/xbps.aa25bcdd58e8ef03c5170226008cb363f060c026c63345b1483b98e28a6d8d02'/keys/void/*; do
+for f in '/versions/xbps.77bdcd4b90d34491b6766f33ae63cad0a9748ccc1a60edfad89ef2262b8e47a3'/keys/void/*; do
 	ln -sf "$f" "${dest}/deps/keys/void/"
 done
 
-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/"
+test -d '/versions/container-bin-image.df87e977549df09aed77628011fa32824e39c97a4b111239fbfdf98706028228/container-bin-image'
+test -f '/versions/container-bin-image.df87e977549df09aed77628011fa32824e39c97a4b111239fbfdf98706028228/container-bin-image/if'
+ln -sf '/versions/container-bin-image.df87e977549df09aed77628011fa32824e39c97a4b111239fbfdf98706028228/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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-dosfstools.646d5c5e72133c818963a9e99e89826208f8b481264b68973af6502ea42a778d
+#+busybox-e2fsprogs.1150e03ef66b3494a302ef348c5399cd83f8d187ec18be83e33622d79a124a8f
+#+busybox-iproute2.2d69338f1b06e866017d36427806fc4bd48cd0cf8c4b80bed0775b7626827186
+#+busybox-iputils.f9835ea350d820450fb8cba35a9530d249ba8ef1bfe8703d4c70bacd54e57aa9
+#+busybox-net-misc.a8624aa97680dd779a32643c64ecd8a11d985384f17273c3746f3fb92f5f3dac
+#+busybox-net-tools.df7805e87eead933e460970c073fde5f21bb7d9495c6689465a3ebc7658624cd
+#+busybox-traceroute.d77fb46c3e861e5e572baf8d44ca7ccfa0fecb660a2a3e98b47ec2c4cebbfe3d
+#+busybox-wget.453f723f71f19960fb26fce47ec35bdf51d43d6a8cfd21186b66592b85ee987e
+#+busybox-chpst.1a4be71c4516915a05bc95711ec6d6611062606f3a2d8ce1ea9ecb058aa6bf34
+#+busybox-console.38293edc2a7a6357820019da727bbd8b2e63548090f1543c307221acd086050f
+#+busybox-getty.ea7b660a1d1681f82dcfebccc456ed55586e14846c595047b61ba5450d8e412d
+#+busybox-i2c-tools.8b131a7b0b9047c3fd8f14787b86106ef79093ad89cd344c8569d583009e4317
+#+busybox-linux-extra.080f32bd4efc218bc95bdeea764c4b4b37983c808e82340755384e465b64b1fd
+#+busybox-mtd-utils.45d39cf0caa4a45c1d8ca211998fac4b1d263deca315e7998020e5f5be68f561
+#+busybox-shadow.2a21f788fbc92521fcd91ec2e094b010d093ea6971fb13553fe9a8130033570c
+#+busybox-su.6ef785ed674f201f7fa58e905c356b53de0954919b04ca87672c613d26e22913
+#+busybox-util-linux-priv.3ba100180ff712ad28626879a33d4a7cd66403e0977ec3bb2dc68b522fe9356b
+#+busybox-logging.0d2bde1abe8660e90380e4167e50771bfc15103e40f02e11a1254021d05f901b
+#+busybox-cron.5a60c95ba65f20cd5b11bf51249cb963f54c136eb11a862f2f57e8e9cce90c6a
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+execline.358837544764a0f03735d410243ed0ed6f3c2c48749599f066376cf9c6ba62d4
+#+s6.0a0809f9fb8a1af7fe836a604ee2958c32e226a0925c44ae36eaf8e6b3ad1235
+#+s6-portable-utils.e89a28e71183ec4f94589baf0a6ac44c3eae9bb3f860e822da00148841160b2e
+#+s6-linux-utils.6d3cb7324da646b9d3eee9e8fef2783cf20a9c9b55aa142e0c61657f3ee1862e
+#+zsh.540039c98b70e47532a72be5dafe678c7b165feebd9c8b374bcdadcc7bba4a40
+#+confz.e9308139e851269c2d6254ce537444cd51d21969e65997eadde6d1eb8318edde
+#+containers.38916ccdf5d4d2d0552145d6e2d4339cea4dfa4580045ce2f441fef12e07c3bc
+#+xbps.77bdcd4b90d34491b6766f33ae63cad0a9748ccc1a60edfad89ef2262b8e47a3
+#+zstd.af63d098b4c4a19b1f6775488728adcb555098ad40381a058a310e8841575b81
+#+apk-tools.d85a4c6d0e33e280a24523589a1d041854ae11d8d0a1bdef03366aa873577172
+#+alpine-keys.c4418e6de79ddedc408dd6793ca296eabedbde0422d59bff30d353b1919ce9ca
+#+getent.f5fa3699f718ba47eecf16aa60cfd675a364f94947c25e999b2969d76652a77a
+#+fileset.dafaef607656dec7be6824f0404008a3183cd92a6128a847ccdb52a04654e256
+#+ccx-utils.a5d57ca05a16568bba38b02cbfa642b546765fa2936e8019776f4226ccd85ab7
+#+easyseccomp.23840732a9b63e0c1163a29c932b5721524349f4caf12f1b244f1dede026ed7c
+#+findutils.bc855d11c059803776ea6dfebfb0c6ac4a64cf45bb05338bc2ab8e91ae1dd769
+#+nawk.0cc8367178cb3621115e6b34905bc0ca9f8f235a834dbac171da0709aba0e1cf+
\ 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+m4.654bbae705a59fd6d5bbdfa3b16b355b26abb93a85734293bdeda145bcd6bb2d
+#+libressl.e5f4ef808fde8a321adf88593cc91d2940ff2d376bb90fb8def2da02b60aeea5
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-dosfstools.646d5c5e72133c818963a9e99e89826208f8b481264b68973af6502ea42a778d
+#+busybox-e2fsprogs.1150e03ef66b3494a302ef348c5399cd83f8d187ec18be83e33622d79a124a8f
+#+busybox-iproute2.2d69338f1b06e866017d36427806fc4bd48cd0cf8c4b80bed0775b7626827186
+#+busybox-iputils.f9835ea350d820450fb8cba35a9530d249ba8ef1bfe8703d4c70bacd54e57aa9
+#+busybox-net-misc.a8624aa97680dd779a32643c64ecd8a11d985384f17273c3746f3fb92f5f3dac
+#+busybox-net-tools.df7805e87eead933e460970c073fde5f21bb7d9495c6689465a3ebc7658624cd
+#+busybox-traceroute.d77fb46c3e861e5e572baf8d44ca7ccfa0fecb660a2a3e98b47ec2c4cebbfe3d
+#+busybox-wget.453f723f71f19960fb26fce47ec35bdf51d43d6a8cfd21186b66592b85ee987e
+#+busybox-chpst.1a4be71c4516915a05bc95711ec6d6611062606f3a2d8ce1ea9ecb058aa6bf34
+#+busybox-console.38293edc2a7a6357820019da727bbd8b2e63548090f1543c307221acd086050f
+#+busybox-getty.ea7b660a1d1681f82dcfebccc456ed55586e14846c595047b61ba5450d8e412d
+#+busybox-i2c-tools.8b131a7b0b9047c3fd8f14787b86106ef79093ad89cd344c8569d583009e4317
+#+busybox-linux-extra.080f32bd4efc218bc95bdeea764c4b4b37983c808e82340755384e465b64b1fd
+#+busybox-mtd-utils.45d39cf0caa4a45c1d8ca211998fac4b1d263deca315e7998020e5f5be68f561
+#+busybox-shadow.2a21f788fbc92521fcd91ec2e094b010d093ea6971fb13553fe9a8130033570c
+#+busybox-su.6ef785ed674f201f7fa58e905c356b53de0954919b04ca87672c613d26e22913
+#+busybox-util-linux-priv.3ba100180ff712ad28626879a33d4a7cd66403e0977ec3bb2dc68b522fe9356b
+#+busybox-logging.0d2bde1abe8660e90380e4167e50771bfc15103e40f02e11a1254021d05f901b
+#+busybox-cron.5a60c95ba65f20cd5b11bf51249cb963f54c136eb11a862f2f57e8e9cce90c6a
+#+attr.e23607890e8f118e77b56979e46becc8ae39941564abeaabaaba79f27a1f9f1d
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+diffutils.250e99dd1e06ac420bee0f12d5964555c8aecda8789b897573e62ea8d843f7b6
+#+patch.c2eafb0af80edc263a0c7a7e4311554a76529b412207d92880b4642ff1cb6a89
+#+flex.5c7504dfb9483dd305d2d9cb9c6ec60ea19f890835b2e0477c06f3cfb7b7347b
+#+bison.ed5e8c99827332c484d694eb3b50371855037c072c9a851371ebbe378899ce7d
+#+rsync.79dca244e34309996c230b9fe11ab98a7468999cca156eb2d2ed25da2a51cb68
+#+execline.358837544764a0f03735d410243ed0ed6f3c2c48749599f066376cf9c6ba62d4
+#+s6.0a0809f9fb8a1af7fe836a604ee2958c32e226a0925c44ae36eaf8e6b3ad1235
+#+s6-rc.ddca5e27300b4bc87652940f7b82c50dffb813459f44bb61c4b888391067d840
+#+s6-portable-utils.e89a28e71183ec4f94589baf0a6ac44c3eae9bb3f860e822da00148841160b2e
+#+s6-linux-utils.6d3cb7324da646b9d3eee9e8fef2783cf20a9c9b55aa142e0c61657f3ee1862e
+#+s6-linux-init.035bb807050e8908ca667732d6dfbe7fa65712e3211d5aed51b1028e4eaab7e2
+#+mdevd.1d3109166eac2ef6083b8256cc78f1b6dddee8a850427950f6dc207fedcdea37
+#+s6-dns.5a5cea651fd152a0e24e08605555117812ba70502210b23274a6ef62fead1a86
+#+libressl.e5f4ef808fde8a321adf88593cc91d2940ff2d376bb90fb8def2da02b60aeea5
+#+s6-networking.ad4617645cc68e88a7aaea2ecb67d917f39b4263c22d3206ecaee53733637515
+#+zsh.540039c98b70e47532a72be5dafe678c7b165feebd9c8b374bcdadcc7bba4a40
+#+pthbs-banginstall.a744e9974338508052e962b094707ab231b8fdec7c9cbea15deb0d8d79b65e3c
+#+aat.a650763ed92ec5d25b11342ad509c47f9062095fb1162933e5f4cafda671261d
+#+confz.e9308139e851269c2d6254ce537444cd51d21969e65997eadde6d1eb8318edde
+#+containers.38916ccdf5d4d2d0552145d6e2d4339cea4dfa4580045ce2f441fef12e07c3bc
+#+fileset.dafaef607656dec7be6824f0404008a3183cd92a6128a847ccdb52a04654e256
+#+logincaps.df8cc19aa0c4c10e39cc11d59ab6bd432fd6eed32802505fc5c150f1d9a5e4ee
+#+snaprep.85c81cfc76809d6ce0fbdf89e3b0662a4f38f573a7b0dc5e423f815d3eced1e3
+#+curl.1fb78f1d4a8ff1ec1e8b5194f29071e1cc3283dcbd8ecb074643daa75091cebc
+#+git.cfeea5af94a09e11a18df28d9c769c72e99b5a4a87b7f1895571d15ceb3afad3
+#+xbps.77bdcd4b90d34491b6766f33ae63cad0a9748ccc1a60edfad89ef2262b8e47a3
+#+apk-tools.d85a4c6d0e33e280a24523589a1d041854ae11d8d0a1bdef03366aa873577172
+#+getent.f5fa3699f718ba47eecf16aa60cfd675a364f94947c25e999b2969d76652a77a
+#+getconf.6cdf302584697834974d13b08decec6061903ce8e1991e03aa7b2124e6878fc5
+#+iconv.97ae179e790e347dcdc0569f90f7d9ea4a1ad57c4a7861440371cc3cf242ac7c
+#+libcap.ef2569f121242904c707e8268b835d0360ef9dc4a3b5c71658aedc6ec134f9ae
+#+applyuidgid-caps.fd8054ef4976e91b3a5e66a85180d6b2b84ee709c5754642a99f3f091623a267
+#+ccx-utils.a5d57ca05a16568bba38b02cbfa642b546765fa2936e8019776f4226ccd85ab7
+#+user-env.494a2121d839001adc0df52099d0ca31b8ec86cc821c5eaf8c834b0310cccff5
+#+strace.8167b3905706591908b4abf15ec223aed6d2a0782b1e85720536561b3756d959
+#+mlog.4d6490fa0722447a611cb1de1c1e96dbf9962fb65bbc3a8d5f793cc9bb1a23fe
+#+findutils.bc855d11c059803776ea6dfebfb0c6ac4a64cf45bb05338bc2ab8e91ae1dd769
+#+nawk.0cc8367178cb3621115e6b34905bc0ca9f8f235a834dbac171da0709aba0e1cf
+#+squashfs-tools.d46140a5e54c3d8ba45d4be2842804fe4bcaa82c0d29135d511c6184c7cac918
+#+mandoc.888792ea85f55f88b9308472f77c7a67547fcc70b0e13dbefa36f823685fae83
+#+tinyssh.696ec34fd527f52a4faac6b316ad8c2ea075b789eab467707aa294d061993960
+#+system-config.22c7b8d50ea3bfd798db5cb229d4815015ee9e9bcc40743620dd2f443e17c7b4
+#+system-config-rc.c59c5e6040075358ee0eae485371623724c4afa725a0cce76f95956de0dcd132
+#+system-config-scripts.d12b6dabb022c82624cea676416ba5b32ac544f18b47d118b1a1d773352e78fb
+#+system-config-init.c0a37f2d84d81720c1bb2d8c07bbebd6f53bc42bb79cb0b6ab0e76519d9d673e
+#+system-config-zsh.6a667dabeda20585d699e88e3513515d73847d49e7c0bd26b1475cb95c41cbf7
+#+busybox-modutils.5f2f95aa2800c0b5cc9b151702efe803d3b8afa39ed1b5b5e699e6c5264619e9+
\ 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+m4.654bbae705a59fd6d5bbdfa3b16b355b26abb93a85734293bdeda145bcd6bb2d
 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:.
 
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/dune b/variants/root-x86_64/dune
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+ocaml.521fe819ed3f6a47288dce0fd3fb0e8c33fd13bdd20ee178f696abfa1e911456
 #@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.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/versions/musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c/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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+m4.654bbae705a59fd6d5bbdfa3b16b355b26abb93a85734293bdeda145bcd6bb2d
+#+patch.c2eafb0af80edc263a0c7a7e4311554a76529b412207d92880b4642ff1cb6a89
+#+flex.5c7504dfb9483dd305d2d9cb9c6ec60ea19f890835b2e0477c06f3cfb7b7347b
+#+bison.ed5e8c99827332c484d694eb3b50371855037c072c9a851371ebbe378899ce7d
+#+libseccomp.c6438cd1565c52613ce76cb93eede4f3d236ece82d9723e24453c19f0b9eb051
+#+error-standalone.e4f0922ad88e3acebf4ac60f1eacc6332d09381ce8a3d14bd6b0c7f5dfc04be7
+#+argp-standalone.db9d3c36bb8df7fda0ebd9170137f845c12920e3fc0a74adf81f0d664c6e14b9
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+skalibs.0765b819dcf970c1470e7866122824b9cf5852d78710d53e4b006e517b157e62
 #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline
 
 
@@ -46,7 +46,7 @@ cd 'execline'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.f46389b8118622cea646bd3563ba4163989500f391ae34c328a193e26449f01f/sysdeps' \
+	--with-sysdeps='/versions/skalibs.0765b819dcf970c1470e7866122824b9cf5852d78710d53e4b006e517b157e62/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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.a50ca83c06d31066290d6d9f8fb236667c1b2dbc376cb34377761fe9b87386a1
-#+gnu-make.e83ebb5b87ae559c2ea259d37ea642ab860acd75ac003123f100e3c71cf0f901
-#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+skalibs.2d5bee0bae3f8e378baf4c0f2db82f35edc9f8fcec4ef73ada0e0f830ed0cac7
+#+musl-cross-make.d2e5b6677277a6b1413b8b876a3be3d52f9ef52b90e96606caf9de61c8a27c78
+#+gnu-make.fe79d231925f61f60baf2f41d7bca8bca4f3227f86f0cd94531b2ca3afa50e28
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+skalibs.9739711ab76253b4e0de2759c8276a8f73e414b8017b821103849ffdc37cfba3
 #@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.2d5bee0bae3f8e378baf4c0f2db82f35edc9f8fcec4ef73ada0e0f830ed0cac7/sysdeps' \
+	--with-sysdeps='/versions/skalibs.9739711ab76253b4e0de2759c8276a8f73e414b8017b821103849ffdc37cfba3/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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+zsh.540039c98b70e47532a72be5dafe678c7b165feebd9c8b374bcdadcc7bba4a40
+#+pthbs-banginstall.a744e9974338508052e962b094707ab231b8fdec7c9cbea15deb0d8d79b65e3c
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+m4.654bbae705a59fd6d5bbdfa3b16b355b26abb93a85734293bdeda145bcd6bb2d
 #@untar:-J:sha256:1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5:.
 
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/flex b/variants/root-x86_64/flex
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+m4.654bbae705a59fd6d5bbdfa3b16b355b26abb93a85734293bdeda145bcd6bb2d
 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:.
 
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/getconf b/variants/root-x86_64/getconf
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+m4.654bbae705a59fd6d5bbdfa3b16b355b26abb93a85734293bdeda145bcd6bb2d
+#+libressl.e5f4ef808fde8a321adf88593cc91d2940ff2d376bb90fb8def2da02b60aeea5
+#+curl.1fb78f1d4a8ff1ec1e8b5194f29071e1cc3283dcbd8ecb074643daa75091cebc
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b
-#+gnu-make.e83ebb5b87ae559c2ea259d37ea642ab860acd75ac003123f100e3c71cf0f901
-#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.fe79d231925f61f60baf2f41d7bca8bca4f3227f86f0cd94531b2ca3afa50e28
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.a50ca83c06d31066290d6d9f8fb236667c1b2dbc376cb34377761fe9b87386a1
+#+musl-cross-make.d2e5b6677277a6b1413b8b876a3be3d52f9ef52b90e96606caf9de61c8a27c78
 #@untar:-z:sha256:dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3:.
 
 
@@ -36,7 +36,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd 'make-4.4.1'
 
 
-mcm=/versions/musl-cross-make.a50ca83c06d31066290d6d9f8fb236667c1b2dbc376cb34377761fe9b87386a1
+mcm=/versions/musl-cross-make.d2e5b6677277a6b1413b8b876a3be3d52f9ef52b90e96606caf9de61c8a27c78
 
 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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+m4.654bbae705a59fd6d5bbdfa3b16b355b26abb93a85734293bdeda145bcd6bb2d
 #@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:.
 
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/iconv b/variants/root-x86_64/iconv
@@ -1,33 +1,33 @@
 #!/usr/bin/env pthbs-build
-#+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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+m4.654bbae705a59fd6d5bbdfa3b16b355b26abb93a85734293bdeda145bcd6bb2d
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+m4.654bbae705a59fd6d5bbdfa3b16b355b26abb93a85734293bdeda145bcd6bb2d
 #@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:.
 
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/libbsd b/variants/root-x86_64/libbsd
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+m4.654bbae705a59fd6d5bbdfa3b16b355b26abb93a85734293bdeda145bcd6bb2d
+#+libmd.14acc4776adb9f7abfc54c3cb6b8f9ea25b3509f615b089aa749bfac6ccbb0d5
 #@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:.
 
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/libcap b/variants/root-x86_64/libcap
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+pkgconf-pkg-config.f0b276f1c7da4c4cddbfdeb52abf0d140b197bb5d8b7f54b41c3cffd94a5e9ae
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.a50ca83c06d31066290d6d9f8fb236667c1b2dbc376cb34377761fe9b87386a1
-#+gnu-make.e83ebb5b87ae559c2ea259d37ea642ab860acd75ac003123f100e3c71cf0f901
-#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+musl-cross-make.d2e5b6677277a6b1413b8b876a3be3d52f9ef52b90e96606caf9de61c8a27c78
+#+gnu-make.fe79d231925f61f60baf2f41d7bca8bca4f3227f86f0cd94531b2ca3afa50e28
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+m4.654bbae705a59fd6d5bbdfa3b16b355b26abb93a85734293bdeda145bcd6bb2d
+#+flex.5c7504dfb9483dd305d2d9cb9c6ec60ea19f890835b2e0477c06f3cfb7b7347b
+#+bison.ed5e8c99827332c484d694eb3b50371855037c072c9a851371ebbe378899ce7d
+#+musl-fts.e116368fd3d3990e5fbd8d0873c0bc43a0de8f894600c3587cb23d32771c007c
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+zstd.af63d098b4c4a19b1f6775488728adcb555098ad40381a058a310e8841575b81
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+m4.654bbae705a59fd6d5bbdfa3b16b355b26abb93a85734293bdeda145bcd6bb2d
 #@untar:-J:sha256:1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332:.
 
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/libressl b/variants/root-x86_64/libressl
@@ -1,37 +1,37 @@
 #!/usr/bin/env pthbs-build
-#+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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+m4.654bbae705a59fd6d5bbdfa3b16b355b26abb93a85734293bdeda145bcd6bb2d
+#+ca-certificates-wip-donotuse.fe8a115a86f2fc748f97708d09d2968a0ff177347786c877392f2b446edfd160
 #@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.88dd31017b1036079ee4d3c920396c83e7af81e908373d14d368cd6e3497f30d/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/"
+cp -vs '/versions/ca-certificates-wip-donotuse.fe8a115a86f2fc748f97708d09d2968a0ff177347786c877392f2b446edfd160/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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+m4.654bbae705a59fd6d5bbdfa3b16b355b26abb93a85734293bdeda145bcd6bb2d
+#+pkgconf-pkg-config.f0b276f1c7da4c4cddbfdeb52abf0d140b197bb5d8b7f54b41c3cffd94a5e9ae
+#+gperf.9c726f29a95827ff823423d55d38fe4bd81e74d8fb66d79f11360a6b5d635554
 #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:.
 
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/libunwind b/variants/root-x86_64/libunwind
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+m4.654bbae705a59fd6d5bbdfa3b16b355b26abb93a85734293bdeda145bcd6bb2d
 #@untar:-z:sha256:ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157:.
 
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-modutils.5f2f95aa2800c0b5cc9b151702efe803d3b8afa39ed1b5b5e699e6c5264619e9
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+findutils.bc855d11c059803776ea6dfebfb0c6ac4a64cf45bb05338bc2ab8e91ae1dd769
+#+diffutils.250e99dd1e06ac420bee0f12d5964555c8aecda8789b897573e62ea8d843f7b6
+#+patch.c2eafb0af80edc263a0c7a7e4311554a76529b412207d92880b4642ff1cb6a89
+#+flex.5c7504dfb9483dd305d2d9cb9c6ec60ea19f890835b2e0477c06f3cfb7b7347b
+#+bison.ed5e8c99827332c484d694eb3b50371855037c072c9a851371ebbe378899ce7d
+#+rsync.79dca244e34309996c230b9fe11ab98a7468999cca156eb2d2ed25da2a51cb68
+#+zstd.af63d098b4c4a19b1f6775488728adcb555098ad40381a058a310e8841575b81
+#+libelf.5c3db3625920a30279c52dd5e2a89a80ed9dcc40d8f5c0aff28a453ad62cb796
+#+pkgconf-pkg-config.f0b276f1c7da4c4cddbfdeb52abf0d140b197bb5d8b7f54b41c3cffd94a5e9ae
+#+nawk.0cc8367178cb3621115e6b34905bc0ca9f8f235a834dbac171da0709aba0e1cf
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.a50ca83c06d31066290d6d9f8fb236667c1b2dbc376cb34377761fe9b87386a1
-#+gnu-make.e83ebb5b87ae559c2ea259d37ea642ab860acd75ac003123f100e3c71cf0f901
-#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+skalibs.2d5bee0bae3f8e378baf4c0f2db82f35edc9f8fcec4ef73ada0e0f830ed0cac7
-#+execline.75c97cf57ace71efcb6aa51e0b3f53b3eacffbcf859faa366c695b2c7e1feda4
-#+libcap.be24f17de1c2e98a433e4539c25d5582656c989b2b782cdfe2f33e045bb57606
+#+musl-cross-make.d2e5b6677277a6b1413b8b876a3be3d52f9ef52b90e96606caf9de61c8a27c78
+#+gnu-make.fe79d231925f61f60baf2f41d7bca8bca4f3227f86f0cd94531b2ca3afa50e28
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+skalibs.9739711ab76253b4e0de2759c8276a8f73e414b8017b821103849ffdc37cfba3
+#+execline.b258d8086d684707b6d8edd444d70baad5ce68c62abb9973f3b909191aa9a06b
+#+libcap.75b343a3e3576b4df5ea5a1f1768c27e05448017dc5c1ce33b47af47a6eb7b4d
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+zsh.540039c98b70e47532a72be5dafe678c7b165feebd9c8b374bcdadcc7bba4a40
+#+pthbs-banginstall.a744e9974338508052e962b094707ab231b8fdec7c9cbea15deb0d8d79b65e3c
+#+execline.358837544764a0f03735d410243ed0ed6f3c2c48749599f066376cf9c6ba62d4
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+ccx-utils.a5d57ca05a16568bba38b02cbfa642b546765fa2936e8019776f4226ccd85ab7
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
 #@untar:-z:sha256:3be4a26d825ffdfda52a56fc43246456989a3630093cced3fbddf4771ee58a70:.
 
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/mandoc b/variants/root-x86_64/mandoc
@@ -1,35 +1,35 @@
 #!/usr/bin/env pthbs-build
-#+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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+zsh.540039c98b70e47532a72be5dafe678c7b165feebd9c8b374bcdadcc7bba4a40
+#+pthbs-banginstall.a744e9974338508052e962b094707ab231b8fdec7c9cbea15deb0d8d79b65e3c
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+skalibs.0765b819dcf970c1470e7866122824b9cf5852d78710d53e4b006e517b157e62
+#+execline.358837544764a0f03735d410243ed0ed6f3c2c48749599f066376cf9c6ba62d4
 #@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd
 
 
@@ -47,7 +47,7 @@ cd 'mdevd'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.f46389b8118622cea646bd3563ba4163989500f391ae34c328a193e26449f01f/sysdeps' \
+	--with-sysdeps='/versions/skalibs.0765b819dcf970c1470e7866122824b9cf5852d78710d53e4b006e517b157e62/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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-dosfstools.646d5c5e72133c818963a9e99e89826208f8b481264b68973af6502ea42a778d
+#+busybox-e2fsprogs.1150e03ef66b3494a302ef348c5399cd83f8d187ec18be83e33622d79a124a8f
+#+busybox-iproute2.2d69338f1b06e866017d36427806fc4bd48cd0cf8c4b80bed0775b7626827186
+#+busybox-iputils.f9835ea350d820450fb8cba35a9530d249ba8ef1bfe8703d4c70bacd54e57aa9
+#+busybox-net-misc.a8624aa97680dd779a32643c64ecd8a11d985384f17273c3746f3fb92f5f3dac
+#+busybox-net-tools.df7805e87eead933e460970c073fde5f21bb7d9495c6689465a3ebc7658624cd
+#+busybox-traceroute.d77fb46c3e861e5e572baf8d44ca7ccfa0fecb660a2a3e98b47ec2c4cebbfe3d
+#+busybox-wget.453f723f71f19960fb26fce47ec35bdf51d43d6a8cfd21186b66592b85ee987e
+#+busybox-chpst.1a4be71c4516915a05bc95711ec6d6611062606f3a2d8ce1ea9ecb058aa6bf34
+#+busybox-console.38293edc2a7a6357820019da727bbd8b2e63548090f1543c307221acd086050f
+#+busybox-getty.ea7b660a1d1681f82dcfebccc456ed55586e14846c595047b61ba5450d8e412d
+#+busybox-i2c-tools.8b131a7b0b9047c3fd8f14787b86106ef79093ad89cd344c8569d583009e4317
+#+busybox-linux-extra.080f32bd4efc218bc95bdeea764c4b4b37983c808e82340755384e465b64b1fd
+#+busybox-mtd-utils.45d39cf0caa4a45c1d8ca211998fac4b1d263deca315e7998020e5f5be68f561
+#+busybox-shadow.2a21f788fbc92521fcd91ec2e094b010d093ea6971fb13553fe9a8130033570c
+#+busybox-su.6ef785ed674f201f7fa58e905c356b53de0954919b04ca87672c613d26e22913
+#+busybox-util-linux-priv.3ba100180ff712ad28626879a33d4a7cd66403e0977ec3bb2dc68b522fe9356b
+#+busybox-logging.0d2bde1abe8660e90380e4167e50771bfc15103e40f02e11a1254021d05f901b
+#+busybox-cron.5a60c95ba65f20cd5b11bf51249cb963f54c136eb11a862f2f57e8e9cce90c6a
+#+execline.358837544764a0f03735d410243ed0ed6f3c2c48749599f066376cf9c6ba62d4
+#+s6.0a0809f9fb8a1af7fe836a604ee2958c32e226a0925c44ae36eaf8e6b3ad1235
+#+mdev-scripts.3de9716d6e32fabebd0cca835e31445e23f5afd9d45a4ee5da7dbdccbddc5c82
+#+mdevd.1d3109166eac2ef6083b8256cc78f1b6dddee8a850427950f6dc207fedcdea37
+#+busybox-modutils.5f2f95aa2800c0b5cc9b151702efe803d3b8afa39ed1b5b5e699e6c5264619e9+
\ 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.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.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.a50ca83c06d31066290d6d9f8fb236667c1b2dbc376cb34377761fe9b87386a1
-#+gnu-make.e83ebb5b87ae559c2ea259d37ea642ab860acd75ac003123f100e3c71cf0f901
-#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+musl-cross-make.d2e5b6677277a6b1413b8b876a3be3d52f9ef52b90e96606caf9de61c8a27c78
+#+gnu-make.fe79d231925f61f60baf2f41d7bca8bca4f3227f86f0cd94531b2ca3afa50e28
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.d3343d72a8f32f0fb5df1f5fd9784a8567baa5c2e1701c70692b84d45a758658
+#+musl-cross-make.95ac918c8ee08967d3990b8fd1cf8e8ac6017c94d948e8d8071cc4214255e900
 #@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.d3343d72a8f32f0fb5df1f5fd9784a8567baa5c2e1701c70692b84d45a758658
+bootstrap=/versions/musl-cross-make.95ac918c8ee08967d3990b8fd1cf8e8ac6017c94d948e8d8071cc4214255e900
 "$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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+bison.ed5e8c99827332c484d694eb3b50371855037c072c9a851371ebbe378899ce7d
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+ocaml.521fe819ed3f6a47288dce0fd3fb0e8c33fd13bdd20ee178f696abfa1e911456
+#+ocaml-findlib.6ca16981bb74ef6240328c84eaacb1717e5984b253fc4daf2ce1507c35699c2b
+#+ocamlbuild.6ee9045280c7fec584ba6d1fad205979f771b1c9a3da99c072ae955ffa3d0af1
+#+opam.c812055c297ae658d4246cd3ad2ec27bfd517daff461b01153f9541088b9016e
+#+ocaml-topkg.4b1999a15e5189f3e893cf099dfd1af3736ed4a32993e57a0e9bc65e21e789d9
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+ocaml.521fe819ed3f6a47288dce0fd3fb0e8c33fd13bdd20ee178f696abfa1e911456
+#+dune.d2b7bebd7272abe993e54d58035a66a2268fa0febeec2571ae92ed8af845f6b2
+#+ocaml_intrinsics_kernel.2c0fb0363f2584923273f9fb1915bd683c8689d7046df895e4910a68f3de7464
+#+ocaml-sexplib0.b8605bb45031a469c22e7f6f0cd2ec0355363f8588646ce952c6880cb83ab93c
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+ocaml.521fe819ed3f6a47288dce0fd3fb0e8c33fd13bdd20ee178f696abfa1e911456
+#+ocaml-findlib.6ca16981bb74ef6240328c84eaacb1717e5984b253fc4daf2ce1507c35699c2b
+#+ocamlbuild.6ee9045280c7fec584ba6d1fad205979f771b1c9a3da99c072ae955ffa3d0af1
+#+opam.c812055c297ae658d4246cd3ad2ec27bfd517daff461b01153f9541088b9016e
+#+ocaml-topkg.4b1999a15e5189f3e893cf099dfd1af3736ed4a32993e57a0e9bc65e21e789d9
+#+ocaml-astring.ac307c94ed85749e4b7b107f9898ea9539dd630c861ac1b1e387c4fb92af8182
+#+ocaml-fpath.a73307e0c9fd1ba8dba8d8777df93e3a8307c89bb5eca1e55ebc24a651373728
+#+ocaml-rresult.ec6e2bf2341fe137abe6ab3567ae46486b2b5b0369ad67b76e0fa23108677a61
+#+ocaml-fmt.257701edd4dfd2a69cbfcbddc801b1a46c6487519f90396b68ee74214d7e4c8a
+#+ocaml-logs.d092d8ad3cf6c30de9fe3c1b7a0596b4123788c565d553eca78eaf29a3165d67
+#+ocaml-mtime.47c5093b8b5e1d02897235a18851ee5d9e12ae8bb2620c33dcfd68019b5bfd18
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+ocaml.521fe819ed3f6a47288dce0fd3fb0e8c33fd13bdd20ee178f696abfa1e911456
+#+ocaml-findlib.6ca16981bb74ef6240328c84eaacb1717e5984b253fc4daf2ce1507c35699c2b
+#+ocamlbuild.6ee9045280c7fec584ba6d1fad205979f771b1c9a3da99c072ae955ffa3d0af1
+#+opam.c812055c297ae658d4246cd3ad2ec27bfd517daff461b01153f9541088b9016e
+#+ocaml-topkg.4b1999a15e5189f3e893cf099dfd1af3736ed4a32993e57a0e9bc65e21e789d9
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+ocaml.521fe819ed3f6a47288dce0fd3fb0e8c33fd13bdd20ee178f696abfa1e911456
+#+dune.d2b7bebd7272abe993e54d58035a66a2268fa0febeec2571ae92ed8af845f6b2
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+ocaml.521fe819ed3f6a47288dce0fd3fb0e8c33fd13bdd20ee178f696abfa1e911456
+#+dune.d2b7bebd7272abe993e54d58035a66a2268fa0febeec2571ae92ed8af845f6b2
+#+ocamlbuild.6ee9045280c7fec584ba6d1fad205979f771b1c9a3da99c072ae955ffa3d0af1
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+m4.654bbae705a59fd6d5bbdfa3b16b355b26abb93a85734293bdeda145bcd6bb2d
+#+netbsd-curses.2b849ae5f2a80c5b7a7322b28a5795261b024303edfeb6ae9100c8c4d32345cc
+#+ocaml.521fe819ed3f6a47288dce0fd3fb0e8c33fd13bdd20ee178f696abfa1e911456
+#+ocamlbuild.6ee9045280c7fec584ba6d1fad205979f771b1c9a3da99c072ae955ffa3d0af1
 #@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.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/versions/musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c/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.e90dc3a1c334c0eed5b655a830d9a2e3e438a91ab03caff718eda6cb8293862a"
+stdlib="$pthbs_destdir/versions/ocaml.521fe819ed3f6a47288dce0fd3fb0e8c33fd13bdd20ee178f696abfa1e911456"
 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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+ocaml.521fe819ed3f6a47288dce0fd3fb0e8c33fd13bdd20ee178f696abfa1e911456
+#+ocaml-findlib.6ca16981bb74ef6240328c84eaacb1717e5984b253fc4daf2ce1507c35699c2b
+#+ocamlbuild.6ee9045280c7fec584ba6d1fad205979f771b1c9a3da99c072ae955ffa3d0af1
+#+opam.c812055c297ae658d4246cd3ad2ec27bfd517daff461b01153f9541088b9016e
+#+ocaml-topkg.4b1999a15e5189f3e893cf099dfd1af3736ed4a32993e57a0e9bc65e21e789d9
+#+ocaml-cmdliner.3b489061b94eb4ab802b489a5ab1abaed6715846f4cf8d518c3fec4b089456aa
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+ocaml.521fe819ed3f6a47288dce0fd3fb0e8c33fd13bdd20ee178f696abfa1e911456
+#+ocaml-findlib.6ca16981bb74ef6240328c84eaacb1717e5984b253fc4daf2ce1507c35699c2b
+#+ocamlbuild.6ee9045280c7fec584ba6d1fad205979f771b1c9a3da99c072ae955ffa3d0af1
+#+opam.c812055c297ae658d4246cd3ad2ec27bfd517daff461b01153f9541088b9016e
+#+ocaml-topkg.4b1999a15e5189f3e893cf099dfd1af3736ed4a32993e57a0e9bc65e21e789d9
+#+ocaml-astring.ac307c94ed85749e4b7b107f9898ea9539dd630c861ac1b1e387c4fb92af8182
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+ocaml.521fe819ed3f6a47288dce0fd3fb0e8c33fd13bdd20ee178f696abfa1e911456
+#+ocaml-findlib.6ca16981bb74ef6240328c84eaacb1717e5984b253fc4daf2ce1507c35699c2b
+#+ocamlbuild.6ee9045280c7fec584ba6d1fad205979f771b1c9a3da99c072ae955ffa3d0af1
+#+opam.c812055c297ae658d4246cd3ad2ec27bfd517daff461b01153f9541088b9016e
+#+ocaml-topkg.4b1999a15e5189f3e893cf099dfd1af3736ed4a32993e57a0e9bc65e21e789d9
+#+ocaml-mtime.47c5093b8b5e1d02897235a18851ee5d9e12ae8bb2620c33dcfd68019b5bfd18
+#+ocaml-cmdliner.3b489061b94eb4ab802b489a5ab1abaed6715846f4cf8d518c3fec4b089456aa
+#+ocaml-fmt.257701edd4dfd2a69cbfcbddc801b1a46c6487519f90396b68ee74214d7e4c8a
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+ocaml.521fe819ed3f6a47288dce0fd3fb0e8c33fd13bdd20ee178f696abfa1e911456
+#+dune.d2b7bebd7272abe993e54d58035a66a2268fa0febeec2571ae92ed8af845f6b2
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+ocaml.521fe819ed3f6a47288dce0fd3fb0e8c33fd13bdd20ee178f696abfa1e911456
+#+ocaml-findlib.6ca16981bb74ef6240328c84eaacb1717e5984b253fc4daf2ce1507c35699c2b
+#+ocamlbuild.6ee9045280c7fec584ba6d1fad205979f771b1c9a3da99c072ae955ffa3d0af1
+#+opam.c812055c297ae658d4246cd3ad2ec27bfd517daff461b01153f9541088b9016e
+#+ocaml-topkg.4b1999a15e5189f3e893cf099dfd1af3736ed4a32993e57a0e9bc65e21e789d9
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+ocaml.521fe819ed3f6a47288dce0fd3fb0e8c33fd13bdd20ee178f696abfa1e911456
+#+dune.d2b7bebd7272abe993e54d58035a66a2268fa0febeec2571ae92ed8af845f6b2
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+ocaml.521fe819ed3f6a47288dce0fd3fb0e8c33fd13bdd20ee178f696abfa1e911456
+#+dune.d2b7bebd7272abe993e54d58035a66a2268fa0febeec2571ae92ed8af845f6b2
+#+ocaml-compiler-libs.4b5cc082a3ddb897b416d6c99f8f54d7c3018562800e24068db1164a2d5c139d
+#+ocaml-cppo.564e815d617bf916e212e68f199a3b9ed5355eafffe15d92bd16218596d92d32
+#+ocaml-findlib.6ca16981bb74ef6240328c84eaacb1717e5984b253fc4daf2ce1507c35699c2b
+#+ocaml-ppx_derivers.7059e7257784e69c72d61645a159698d86faaaea7556d04ed463be5645bf7a7c
+#+ocaml-ppxlib.28262d138f0ed909b8d724a225dba8785ca91a2860c5493aeb8c684cf4bdeff2
+#+ocaml-sexplib0.b8605bb45031a469c22e7f6f0cd2ec0355363f8588646ce952c6880cb83ab93c
+#+ocaml-stdlib-shims.45a62ebf8728437f8cd306afa4beee599cfc7c69699d7d552f80ac409ee17a64
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+ocaml.521fe819ed3f6a47288dce0fd3fb0e8c33fd13bdd20ee178f696abfa1e911456
+#+dune.d2b7bebd7272abe993e54d58035a66a2268fa0febeec2571ae92ed8af845f6b2
+#+ocaml-compiler-libs.4b5cc082a3ddb897b416d6c99f8f54d7c3018562800e24068db1164a2d5c139d
+#+ocaml-ppx_derivers.7059e7257784e69c72d61645a159698d86faaaea7556d04ed463be5645bf7a7c
+#+ocaml-sexplib0.b8605bb45031a469c22e7f6f0cd2ec0355363f8588646ce952c6880cb83ab93c
+#+ocaml-stdlib-shims.45a62ebf8728437f8cd306afa4beee599cfc7c69699d7d552f80ac409ee17a64
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+ocaml.521fe819ed3f6a47288dce0fd3fb0e8c33fd13bdd20ee178f696abfa1e911456
+#+ocaml-findlib.6ca16981bb74ef6240328c84eaacb1717e5984b253fc4daf2ce1507c35699c2b
+#+ocamlbuild.6ee9045280c7fec584ba6d1fad205979f771b1c9a3da99c072ae955ffa3d0af1
+#+opam.c812055c297ae658d4246cd3ad2ec27bfd517daff461b01153f9541088b9016e
+#+ocaml-topkg.4b1999a15e5189f3e893cf099dfd1af3736ed4a32993e57a0e9bc65e21e789d9
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+ocaml.521fe819ed3f6a47288dce0fd3fb0e8c33fd13bdd20ee178f696abfa1e911456
+#+dune.d2b7bebd7272abe993e54d58035a66a2268fa0febeec2571ae92ed8af845f6b2
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+ocaml.521fe819ed3f6a47288dce0fd3fb0e8c33fd13bdd20ee178f696abfa1e911456
+#+dune.d2b7bebd7272abe993e54d58035a66a2268fa0febeec2571ae92ed8af845f6b2
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+ocaml.521fe819ed3f6a47288dce0fd3fb0e8c33fd13bdd20ee178f696abfa1e911456
+#+ocaml-findlib.6ca16981bb74ef6240328c84eaacb1717e5984b253fc4daf2ce1507c35699c2b
+#+ocamlbuild.6ee9045280c7fec584ba6d1fad205979f771b1c9a3da99c072ae955ffa3d0af1
+#+opam.c812055c297ae658d4246cd3ad2ec27bfd517daff461b01153f9541088b9016e
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+ocaml.521fe819ed3f6a47288dce0fd3fb0e8c33fd13bdd20ee178f696abfa1e911456
+#+dune.d2b7bebd7272abe993e54d58035a66a2268fa0febeec2571ae92ed8af845f6b2
+#+ocamlbuild.6ee9045280c7fec584ba6d1fad205979f771b1c9a3da99c072ae955ffa3d0af1
+#+ocaml-base.1847f99a1e222a039697cd157d9733c2c33c0c1a13ef211ba23bed3a3b2bc46c
+#+opam.c812055c297ae658d4246cd3ad2ec27bfd517daff461b01153f9541088b9016e
+#+ocaml-bos.8afaf779d224056c534fa29f38c22a29378270c3d2387a7e58415ab9b314fab8
+#+ocaml-lun.3e73047482237a66d9dbda9e26cb7b1203edd7f56b5e586ead2604f65b0a6935
+#+ocaml-ppx_deriving.dccdeba3b6ee3ed565fee367b150bc8478fa282bbbc2f4ca720f0ba226b59a1e+
\ 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+m4.654bbae705a59fd6d5bbdfa3b16b355b26abb93a85734293bdeda145bcd6bb2d
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+ocaml.521fe819ed3f6a47288dce0fd3fb0e8c33fd13bdd20ee178f696abfa1e911456
+#+dune.d2b7bebd7272abe993e54d58035a66a2268fa0febeec2571ae92ed8af845f6b2
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+m4.654bbae705a59fd6d5bbdfa3b16b355b26abb93a85734293bdeda145bcd6bb2d
+#+ocaml.521fe819ed3f6a47288dce0fd3fb0e8c33fd13bdd20ee178f696abfa1e911456
 #@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.28a2a0a2457965c1cd6e4ab8b4dc755388676061ed2f49368cfdc85eade9573b/x86_64-linux-musl/lib/ld-musl-x86_64.so.1')
+		(*'/versions/musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c/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.e90dc3a1c334c0eed5b655a830d9a2e3e438a91ab03caff718eda6cb8293862a"
+stdlib="$pthbs_destdir/versions/ocaml.521fe819ed3f6a47288dce0fd3fb0e8c33fd13bdd20ee178f696abfa1e911456"
 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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+diffutils.250e99dd1e06ac420bee0f12d5964555c8aecda8789b897573e62ea8d843f7b6
+#+patch.c2eafb0af80edc263a0c7a7e4311554a76529b412207d92880b4642ff1cb6a89
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+getconf.6cdf302584697834974d13b08decec6061903ce8e1991e03aa7b2124e6878fc5
+#+ocaml.521fe819ed3f6a47288dce0fd3fb0e8c33fd13bdd20ee178f696abfa1e911456
+#+dune.d2b7bebd7272abe993e54d58035a66a2268fa0febeec2571ae92ed8af845f6b2
 #@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.0c9a26d1c49b3e5b855f5616d983aa2fd7279152203a04670971cbbb1c13aec3/command/dune' \
+	--with-dune='/versions/dune.d2b7bebd7272abe993e54d58035a66a2268fa0febeec2571ae92ed8af845f6b2/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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+m4.654bbae705a59fd6d5bbdfa3b16b355b26abb93a85734293bdeda145bcd6bb2d
 #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:.
 
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/pkgconf b/variants/root-x86_64/pkgconf
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+m4.654bbae705a59fd6d5bbdfa3b16b355b26abb93a85734293bdeda145bcd6bb2d
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+pkgconf.0c122300faac007dda7e49ed2bd509efbbdeb0821a0f4130a325a9f11ed6e4f1
 
 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+m4.654bbae705a59fd6d5bbdfa3b16b355b26abb93a85734293bdeda145bcd6bb2d
 #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:.
 
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+zsh.540039c98b70e47532a72be5dafe678c7b165feebd9c8b374bcdadcc7bba4a40
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+execline.75c97cf57ace71efcb6aa51e0b3f53b3eacffbcf859faa366c695b2c7e1feda4
-#+lnstools.7db5f76b1edfca37adad1539a0137a18107da6406acb965be0bc7b323fc90e45
-#+sandbox_rootfs.a915c31bff9610693b8703920666780ebfc91311c5c4f25087a96c4eb61be6a4
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+execline.b258d8086d684707b6d8edd444d70baad5ce68c62abb9973f3b909191aa9a06b
+#+lnstools.c66a534668f1871614a04cc034ea499f5b7886f5a8b27b7d16960fb257fcce67
+#+sandbox_rootfs.ee38fe49a0466e75f2edc1a946ed1210b6491f4d29da578db5ebc9ff66b2ec24
 #@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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+m4.654bbae705a59fd6d5bbdfa3b16b355b26abb93a85734293bdeda145bcd6bb2d
+#+nawk.0cc8367178cb3621115e6b34905bc0ca9f8f235a834dbac171da0709aba0e1cf
+#+popt.d2a3c87831748cdce1f732606de6415ae3fb3bd32ff4098dec973a9db089d0f8
+#+libressl.e5f4ef808fde8a321adf88593cc91d2940ff2d376bb90fb8def2da02b60aeea5
+#+zstd.af63d098b4c4a19b1f6775488728adcb555098ad40381a058a310e8841575b81
 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:.
 
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
diff --git a/variants/root-x86_64/s6 b/variants/root-x86_64/s6
@@ -1,36 +1,36 @@
 #!/usr/bin/env pthbs-build
-#+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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+skalibs.0765b819dcf970c1470e7866122824b9cf5852d78710d53e4b006e517b157e62
+#+execline.358837544764a0f03735d410243ed0ed6f3c2c48749599f066376cf9c6ba62d4
 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6
 
 
@@ -47,7 +47,7 @@ cd 's6'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.f46389b8118622cea646bd3563ba4163989500f391ae34c328a193e26449f01f/sysdeps' \
+	--with-sysdeps='/versions/skalibs.0765b819dcf970c1470e7866122824b9cf5852d78710d53e4b006e517b157e62/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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+skalibs.0765b819dcf970c1470e7866122824b9cf5852d78710d53e4b006e517b157e62
 #@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns
 
 
@@ -46,7 +46,7 @@ cd 's6-dns'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.f46389b8118622cea646bd3563ba4163989500f391ae34c328a193e26449f01f/sysdeps' \
+	--with-sysdeps='/versions/skalibs.0765b819dcf970c1470e7866122824b9cf5852d78710d53e4b006e517b157e62/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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+skalibs.0765b819dcf970c1470e7866122824b9cf5852d78710d53e4b006e517b157e62
+#+execline.358837544764a0f03735d410243ed0ed6f3c2c48749599f066376cf9c6ba62d4
+#+s6.0a0809f9fb8a1af7fe836a604ee2958c32e226a0925c44ae36eaf8e6b3ad1235
 #@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.f46389b8118622cea646bd3563ba4163989500f391ae34c328a193e26449f01f/sysdeps' \
+	--with-sysdeps='/versions/skalibs.0765b819dcf970c1470e7866122824b9cf5852d78710d53e4b006e517b157e62/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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+skalibs.0765b819dcf970c1470e7866122824b9cf5852d78710d53e4b006e517b157e62
 #@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.f46389b8118622cea646bd3563ba4163989500f391ae34c328a193e26449f01f/sysdeps' \
+	--with-sysdeps='/versions/skalibs.0765b819dcf970c1470e7866122824b9cf5852d78710d53e4b006e517b157e62/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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+skalibs.0765b819dcf970c1470e7866122824b9cf5852d78710d53e4b006e517b157e62
+#+execline.358837544764a0f03735d410243ed0ed6f3c2c48749599f066376cf9c6ba62d4
+#+s6.0a0809f9fb8a1af7fe836a604ee2958c32e226a0925c44ae36eaf8e6b3ad1235
+#+s6-dns.5a5cea651fd152a0e24e08605555117812ba70502210b23274a6ef62fead1a86
+#+libressl.e5f4ef808fde8a321adf88593cc91d2940ff2d376bb90fb8def2da02b60aeea5
 #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking
 
 
@@ -50,7 +50,7 @@ cd 's6-networking'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.f46389b8118622cea646bd3563ba4163989500f391ae34c328a193e26449f01f/sysdeps' \
+	--with-sysdeps='/versions/skalibs.0765b819dcf970c1470e7866122824b9cf5852d78710d53e4b006e517b157e62/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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+skalibs.0765b819dcf970c1470e7866122824b9cf5852d78710d53e4b006e517b157e62
 #@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.f46389b8118622cea646bd3563ba4163989500f391ae34c328a193e26449f01f/sysdeps' \
+	--with-sysdeps='/versions/skalibs.0765b819dcf970c1470e7866122824b9cf5852d78710d53e4b006e517b157e62/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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+skalibs.0765b819dcf970c1470e7866122824b9cf5852d78710d53e4b006e517b157e62
+#+execline.358837544764a0f03735d410243ed0ed6f3c2c48749599f066376cf9c6ba62d4
+#+s6.0a0809f9fb8a1af7fe836a604ee2958c32e226a0925c44ae36eaf8e6b3ad1235
 #@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc
 
 
@@ -48,7 +48,7 @@ cd 's6-rc'
 	--bindir="${prefix}/command" \
 	--libdir="${prefix}/library" \
 	--shebangdir="${prefix}/command" \
-	--with-sysdeps='/versions/skalibs.f46389b8118622cea646bd3563ba4163989500f391ae34c328a193e26449f01f/sysdeps' \
+	--with-sysdeps='/versions/skalibs.0765b819dcf970c1470e7866122824b9cf5852d78710d53e4b006e517b157e62/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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.a50ca83c06d31066290d6d9f8fb236667c1b2dbc376cb34377761fe9b87386a1
-#+gnu-make.e83ebb5b87ae559c2ea259d37ea642ab860acd75ac003123f100e3c71cf0f901
-#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
-#+skalibs.2d5bee0bae3f8e378baf4c0f2db82f35edc9f8fcec4ef73ada0e0f830ed0cac7
+#+musl-cross-make.d2e5b6677277a6b1413b8b876a3be3d52f9ef52b90e96606caf9de61c8a27c78
+#+gnu-make.fe79d231925f61f60baf2f41d7bca8bca4f3227f86f0cd94531b2ca3afa50e28
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
+#+skalibs.9739711ab76253b4e0de2759c8276a8f73e414b8017b821103849ffdc37cfba3
 #@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.7db5f76b1edfca37adad1539a0137a18107da6406acb965be0bc7b323fc90e45
-#+sandbox_rootfs.a915c31bff9610693b8703920666780ebfc91311c5c4f25087a96c4eb61be6a4
-#+pthbs-sandbox-rootns.2e61bf46eac1e8fd5cd2669e8adaad664305b3a6594a7028df2bce50aca479c6-
\ No newline at end of file
+#+lnstools.c66a534668f1871614a04cc034ea499f5b7886f5a8b27b7d16960fb257fcce67
+#+sandbox_rootfs.ee38fe49a0466e75f2edc1a946ed1210b6491f4d29da578db5ebc9ff66b2ec24
+#+pthbs-sandbox-rootns.3b4aef105da319975748c8c30a5b292f7a00b24a333d3f7d793e79789c21b373+
\ 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.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.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.a50ca83c06d31066290d6d9f8fb236667c1b2dbc376cb34377761fe9b87386a1
-#+gnu-make.e83ebb5b87ae559c2ea259d37ea642ab860acd75ac003123f100e3c71cf0f901
-#+busybox.f77e9c805c15f3ec073c3b5d052dfcd64ad2e80d397480b5979b364bad77b854
+#+musl-cross-make.d2e5b6677277a6b1413b8b876a3be3d52f9ef52b90e96606caf9de61c8a27c78
+#+gnu-make.fe79d231925f61f60baf2f41d7bca8bca4f3227f86f0cd94531b2ca3afa50e28
+#+busybox.b6a729a14c57e1db6715e7245b6abb6ccb4cf1d4aaeae04b96e20c05a5fbcf20
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+zsh.540039c98b70e47532a72be5dafe678c7b165feebd9c8b374bcdadcc7bba4a40
+#+pthbs-banginstall.a744e9974338508052e962b094707ab231b8fdec7c9cbea15deb0d8d79b65e3c
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+attr.e23607890e8f118e77b56979e46becc8ae39941564abeaabaaba79f27a1f9f1d
+#+zstd.af63d098b4c4a19b1f6775488728adcb555098ad40381a058a310e8841575b81
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+m4.654bbae705a59fd6d5bbdfa3b16b355b26abb93a85734293bdeda145bcd6bb2d
+#+patch.c2eafb0af80edc263a0c7a7e4311554a76529b412207d92880b4642ff1cb6a89
+#+libunwind.d2149b7b56be3dc8c35b5e9c02c26b2f5466668266dc591dc07e1bc50847c724
 #@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch
 #@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:.
 
@@ -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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }
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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-dosfstools.646d5c5e72133c818963a9e99e89826208f8b481264b68973af6502ea42a778d
+#+busybox-e2fsprogs.1150e03ef66b3494a302ef348c5399cd83f8d187ec18be83e33622d79a124a8f
+#+busybox-iproute2.2d69338f1b06e866017d36427806fc4bd48cd0cf8c4b80bed0775b7626827186
+#+busybox-iputils.f9835ea350d820450fb8cba35a9530d249ba8ef1bfe8703d4c70bacd54e57aa9
+#+busybox-net-misc.a8624aa97680dd779a32643c64ecd8a11d985384f17273c3746f3fb92f5f3dac
+#+busybox-net-tools.df7805e87eead933e460970c073fde5f21bb7d9495c6689465a3ebc7658624cd
+#+busybox-traceroute.d77fb46c3e861e5e572baf8d44ca7ccfa0fecb660a2a3e98b47ec2c4cebbfe3d
+#+busybox-wget.453f723f71f19960fb26fce47ec35bdf51d43d6a8cfd21186b66592b85ee987e
+#+busybox-chpst.1a4be71c4516915a05bc95711ec6d6611062606f3a2d8ce1ea9ecb058aa6bf34
+#+busybox-console.38293edc2a7a6357820019da727bbd8b2e63548090f1543c307221acd086050f
+#+busybox-getty.ea7b660a1d1681f82dcfebccc456ed55586e14846c595047b61ba5450d8e412d
+#+busybox-i2c-tools.8b131a7b0b9047c3fd8f14787b86106ef79093ad89cd344c8569d583009e4317
+#+busybox-linux-extra.080f32bd4efc218bc95bdeea764c4b4b37983c808e82340755384e465b64b1fd
+#+busybox-mtd-utils.45d39cf0caa4a45c1d8ca211998fac4b1d263deca315e7998020e5f5be68f561
+#+busybox-shadow.2a21f788fbc92521fcd91ec2e094b010d093ea6971fb13553fe9a8130033570c
+#+busybox-su.6ef785ed674f201f7fa58e905c356b53de0954919b04ca87672c613d26e22913
+#+busybox-util-linux-priv.3ba100180ff712ad28626879a33d4a7cd66403e0977ec3bb2dc68b522fe9356b
+#+busybox-logging.0d2bde1abe8660e90380e4167e50771bfc15103e40f02e11a1254021d05f901b
+#+busybox-cron.5a60c95ba65f20cd5b11bf51249cb963f54c136eb11a862f2f57e8e9cce90c6a
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+nawk.0cc8367178cb3621115e6b34905bc0ca9f8f235a834dbac171da0709aba0e1cf
+#+diffutils.250e99dd1e06ac420bee0f12d5964555c8aecda8789b897573e62ea8d843f7b6
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+aat.a650763ed92ec5d25b11342ad509c47f9062095fb1162933e5f4cafda671261d
+#+fileset.dafaef607656dec7be6824f0404008a3183cd92a6128a847ccdb52a04654e256
+#+rsync.79dca244e34309996c230b9fe11ab98a7468999cca156eb2d2ed25da2a51cb68
+#+execline.358837544764a0f03735d410243ed0ed6f3c2c48749599f066376cf9c6ba62d4
+#+kbd.96359c4496b73cafdd956028dd057ace4f6862bab664e1cf9816ab1961323f43
+#+mdevd.1d3109166eac2ef6083b8256cc78f1b6dddee8a850427950f6dc207fedcdea37
+#+s6-linux-utils.6d3cb7324da646b9d3eee9e8fef2783cf20a9c9b55aa142e0c61657f3ee1862e
+#+s6-rc.ddca5e27300b4bc87652940f7b82c50dffb813459f44bb61c4b888391067d840
+#+s6.0a0809f9fb8a1af7fe836a604ee2958c32e226a0925c44ae36eaf8e6b3ad1235
+#+zsh.540039c98b70e47532a72be5dafe678c7b165feebd9c8b374bcdadcc7bba4a40
+#+libcgroup.a4891c17f34e0d11a4548bb4e9020334e827d8c80417f069996604ffb66a50e6
+#+system-config-scripts.d12b6dabb022c82624cea676416ba5b32ac544f18b47d118b1a1d773352e78fb
+#+logincaps.df8cc19aa0c4c10e39cc11d59ab6bd432fd6eed32802505fc5c150f1d9a5e4ee
+#+busybox-modutils.5f2f95aa2800c0b5cc9b151702efe803d3b8afa39ed1b5b5e699e6c5264619e9
 #@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.12e32e5723edfed482c40bb4b2681edebe76cba7bc998e84a304e5acfe7186e3' \
-	'pthbs_path_mdevd=/versions/env.617513be59acb8250be6941014acd859cab549b38c53beee5c3e08fa6d618237' \
+	'pthbs_path_containers=/versions/env.81c655dae4d8074b360c1350ab1155bc098a100a9a77cfdf05ba2b8faeac334f' \
+	'pthbs_path_mdevd=/versions/env.63e12bd51befceec12b31137bf2890815631dd2fddc1fc7f309884fe17a14245' \
 	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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-dosfstools.646d5c5e72133c818963a9e99e89826208f8b481264b68973af6502ea42a778d
+#+busybox-e2fsprogs.1150e03ef66b3494a302ef348c5399cd83f8d187ec18be83e33622d79a124a8f
+#+busybox-iproute2.2d69338f1b06e866017d36427806fc4bd48cd0cf8c4b80bed0775b7626827186
+#+busybox-iputils.f9835ea350d820450fb8cba35a9530d249ba8ef1bfe8703d4c70bacd54e57aa9
+#+busybox-net-misc.a8624aa97680dd779a32643c64ecd8a11d985384f17273c3746f3fb92f5f3dac
+#+busybox-net-tools.df7805e87eead933e460970c073fde5f21bb7d9495c6689465a3ebc7658624cd
+#+busybox-traceroute.d77fb46c3e861e5e572baf8d44ca7ccfa0fecb660a2a3e98b47ec2c4cebbfe3d
+#+busybox-wget.453f723f71f19960fb26fce47ec35bdf51d43d6a8cfd21186b66592b85ee987e
+#+busybox-chpst.1a4be71c4516915a05bc95711ec6d6611062606f3a2d8ce1ea9ecb058aa6bf34
+#+busybox-console.38293edc2a7a6357820019da727bbd8b2e63548090f1543c307221acd086050f
+#+busybox-getty.ea7b660a1d1681f82dcfebccc456ed55586e14846c595047b61ba5450d8e412d
+#+busybox-i2c-tools.8b131a7b0b9047c3fd8f14787b86106ef79093ad89cd344c8569d583009e4317
+#+busybox-linux-extra.080f32bd4efc218bc95bdeea764c4b4b37983c808e82340755384e465b64b1fd
+#+busybox-mtd-utils.45d39cf0caa4a45c1d8ca211998fac4b1d263deca315e7998020e5f5be68f561
+#+busybox-shadow.2a21f788fbc92521fcd91ec2e094b010d093ea6971fb13553fe9a8130033570c
+#+busybox-su.6ef785ed674f201f7fa58e905c356b53de0954919b04ca87672c613d26e22913
+#+busybox-util-linux-priv.3ba100180ff712ad28626879a33d4a7cd66403e0977ec3bb2dc68b522fe9356b
+#+busybox-logging.0d2bde1abe8660e90380e4167e50771bfc15103e40f02e11a1254021d05f901b
+#+busybox-cron.5a60c95ba65f20cd5b11bf51249cb963f54c136eb11a862f2f57e8e9cce90c6a
+#+s6.0a0809f9fb8a1af7fe836a604ee2958c32e226a0925c44ae36eaf8e6b3ad1235
+#+s6-rc.ddca5e27300b4bc87652940f7b82c50dffb813459f44bb61c4b888391067d840
+#+s6-portable-utils.e89a28e71183ec4f94589baf0a6ac44c3eae9bb3f860e822da00148841160b2e
+#+s6-linux-init.035bb807050e8908ca667732d6dfbe7fa65712e3211d5aed51b1028e4eaab7e2
+#+execline.358837544764a0f03735d410243ed0ed6f3c2c48749599f066376cf9c6ba62d4
+#+system-config-rc.c59c5e6040075358ee0eae485371623724c4afa725a0cce76f95956de0dcd132
 
 
 # - build script start -
@@ -76,7 +76,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-s6rcdb=/versions/system-config-rc.1cd9e859572d2445d0b02ed980ca608fe14cfcfae099a916f78e9d3fac18e054/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.c59c5e6040075358ee0eae485371623724c4afa725a0cce76f95956de0dcd132/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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+s6-rc.ddca5e27300b4bc87652940f7b82c50dffb813459f44bb61c4b888391067d840
+#+fileset.dafaef607656dec7be6824f0404008a3183cd92a6128a847ccdb52a04654e256
+#+system-config.22c7b8d50ea3bfd798db5cb229d4815015ee9e9bcc40743620dd2f443e17c7b4
 
 
 # - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
 cd '.'
 
 
-src=/versions/system-config.9de5ea8ff4345f002918f91179040f8a73aa1df32ca77a5e6744ce4c409b7792/config/s6-rc-source
+src=/versions/system-config.22c7b8d50ea3bfd798db5cb229d4815015ee9e9bcc40743620dd2f443e17c7b4/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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+zsh.540039c98b70e47532a72be5dafe678c7b165feebd9c8b374bcdadcc7bba4a40
+#+pthbs-banginstall.a744e9974338508052e962b094707ab231b8fdec7c9cbea15deb0d8d79b65e3c
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+zsh.540039c98b70e47532a72be5dafe678c7b165feebd9c8b374bcdadcc7bba4a40
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+execline.358837544764a0f03735d410243ed0ed6f3c2c48749599f066376cf9c6ba62d4
+#+pthbs-banginstall.a744e9974338508052e962b094707ab231b8fdec7c9cbea15deb0d8d79b65e3c
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-dosfstools.646d5c5e72133c818963a9e99e89826208f8b481264b68973af6502ea42a778d
+#+busybox-e2fsprogs.1150e03ef66b3494a302ef348c5399cd83f8d187ec18be83e33622d79a124a8f
+#+busybox-iproute2.2d69338f1b06e866017d36427806fc4bd48cd0cf8c4b80bed0775b7626827186
+#+busybox-iputils.f9835ea350d820450fb8cba35a9530d249ba8ef1bfe8703d4c70bacd54e57aa9
+#+busybox-net-misc.a8624aa97680dd779a32643c64ecd8a11d985384f17273c3746f3fb92f5f3dac
+#+busybox-net-tools.df7805e87eead933e460970c073fde5f21bb7d9495c6689465a3ebc7658624cd
+#+busybox-traceroute.d77fb46c3e861e5e572baf8d44ca7ccfa0fecb660a2a3e98b47ec2c4cebbfe3d
+#+busybox-wget.453f723f71f19960fb26fce47ec35bdf51d43d6a8cfd21186b66592b85ee987e
+#+busybox-chpst.1a4be71c4516915a05bc95711ec6d6611062606f3a2d8ce1ea9ecb058aa6bf34
+#+busybox-console.38293edc2a7a6357820019da727bbd8b2e63548090f1543c307221acd086050f
+#+busybox-getty.ea7b660a1d1681f82dcfebccc456ed55586e14846c595047b61ba5450d8e412d
+#+busybox-i2c-tools.8b131a7b0b9047c3fd8f14787b86106ef79093ad89cd344c8569d583009e4317
+#+busybox-linux-extra.080f32bd4efc218bc95bdeea764c4b4b37983c808e82340755384e465b64b1fd
+#+busybox-mtd-utils.45d39cf0caa4a45c1d8ca211998fac4b1d263deca315e7998020e5f5be68f561
+#+busybox-shadow.2a21f788fbc92521fcd91ec2e094b010d093ea6971fb13553fe9a8130033570c
+#+busybox-su.6ef785ed674f201f7fa58e905c356b53de0954919b04ca87672c613d26e22913
+#+busybox-util-linux-priv.3ba100180ff712ad28626879a33d4a7cd66403e0977ec3bb2dc68b522fe9356b
+#+busybox-logging.0d2bde1abe8660e90380e4167e50771bfc15103e40f02e11a1254021d05f901b
+#+busybox-cron.5a60c95ba65f20cd5b11bf51249cb963f54c136eb11a862f2f57e8e9cce90c6a
+#+attr.e23607890e8f118e77b56979e46becc8ae39941564abeaabaaba79f27a1f9f1d
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+diffutils.250e99dd1e06ac420bee0f12d5964555c8aecda8789b897573e62ea8d843f7b6
+#+patch.c2eafb0af80edc263a0c7a7e4311554a76529b412207d92880b4642ff1cb6a89
+#+flex.5c7504dfb9483dd305d2d9cb9c6ec60ea19f890835b2e0477c06f3cfb7b7347b
+#+bison.ed5e8c99827332c484d694eb3b50371855037c072c9a851371ebbe378899ce7d
+#+rsync.79dca244e34309996c230b9fe11ab98a7468999cca156eb2d2ed25da2a51cb68
+#+execline.358837544764a0f03735d410243ed0ed6f3c2c48749599f066376cf9c6ba62d4
+#+s6.0a0809f9fb8a1af7fe836a604ee2958c32e226a0925c44ae36eaf8e6b3ad1235
+#+s6-rc.ddca5e27300b4bc87652940f7b82c50dffb813459f44bb61c4b888391067d840
+#+s6-portable-utils.e89a28e71183ec4f94589baf0a6ac44c3eae9bb3f860e822da00148841160b2e
+#+s6-linux-utils.6d3cb7324da646b9d3eee9e8fef2783cf20a9c9b55aa142e0c61657f3ee1862e
+#+s6-linux-init.035bb807050e8908ca667732d6dfbe7fa65712e3211d5aed51b1028e4eaab7e2
+#+mdevd.1d3109166eac2ef6083b8256cc78f1b6dddee8a850427950f6dc207fedcdea37
+#+s6-dns.5a5cea651fd152a0e24e08605555117812ba70502210b23274a6ef62fead1a86
+#+libressl.e5f4ef808fde8a321adf88593cc91d2940ff2d376bb90fb8def2da02b60aeea5
+#+s6-networking.ad4617645cc68e88a7aaea2ecb67d917f39b4263c22d3206ecaee53733637515
+#+zsh.540039c98b70e47532a72be5dafe678c7b165feebd9c8b374bcdadcc7bba4a40
+#+pthbs-banginstall.a744e9974338508052e962b094707ab231b8fdec7c9cbea15deb0d8d79b65e3c
+#+aat.a650763ed92ec5d25b11342ad509c47f9062095fb1162933e5f4cafda671261d
+#+confz.e9308139e851269c2d6254ce537444cd51d21969e65997eadde6d1eb8318edde
+#+containers.38916ccdf5d4d2d0552145d6e2d4339cea4dfa4580045ce2f441fef12e07c3bc
+#+fileset.dafaef607656dec7be6824f0404008a3183cd92a6128a847ccdb52a04654e256
+#+logincaps.df8cc19aa0c4c10e39cc11d59ab6bd432fd6eed32802505fc5c150f1d9a5e4ee
+#+snaprep.85c81cfc76809d6ce0fbdf89e3b0662a4f38f573a7b0dc5e423f815d3eced1e3
+#+curl.1fb78f1d4a8ff1ec1e8b5194f29071e1cc3283dcbd8ecb074643daa75091cebc
+#+git.cfeea5af94a09e11a18df28d9c769c72e99b5a4a87b7f1895571d15ceb3afad3
+#+xbps.77bdcd4b90d34491b6766f33ae63cad0a9748ccc1a60edfad89ef2262b8e47a3
+#+apk-tools.d85a4c6d0e33e280a24523589a1d041854ae11d8d0a1bdef03366aa873577172
+#+getent.f5fa3699f718ba47eecf16aa60cfd675a364f94947c25e999b2969d76652a77a
+#+getconf.6cdf302584697834974d13b08decec6061903ce8e1991e03aa7b2124e6878fc5
+#+iconv.97ae179e790e347dcdc0569f90f7d9ea4a1ad57c4a7861440371cc3cf242ac7c
+#+libcap.ef2569f121242904c707e8268b835d0360ef9dc4a3b5c71658aedc6ec134f9ae
+#+applyuidgid-caps.fd8054ef4976e91b3a5e66a85180d6b2b84ee709c5754642a99f3f091623a267
+#+ccx-utils.a5d57ca05a16568bba38b02cbfa642b546765fa2936e8019776f4226ccd85ab7
+#+user-env.494a2121d839001adc0df52099d0ca31b8ec86cc821c5eaf8c834b0310cccff5
+#+strace.8167b3905706591908b4abf15ec223aed6d2a0782b1e85720536561b3756d959
+#+mlog.4d6490fa0722447a611cb1de1c1e96dbf9962fb65bbc3a8d5f793cc9bb1a23fe
+#+findutils.bc855d11c059803776ea6dfebfb0c6ac4a64cf45bb05338bc2ab8e91ae1dd769
+#+nawk.0cc8367178cb3621115e6b34905bc0ca9f8f235a834dbac171da0709aba0e1cf
+#+squashfs-tools.d46140a5e54c3d8ba45d4be2842804fe4bcaa82c0d29135d511c6184c7cac918
+#+mandoc.888792ea85f55f88b9308472f77c7a67547fcc70b0e13dbefa36f823685fae83
+#+tinyssh.696ec34fd527f52a4faac6b316ad8c2ea075b789eab467707aa294d061993960+
\ 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.8a179311599b13c66bd39b94d8087ba37c527bb38996ea9a3bfc71fd21fa271e-
\ No newline at end of file
+#+linux-qemu-guest.e8e1f4059ffc1d942247fdbdabd8446afc2dfcdab2eece95e12fe63e84313b0f+
\ 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+libarchive.3c0081b350516e20a42676e363754931a9b255823fff217e489b7803bc859635
+#+libressl.e5f4ef808fde8a321adf88593cc91d2940ff2d376bb90fb8def2da02b60aeea5
+#+pkgconf-pkg-config.f0b276f1c7da4c4cddbfdeb52abf0d140b197bb5d8b7f54b41c3cffd94a5e9ae
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+m4.654bbae705a59fd6d5bbdfa3b16b355b26abb93a85734293bdeda145bcd6bb2d
+#+netbsd-curses.2b849ae5f2a80c5b7a7322b28a5795261b024303edfeb6ae9100c8c4d32345cc
+#+libbsd.34da2388781dbf887e0a79e978a0deb6a97fc558f0a63431e9b69dbaea400130
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); 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.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
+#+busybox.f2cb5c56bb9dacbaf48784ee458faa0ab08ca4804401424f36f83e63b097613c
+#+busybox-bzip2.309c3823734ba1fa506e718be78e75dbc07df4c8acc4ed3b010af86a02f078df
+#+busybox-gzip.634a8fcbee9621bb9f3002c23e4c74d4aa7f29d07d2cc62d6e3cb0b0dc3989af
+#+busybox-lzop.270df3c178de00176d6985172b946b4fb07bdd48e99212fb4fb34863f1bb3fdb
+#+busybox-unzip.31c3dd839488f925a0ca8c568e9fe821e1edfbda6e0d822ef75d8cf1b289b091
+#+busybox-xz.361cf9f9bc71e25e393d7fd8f17ae1a685a8470341f038d6197ba59d1379aaed
+#+busybox-cpio.5e2d4f28b0b974429105a88d866f1531636533b4e41887f08a011edf589cac81
+#+busybox-dpkg.1d50c644fa4bf4c71d20088fc4ebb11feb8a644868473a73a9227564ecd39c69
+#+busybox-rpm.561f108264f2adce000a62525974096f6b18bc40af8f9b31faee35163774a094
+#+busybox-tar.201fb3a7f344105d6716326426600ceca25b83946cd1fd0dc5d6b22b944fb1c6
+#+busybox-ed.27f427b89ec1d3a31f75e6f088df00ed87e14bec8db5da51e68df5050f7fcb40
+#+busybox-sed.5d0419137ddd7c9276a6feb4b9a0d1f7ef47d104dc9f6f4776338521ce30d418
+#+busybox-vi.fb36e4a9baf87d74a999fef204170761f738a114c9206d5779dd962da6c76484
+#+busybox-xxd.6de79fbbedfa866b7fc22e66652b3451ce09db325cb1041468d66d592b5611b4
+#+busybox-process-extra.059d73abaa47c6880dc15c046d66bb78d5bd09fa45e1f7612013e6db151f0165
+#+busybox-procps.b56deac2fdef8b5c7a1b21573d50fe8905a77c0e66884808463de67ecdf175dc
+#+busybox-psmisc.27d4ab27ef18dc7a876127d32beb2084228704a571a2665b208c428fe86c19e2
+#+busybox-ash.c07472cac579a5866837c30aecb566093dbecfb2b07995379e99a2df6c710278
+#+busybox-bc.724b50fa025a1f5d16d5e96e5a0b03136538f4e3bdd1b999a383495776bdaa7c
+#+busybox-coreutils.322d4585a8d13ac2d3a7f13b934b84e163f92289297bbfdefe2920b291d65894
+#+busybox-coreutils-extra.84f3e3d7c4f701e1b80eb2b3792d0d9dc5a6fd62bcc5219750d0af91f240f755
+#+busybox-daemontools.3dbf658b03744b00e912c888f766c3ac84da3350c3e96573bec05f36eeb23601
+#+busybox-grep.d800ce41dbb5fe8a9e91f422d7553ada09d344da2700fcd59655d91c5d43d4e0
+#+busybox-misc.70e126c74eb7c502e39aafa9ecc47a04e51d782f48a3cca730b13511fa48af5b
+#+busybox-sh.8223f61aea8dd74d9a6802e887b34fb98e9c06d0cf9b371c12cd26d5fe2d0764
+#+busybox-util-linux-unpriv.dd15aea6979003eb6563c0d54a61024110f1fbf87aa478884d908e61073bdc2f
+#+busybox-findutils.c41c945ff4b6c4c958cba993505166ba63fe32ac4608432eb18c70e52da605f7
+#+busybox-awk.69a3527ba9c5fd91e7c4c223fe414aa2fba6ff7cda235d9a31c0909272d6baa0
+#+musl-cross-make.a39281b462581c08685c5db4b65f70d6e82f32bdd74dcd3919ba61af06d4ec5c
+#+gnu-make.a3b98198732dd3a49d868bc0790e382c73c1a755b05bc5ee5f8f2225d658246e
+#+busybox-diffutils.110b4ad50c57da4e1d1ec535f06267f1719032df273209fa7caae0d3cbecd9ea
 #@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("info", r1($0))); next }
+$2 == "share" && $3 == "man" { link(s1("man", r1($0))); next }
+$2 == "share" && $3 == "doc" { link(s1("doc", r1($0))); next }
 
 $2 == "config" { link($0); next }
 $2 == "man" { link($0); next }