commit 86e478ef171b834eb828f6a0e3e9a9ca71b815bd
parent 8828f06dd6073f828f125a9ae2eeea050af37507
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Fri, 10 Oct 2025 15:58:37 +0000
xbps: build dependencies
Diffstat:
17 files changed, 40 insertions(+), 34 deletions(-)
diff --git a/templates/pkg/xbps b/templates/pkg/xbps
@@ -1,6 +1,8 @@
{%- set pkg_version="0.59.2" -%}
{% extends "genlinks" %}
{% block package_deps -%}
+#+{{pkg_install_name("musl-cross-make")}}
+#+{{pkg_install_name("gnu-make")}}
#+{{pkg_install_name("libarchive")}}
#+{{pkg_install_name("libressl")}}
#+{{pkg_install_name("pkgconf-pkg-config")}}
diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers
@@ -6,7 +6,7 @@
#+execline.0e5a0df166b6270f6f3f5e4fa0e8051e2432b88bd452b4676f3730724652874a
#+alpine-keys.7c89c54f343b451790623504c04092bfe77b9c3462ded5a4a8739f0250a22cb9
#+apk-tools.e165a47aff8b353b5f4dfbbdff1f459e66db1cdc85619989e485a2632018109a
-#+xbps.c800a4acd968f595949056f8a302a1e6ee0d960461318dce06c39a235e39b44b
+#+xbps.52a5058f66adba0e20d6f6a4fe093eb3e8febfb65750de5c896a1d91b315560c
#+container-bin-image.71b1417f73b797ce84fc7b66a302b4ada2155942fff277ffba5e127869ef90e5
#@git:8ec212c9411088ad7e116e330d6a33f68c539678:containers
@@ -50,7 +50,7 @@ printf '%s\n' >"${dest}/zsh/site-functions/confz_containers_pthbs_init" \
mkdir -p "${dest}/deps/command"
ln -sf '/home/ccx/versions/apk-tools.e165a47aff8b353b5f4dfbbdff1f459e66db1cdc85619989e485a2632018109a/command/apk.static' "${dest}/deps/command/"
-ln -sf '/home/ccx/versions/xbps.c800a4acd968f595949056f8a302a1e6ee0d960461318dce06c39a235e39b44b/command/xbps-install.static' "${dest}/deps/command/"
+ln -sf '/home/ccx/versions/xbps.52a5058f66adba0e20d6f6a4fe093eb3e8febfb65750de5c896a1d91b315560c/command/xbps-install.static' "${dest}/deps/command/"
for f in '/home/ccx/versions/alpine-keys.7c89c54f343b451790623504c04092bfe77b9c3462ded5a4a8739f0250a22cb9'/keys/alpine/*/*; do
test -f "$f"
@@ -60,7 +60,7 @@ for f in '/home/ccx/versions/alpine-keys.7c89c54f343b451790623504c04092bfe77b9c3
done
mkdir -p "${dest}/deps/keys/void"
-for f in '/home/ccx/versions/xbps.c800a4acd968f595949056f8a302a1e6ee0d960461318dce06c39a235e39b44b'/keys/void/*; do
+for f in '/home/ccx/versions/xbps.52a5058f66adba0e20d6f6a4fe093eb3e8febfb65750de5c896a1d91b315560c'/keys/void/*; do
ln -sf "$f" "${dest}/deps/keys/void/"
done
diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment
@@ -7,8 +7,8 @@
#+s6-linux-utils.84f2d6d918b74fffc508df6cee48ed0f25124bd6c09f12558626d27992174226
#+zsh.c1ba08b027e26ecf5b6a4f7f5aced2e9b520b1835b098ba5529cad1f97e387b5
#+confz.9e0eee915bafe96a2c4b29c49a34dba492a9213278016d8d46d4e5b7c96d22db
-#+containers.b97aafc403f3e0ee5c7219897d6f357c93de86526ce73051148990a9d110e87b
-#+xbps.c800a4acd968f595949056f8a302a1e6ee0d960461318dce06c39a235e39b44b
+#+containers.93588ec59f31653c519900f8e7c35f4eb5c522328cfb253dba33d8c587831200
+#+xbps.52a5058f66adba0e20d6f6a4fe093eb3e8febfb65750de5c896a1d91b315560c
#+zstd.31469429bdd997f0a7a7eeb7dc4aa44b1e88d15227b1711943b136dc14cf753f
#+apk-tools.e165a47aff8b353b5f4dfbbdff1f459e66db1cdc85619989e485a2632018109a
#+alpine-keys.7c89c54f343b451790623504c04092bfe77b9c3462ded5a4a8739f0250a22cb9
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -21,13 +21,13 @@
#+pthbs-banginstall.fb1085a86eafedd60935fd033dbc0f6d47c187d3f7f9bf3cefdb1ddc43b21435
#+aat.b33fe3833f8ea46ebdb6900ad58529774beb169b76218ce270e3c975bcbfcd43
#+confz.9e0eee915bafe96a2c4b29c49a34dba492a9213278016d8d46d4e5b7c96d22db
-#+containers.b97aafc403f3e0ee5c7219897d6f357c93de86526ce73051148990a9d110e87b
+#+containers.93588ec59f31653c519900f8e7c35f4eb5c522328cfb253dba33d8c587831200
#+fileset.30305918fa6fa5f7dcb447a76827959d5c8af9cd021b065fd360a5a176430035
#+logincaps.0b57fd55080bdfb254593b6e6cc7e34f4fa19cd1622e9bf3368b75587f9cb1ca
#+snaprep.30e9d122c8a1d12f58d81856dd5a79b72d4785bf30bff0e94b3a0f61e6c22238
#+curl.b77362632ee7e28e099c231bbda3b6220cc0cbc62aece9c63f4957cc3f415284
#+git.01a0c1531eb47cb51bf38a4082a0e16caf7be302d04fa24fde800985f8e37773
-#+xbps.c800a4acd968f595949056f8a302a1e6ee0d960461318dce06c39a235e39b44b
+#+xbps.52a5058f66adba0e20d6f6a4fe093eb3e8febfb65750de5c896a1d91b315560c
#+apk-tools.e165a47aff8b353b5f4dfbbdff1f459e66db1cdc85619989e485a2632018109a
#+getent.08248f0ec8ff20bd1279b61e637208961f5959b2b8bb33caee7720289dad2b5c
#+getconf.0fab6914bf5649e1af47e5cecd0b21897d872b8048438ec01bd5f2afdd3e9b3b
@@ -38,8 +38,8 @@
#+user-env.27a0b5452d41afaacb1d76c456caa84d85aff599c39ff32b8db694d2550d5b6d
#+strace.40668df6151b4574b553a5923103e07c6ddb344daca606f04edd0ac48e060d55
#+mlog.a882a51752c5081bd671d7d564ea8b5c4502b93c0951cb77a20aa0238c66bc82
-#+system-config.df1f97415eb314b8dd36ede3c5881f05019a8463b3dfa18021a73cc1c0602e25
-#+system-config-rc.5646ce2686589877d69e736324c04433630ac20f7a2523b13df4284cdbc32751
+#+system-config.4a727dfa2bbfeb625bda074814824a8474754b815a0b8508a901129d5bbd37a9
+#+system-config-rc.209ded43b086cc955be65c1881797a39fcb4486d5e30655de29937d3b87a56e3
#+system-config-scripts.3c3ea3f86753f1b0e0927ec2875e5b90f388ba2c1f6ed9b69509ac25a7555da6
-#+system-config-init.f65b2963c2d80004c7e385e83ab6811c2c207c9305207fdca797a3d513b437f6
+#+system-config-init.c68cb6a65bdb4fb2887a0c367c24fee77bdd793480d1f1ba5f60b7b698ec5a0f
#+system-config-zsh.ca45b9086a867eb594d68b32cb4826f747b819c640cb472a6fd1b649b1a1d760
\ No newline at end of file
diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config
@@ -50,7 +50,7 @@ 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.a3159c519547996f68d71eca253050d754103db7e70f11a66d9a422a97bc96e4' \
+ 'pthbs_path_containers=/home/ccx/versions/env.8e803c83951044fa1be40ed75bc78bf130f93c0904203068cb9dbddaf315c1dc' \
'pthbs_path_mdevd=/home/ccx/versions/env.51ab0c0e64ff93066325f8e4bcab80b46b317ef9b15abe28670e767ec96baca2' \
make -j${JOBS:-1} -l$((1+${JOBS:-1})) all
diff --git a/variants/ccx-x86_64/system-config-init b/variants/ccx-x86_64/system-config-init
@@ -6,7 +6,7 @@
#+s6-portable-utils.1118fd2f6ea4b1390c615802d601bd6803cf4545b03a89bed68e36bc2a13087e
#+s6-linux-init.a6dbfc71babdb9506c53cad385c613f13a602885c2db0a5db609a86ecc687bac
#+execline.0e5a0df166b6270f6f3f5e4fa0e8051e2432b88bd452b4676f3730724652874a
-#+system-config-rc.5646ce2686589877d69e736324c04433630ac20f7a2523b13df4284cdbc32751
+#+system-config-rc.209ded43b086cc955be65c1881797a39fcb4486d5e30655de29937d3b87a56e3
# - build script start -
@@ -29,7 +29,7 @@ qx() { # register executable as dependency and quote full path to be suitable f
"s6-quote" "$prefix/deps/command/$name"
}
-s6rcdb=/home/ccx/versions/system-config-rc.5646ce2686589877d69e736324c04433630ac20f7a2523b13df4284cdbc32751/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.209ded43b086cc955be65c1881797a39fcb4486d5e30655de29937d3b87a56e3/config/s6-rc-db
# Generate init (${dest} must not exist but parent dir does)
mkdir -p "$pthbs_destdir//home/ccx/versions"
diff --git a/variants/ccx-x86_64/system-config-rc b/variants/ccx-x86_64/system-config-rc
@@ -4,7 +4,7 @@
#+busybox-diffutils.963ce6582575680763337552764b6a3c1be781d9fada1d52aa2d04fadeb229d0
#+s6-rc.4709b0b39ae84f7a1efa984a66237c0f6133cec32466acdf0a139e2ef142f5ee
#+fileset.30305918fa6fa5f7dcb447a76827959d5c8af9cd021b065fd360a5a176430035
-#+system-config.df1f97415eb314b8dd36ede3c5881f05019a8463b3dfa18021a73cc1c0602e25
+#+system-config.4a727dfa2bbfeb625bda074814824a8474754b815a0b8508a901129d5bbd37a9
# - build script start -
@@ -13,7 +13,7 @@ dest=${pthbs_destdir%/}${prefix}
cd 'system-config-rc'
-src=/home/ccx/versions/system-config.df1f97415eb314b8dd36ede3c5881f05019a8463b3dfa18021a73cc1c0602e25/config/s6-rc-source
+src=/home/ccx/versions/system-config.4a727dfa2bbfeb625bda074814824a8474754b815a0b8508a901129d5bbd37a9/config/s6-rc-source
s6-rc-compile ./s6-rc-db "$src"
mkdir -p "$dest/config"
mv -v s6-rc-db "$dest/config/"
diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment
@@ -21,13 +21,13 @@
#+pthbs-banginstall.fb1085a86eafedd60935fd033dbc0f6d47c187d3f7f9bf3cefdb1ddc43b21435
#+aat.b33fe3833f8ea46ebdb6900ad58529774beb169b76218ce270e3c975bcbfcd43
#+confz.9e0eee915bafe96a2c4b29c49a34dba492a9213278016d8d46d4e5b7c96d22db
-#+containers.b97aafc403f3e0ee5c7219897d6f357c93de86526ce73051148990a9d110e87b
+#+containers.93588ec59f31653c519900f8e7c35f4eb5c522328cfb253dba33d8c587831200
#+fileset.30305918fa6fa5f7dcb447a76827959d5c8af9cd021b065fd360a5a176430035
#+logincaps.0b57fd55080bdfb254593b6e6cc7e34f4fa19cd1622e9bf3368b75587f9cb1ca
#+snaprep.30e9d122c8a1d12f58d81856dd5a79b72d4785bf30bff0e94b3a0f61e6c22238
#+curl.b77362632ee7e28e099c231bbda3b6220cc0cbc62aece9c63f4957cc3f415284
#+git.01a0c1531eb47cb51bf38a4082a0e16caf7be302d04fa24fde800985f8e37773
-#+xbps.c800a4acd968f595949056f8a302a1e6ee0d960461318dce06c39a235e39b44b
+#+xbps.52a5058f66adba0e20d6f6a4fe093eb3e8febfb65750de5c896a1d91b315560c
#+apk-tools.e165a47aff8b353b5f4dfbbdff1f459e66db1cdc85619989e485a2632018109a
#+getent.08248f0ec8ff20bd1279b61e637208961f5959b2b8bb33caee7720289dad2b5c
#+getconf.0fab6914bf5649e1af47e5cecd0b21897d872b8048438ec01bd5f2afdd3e9b3b
diff --git a/variants/ccx-x86_64/xbps b/variants/ccx-x86_64/xbps
@@ -1,6 +1,8 @@
#!/usr/bin/env pthbs-build
#+busybox.95e47e8860cf7e55e06683c45e714cb5157f2b5586b90532ad0696266b0565b1
#+busybox-findutils.7f4b62603c13a47cfc863f53eccf0befa97271a83467dd610dfb819fd2f61f45
+#+musl-cross-make.ba69bc292f799c79359469f905cf5a38ae80a121cbea83608feb1d7ea4fca510
+#+gnu-make.81c1139c2cc39666df10584f88ef07a4a66d5130f7c99e07f63113efe6b3e7a0
#+libarchive.d07b06e4da88f1b107705a44f9038733e8bab2fc9bb18617e0585fbe1db39648
#+libressl.a8eadd9e593afc24966b0233a9891bada3303a894c7303ff472f8cfcf19f432a
#+pkgconf-pkg-config.2aee443a0ba46964c3eb135002aac1d5ff10baad13856526c52b65470145b68c
diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers
@@ -6,7 +6,7 @@
#+execline.f0eae8694d48210e76b8c63d1021b7c54029a8db968696dcb8b720240cd7b8ab
#+alpine-keys.7aa8a887a6f32ef454bca16fe2547b53b765170c2f8f0bab72ddd42c518bc941
#+apk-tools.c7f159a66814bc9be8c2840bf4fba46ee0a9ef6fdd1994c11b09d1dab82fb5d9
-#+xbps.7e8a9a3746e363f5897183fa19a00a1ba4230822591552d2769a8771065d2b6f
+#+xbps.92731c8088c56653e67c85f730de3a45b3475d7aefc618992f94c322d94430f3
#+container-bin-image.ff7fbdbad542a574c6ca14cf64d6675e6ff8c4abf69bdb5539d205416729bbaf
#@git:8ec212c9411088ad7e116e330d6a33f68c539678:containers
@@ -50,7 +50,7 @@ printf '%s\n' >"${dest}/zsh/site-functions/confz_containers_pthbs_init" \
mkdir -p "${dest}/deps/command"
ln -sf '/versions/apk-tools.c7f159a66814bc9be8c2840bf4fba46ee0a9ef6fdd1994c11b09d1dab82fb5d9/command/apk.static' "${dest}/deps/command/"
-ln -sf '/versions/xbps.7e8a9a3746e363f5897183fa19a00a1ba4230822591552d2769a8771065d2b6f/command/xbps-install.static' "${dest}/deps/command/"
+ln -sf '/versions/xbps.92731c8088c56653e67c85f730de3a45b3475d7aefc618992f94c322d94430f3/command/xbps-install.static' "${dest}/deps/command/"
for f in '/versions/alpine-keys.7aa8a887a6f32ef454bca16fe2547b53b765170c2f8f0bab72ddd42c518bc941'/keys/alpine/*/*; do
test -f "$f"
@@ -60,7 +60,7 @@ for f in '/versions/alpine-keys.7aa8a887a6f32ef454bca16fe2547b53b765170c2f8f0bab
done
mkdir -p "${dest}/deps/keys/void"
-for f in '/versions/xbps.7e8a9a3746e363f5897183fa19a00a1ba4230822591552d2769a8771065d2b6f'/keys/void/*; do
+for f in '/versions/xbps.92731c8088c56653e67c85f730de3a45b3475d7aefc618992f94c322d94430f3'/keys/void/*; do
ln -sf "$f" "${dest}/deps/keys/void/"
done
diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment
@@ -7,8 +7,8 @@
#+s6-linux-utils.825109564ccf0b423888de36d9946db0453a95ffbce5970d994da9007f8a34cd
#+zsh.9330dcf8922d0de5ca2e8456ce19d85e6ed76365cfe1fe9cb3761569bfd0cbf6
#+confz.877bac2c08b700a05f02da53f4683976812d170cb8e8009e006ba7a169b580bd
-#+containers.e7ed581fec1615a5b323fad5d90e050e6cfed49fb701288ff485816289099ff9
-#+xbps.7e8a9a3746e363f5897183fa19a00a1ba4230822591552d2769a8771065d2b6f
+#+containers.5e4cf467fe5d91205726257173a227320e0492aefd7eac79624f7cac04b720ff
+#+xbps.92731c8088c56653e67c85f730de3a45b3475d7aefc618992f94c322d94430f3
#+zstd.0c21eeca000c0fc1b714595d83cc5210adfa581edcf45820b95cb5921c46fcc4
#+apk-tools.c7f159a66814bc9be8c2840bf4fba46ee0a9ef6fdd1994c11b09d1dab82fb5d9
#+alpine-keys.7aa8a887a6f32ef454bca16fe2547b53b765170c2f8f0bab72ddd42c518bc941
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -21,13 +21,13 @@
#+pthbs-banginstall.457b2a62ae99241af2f242f0c8bdee49306e5070529448a61b56a7f55d3d2bb0
#+aat.26c64faca6c93aec6a952f93e4084d75104efe6f7c7fe589fdf2b4a2c8e73bd8
#+confz.877bac2c08b700a05f02da53f4683976812d170cb8e8009e006ba7a169b580bd
-#+containers.e7ed581fec1615a5b323fad5d90e050e6cfed49fb701288ff485816289099ff9
+#+containers.5e4cf467fe5d91205726257173a227320e0492aefd7eac79624f7cac04b720ff
#+fileset.a0ba1abeae878cc17e1f0ceccc0c79ee7b75b0476e283b042be371b828285b1f
#+logincaps.a67bba67b1e5e55ab2358bdefb29c0493d16dd72cb05571b87fbc1a215878bca
#+snaprep.faf160dbb290f4b2a5f9b6605820a8f59b9534344c3b3b430c1cdf1a336a8a8f
#+curl.7d12db521501148254cee062ca7489c9381330bb81fcfb28239e7846987a5db8
#+git.f01264e188e8d5c54cf4fce7f662f01ad1b1e8558e305368277e2521f7b6945d
-#+xbps.7e8a9a3746e363f5897183fa19a00a1ba4230822591552d2769a8771065d2b6f
+#+xbps.92731c8088c56653e67c85f730de3a45b3475d7aefc618992f94c322d94430f3
#+apk-tools.c7f159a66814bc9be8c2840bf4fba46ee0a9ef6fdd1994c11b09d1dab82fb5d9
#+getent.69120bd1e42219ed632181e8c4743c83e86e377d4b1d1197e6f8aa4c227b38ef
#+getconf.d06714cd7fb7004ec1e093fa2ffec2f6dcc319f1a8b99e60db710d298df3c1ef
@@ -38,8 +38,8 @@
#+user-env.cdccc52b50fbacaeea62161170c6e3b770fa8dcd6a6e46af363cbbe451f6b5a4
#+strace.f9dbe83d3eaac5f19c4d7b3971928e97af25794472024ea02b4fd20ef5d977c2
#+mlog.7a615a6cd358a942b7d328b13562fc11cb3c82d2933f3de7fa727db87d48e6c2
-#+system-config.67687d9cffc4d8878977702170b9e68fc26acb67649e24442788f65f8a7a3593
-#+system-config-rc.3980b8695e66b93151986efffb5566431cbc8c5927d02abb24387d4dfaa21ecc
+#+system-config.3b139dbdcdda96cac7da22fa91bfead806a45bd86638d371a3c4f1815f9d0122
+#+system-config-rc.4a8efd34573d36f8c55056d9039d713b0ef8b0155f0b7650cfed082ae6c4a44d
#+system-config-scripts.cbbd7e8b35c682d147057f2cd95a07b8735fe7422d41ed17dd2851d215e38137
-#+system-config-init.11bfb78111ca0d6a1c6a5f9aa99aa1ac58e1881a939d496b6fcc9d1cb64f5ebc
+#+system-config-init.d12782071e02f0c73683642d8774ad7aa72d6b430c07feca947e10fd9f832023
#+system-config-zsh.2395a0ac100619f08b05c21044f60208ef3fcb135a9302047c299e6d7ee2a6b1
\ No newline at end of file
diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config
@@ -50,7 +50,7 @@ printf '%s\n' >config/etc/skel/loginexec \
chmod +x config/etc/skel/loginexec
env 'pthbs_path_system-config'="$prefix" \
- 'pthbs_path_containers=/versions/env.29f55f5f4371c156c8a2ad164f1f64d48c8cc8859743054a2874cbea7ca36916' \
+ 'pthbs_path_containers=/versions/env.4b39c10583add2f36215abb7b3959d0c59fb9dffaeeedc5825130c9c9cfdea6d' \
'pthbs_path_mdevd=/versions/env.5efd9db39293775a765dd3ca79798f1d6d991d82daea54a5bef5fffce4509f66' \
make -j${JOBS:-1} -l$((1+${JOBS:-1})) all
diff --git a/variants/root-x86_64/system-config-init b/variants/root-x86_64/system-config-init
@@ -6,7 +6,7 @@
#+s6-portable-utils.f4a82103130cfcc49f440896a006e18566297bd1eaec89689a29869958a3982b
#+s6-linux-init.07931b00ba7cfaca6877d09e985caf229cbd20c34f35b30754a35b9d19762b56
#+execline.f0eae8694d48210e76b8c63d1021b7c54029a8db968696dcb8b720240cd7b8ab
-#+system-config-rc.3980b8695e66b93151986efffb5566431cbc8c5927d02abb24387d4dfaa21ecc
+#+system-config-rc.4a8efd34573d36f8c55056d9039d713b0ef8b0155f0b7650cfed082ae6c4a44d
# - build script start -
@@ -29,7 +29,7 @@ qx() { # register executable as dependency and quote full path to be suitable f
"s6-quote" "$prefix/deps/command/$name"
}
-s6rcdb=/versions/system-config-rc.3980b8695e66b93151986efffb5566431cbc8c5927d02abb24387d4dfaa21ecc/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.4a8efd34573d36f8c55056d9039d713b0ef8b0155f0b7650cfed082ae6c4a44d/config/s6-rc-db
# Generate init (${dest} must not exist but parent dir does)
mkdir -p "$pthbs_destdir//versions"
diff --git a/variants/root-x86_64/system-config-rc b/variants/root-x86_64/system-config-rc
@@ -4,7 +4,7 @@
#+busybox-diffutils.38ca9e723dfa24bd5cc2281952ff03c7dd312918a28dc0619b9816a293b5c8f5
#+s6-rc.6785af4c10f0e833235def47f34d88b8ac76fa2116f63d3bff478fb78de38b04
#+fileset.a0ba1abeae878cc17e1f0ceccc0c79ee7b75b0476e283b042be371b828285b1f
-#+system-config.67687d9cffc4d8878977702170b9e68fc26acb67649e24442788f65f8a7a3593
+#+system-config.3b139dbdcdda96cac7da22fa91bfead806a45bd86638d371a3c4f1815f9d0122
# - build script start -
@@ -13,7 +13,7 @@ dest=${pthbs_destdir%/}${prefix}
cd 'system-config-rc'
-src=/versions/system-config.67687d9cffc4d8878977702170b9e68fc26acb67649e24442788f65f8a7a3593/config/s6-rc-source
+src=/versions/system-config.3b139dbdcdda96cac7da22fa91bfead806a45bd86638d371a3c4f1815f9d0122/config/s6-rc-source
s6-rc-compile ./s6-rc-db "$src"
mkdir -p "$dest/config"
mv -v s6-rc-db "$dest/config/"
diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment
@@ -21,13 +21,13 @@
#+pthbs-banginstall.457b2a62ae99241af2f242f0c8bdee49306e5070529448a61b56a7f55d3d2bb0
#+aat.26c64faca6c93aec6a952f93e4084d75104efe6f7c7fe589fdf2b4a2c8e73bd8
#+confz.877bac2c08b700a05f02da53f4683976812d170cb8e8009e006ba7a169b580bd
-#+containers.e7ed581fec1615a5b323fad5d90e050e6cfed49fb701288ff485816289099ff9
+#+containers.5e4cf467fe5d91205726257173a227320e0492aefd7eac79624f7cac04b720ff
#+fileset.a0ba1abeae878cc17e1f0ceccc0c79ee7b75b0476e283b042be371b828285b1f
#+logincaps.a67bba67b1e5e55ab2358bdefb29c0493d16dd72cb05571b87fbc1a215878bca
#+snaprep.faf160dbb290f4b2a5f9b6605820a8f59b9534344c3b3b430c1cdf1a336a8a8f
#+curl.7d12db521501148254cee062ca7489c9381330bb81fcfb28239e7846987a5db8
#+git.f01264e188e8d5c54cf4fce7f662f01ad1b1e8558e305368277e2521f7b6945d
-#+xbps.7e8a9a3746e363f5897183fa19a00a1ba4230822591552d2769a8771065d2b6f
+#+xbps.92731c8088c56653e67c85f730de3a45b3475d7aefc618992f94c322d94430f3
#+apk-tools.c7f159a66814bc9be8c2840bf4fba46ee0a9ef6fdd1994c11b09d1dab82fb5d9
#+getent.69120bd1e42219ed632181e8c4743c83e86e377d4b1d1197e6f8aa4c227b38ef
#+getconf.d06714cd7fb7004ec1e093fa2ffec2f6dcc319f1a8b99e60db710d298df3c1ef
diff --git a/variants/root-x86_64/xbps b/variants/root-x86_64/xbps
@@ -1,6 +1,8 @@
#!/usr/bin/env pthbs-build
#+busybox.2526c34c97fd930f1ab4798292308fa8f146dbdaca63c001cd94b6293991c621
#+busybox-findutils.cc95c44dcbb25e61fc33eb7b5aaa947be36855d6f2367d712caf1fc559f0b18d
+#+musl-cross-make.255728e81a1280e80a952126ccaf79d2dc80cce5a54b6fa4b33386180115cf2f
+#+gnu-make.1c5f02e6e4343c5dc15f503f08db985b514b1ad84c6973d50ebd8e2e823ccd15
#+libarchive.4c7fcf6528b47c90f8ad310f5827f51d484fff7ce364f4a01283d7581acde11c
#+libressl.73544348b521aed2a2f57a38489ce8c949c816a076783c913b7244cd8b75edae
#+pkgconf-pkg-config.4809e1d99a94371478aa1b7f401267ca5fb9210aa54d33c091121696ce5839e9
