commit 9fe1b888bed04f7071b6604a13e991e14f2cad96
parent a05932500a33e25771fa0851ad15e06a9b1aed30
Author: ccx <ccx@te2000.cz>
Date: Thu, 20 Mar 2025 15:04:49 +0000
Revert "Try with apk-tools master again"
This reverts commit a05932500a33e25771fa0851ad15e06a9b1aed30.
Diffstat:
19 files changed, 41 insertions(+), 43 deletions(-)
diff --git a/Makefile b/Makefile
@@ -13,9 +13,7 @@ default: default.environment userspace.environment containers.environment mdevd.
-include $(variants)/$(shell whoami)-$(shell uname -m).mk
-include override.mk
-ifeq (,$(pthbs_skip_build))
include $(pthbs)/pthbs.mk
-endif
ifneq (,$(filter py%,$(MAKECMDGOALS)))
include $(pthbs_genpkgpy)/genpkgpy.mk
endif
diff --git a/filelist.sha256 b/filelist.sha256
@@ -15,7 +15,7 @@ db0b49163f07ffba64a5ca198bcf1688610b0bd1f0d8d5afeaf78559d73f2278 files/alpine-d
ebe717d228555aa58133c202314a451f81e71f174781fd7ff8d8970d6cfa60da files/alpine-devel@lists.alpinelinux.org-616adfeb.rsa.pub
d11f6b21c61b4274e182eb888883a8ba8acdbf820dcc7a6d82a7d9fc2fd2836d files/alpine-devel@lists.alpinelinux.org-616ae350.rsa.pub
40a216cbd163f22e5f16a9e0929de7cde221b9cbae8e36aa368b1e128afe0a31 files/alpine-devel@lists.alpinelinux.org-616db30d.rsa.pub
-a50b6439f2d5fbc7dc5e2b6aa0d1bcce3dfe9dd005708bec11b145578b2d4e1d files/apk-tools.patch
+4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd files/apk-tools.patch
818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093 files/applyuidgid-caps.c
1d9bd69b7a9a90f27db72629ceb4faaab2aab470103b77b5abd335c6f8bd0f35 files/argv0exec-amd64
8d716caa5ea940bbbb8f68ac0907cea36773c183bd4c1eebad030f6cc7deaec9 files/argv0exec.c
diff --git a/files/apk-tools.patch b/files/apk-tools.patch
@@ -1,8 +1,8 @@
diff --git a/Makefile b/Makefile
-index 2ac7da3..09b1cad 100644
+index 70e66e0..2b68485 100644
--- a/Makefile
+++ b/Makefile
-@@ -56,6 +56,20 @@ check test: FORCE
+@@ -47,6 +47,20 @@ check test: FORCE
static:
$(Q)$(MAKE) STATIC=y
@@ -21,5 +21,5 @@ index 2ac7da3..09b1cad 100644
+ $(INSTALL) -m644 src/apk.pc $(DESTDIR)$(PKGCONFIGDIR)
+
tag: check
- TAG_VERSION=$$(cat VERSION); \
- git commit . -m "apk-tools-$${TAG_VERSION}"; \
+ git commit . -m "apk-tools-$(VERSION)"
+ git tag -s v$(VERSION) -m "apk-tools-$(VERSION)"
diff --git a/variants/ccx-x86_64/apk-tools b/variants/ccx-x86_64/apk-tools
@@ -7,8 +7,8 @@
#+libressl.d907dd980ecd24307dada8e708792ac6e67999fef097613c478801bc1102dfa9
#+zstd.8b11bd81c450d61aa6a44ffd019654c590439df68ebd8987db4cdbbcf182d67c
#+pkgconf-pkg-config.86f9c193f6ccc64cc2ac696a7e3a258f01b8d0c539312ae37c08ea2354332e90
-#@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools
-#@sha256:a50b6439f2d5fbc7dc5e2b6aa0d1bcce3dfe9dd005708bec11b145578b2d4e1d:apk-tools.patch
+#@git:aeb74de67818dedb3f4e1c1175e8182ef5eae8d9:apk-tools
+#@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch
check_static() {
local exe || true
diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers
@@ -3,7 +3,7 @@
#+zsh.f79a20125b2f520d3719411e6f0895cf4f2e0657565c3fef07b3069436b8960f
#+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2
#+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f
-#@git:9d4d5eb5ea0c3f8ef9bf69559dbeb01d043d9ac2:containers
+#@git:2f95e15270f2d0bf0d3b9b9b276c146c6bfd1776:containers
: ${JOBS:=1}
prefix=/home/ccx/versions/$pthbs_package
@@ -37,7 +37,7 @@ printf '%s\n' >"$pkgdir/zsh/site-functions/confz_containers_pthbs_init" \
"typeset -g container_xbps_install_executable='$prefix/deps/command/xbps-install.static'"
mkdir -p "$pkgdir/deps/command"
-ln -sf '/home/ccx/versions/apk-tools.e9e277959018e5895740a5aa391ccffd5d0b6bdf0ffd6a796770dc033def598f/command/apk.static' "$pkgdir/deps/command/"
+ln -sf '/home/ccx/versions/apk-tools.81bbae0e3a21166adb9b536021a58df7eb0b5dc697c0137e4921ec221639d01e/command/apk.static' "$pkgdir/deps/command/"
ln -sf '/home/ccx/versions/xbps.e77402565036595f7c0410b63d0ede43ff75c3a9394c0ba075558b5acb8a35b9/command/xbps-install.static' "$pkgdir/deps/command/"
for f in '/home/ccx/versions/alpine-keys.dedc78b0b50e461d33a449adf40691698925b5eb9af8a6b69e7c0ece6b708ef4'/keys/alpine/*/*; do
diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment
@@ -6,10 +6,10 @@
#+s6-linux-utils.1990b55837ff2c28a81500d80292c6d530c8516347eb896007eb5aed2af6c425
#+zsh.f79a20125b2f520d3719411e6f0895cf4f2e0657565c3fef07b3069436b8960f
#+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a
-#+containers.27ba9c164931f010c6eeb0b84072bd14ff68092026d91e9de2ef99dfd9600b86
+#+containers.66428b207ac9ea1d8331e9eaab0848b88f2ce67dbb0dfc2dbc911f90ab7b7a7c
#+xbps.e77402565036595f7c0410b63d0ede43ff75c3a9394c0ba075558b5acb8a35b9
#+zstd.8b11bd81c450d61aa6a44ffd019654c590439df68ebd8987db4cdbbcf182d67c
-#+apk-tools.e9e277959018e5895740a5aa391ccffd5d0b6bdf0ffd6a796770dc033def598f
+#+apk-tools.81bbae0e3a21166adb9b536021a58df7eb0b5dc697c0137e4921ec221639d01e
#+alpine-keys.dedc78b0b50e461d33a449adf40691698925b5eb9af8a6b69e7c0ece6b708ef4
#+getent.497826562f0e3021d114ff3f47654fa0b574041039df71dbc4e509d38fa55447
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -1,7 +1,7 @@
-#+system-config.f3c43f89392cab5a318c6a8bc08e857ece7587e4462ce894ee64dec69b536f48
-#+system-config-rc.6935e621ad6804a3681d4766c3253cc98fd726e57bafa7c411c3ca58fa5db92d
+#+system-config.c5114f2cc85d94e6ea07a741f36f859f2ba98ba4da0f9e6291e11de483146958
+#+system-config-rc.ac51dec71ae105eab929a7b8a8147c6757bc81a210588d901ba8de2469c75e07
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.eb92c3913700782d83b6c1e4de5df111a6e4b4985abc70b01d36f9efda8cc157
+#+system-config-init.5dcae7c69d5a04cb1c7c90b88b4fa786b3cc5bb469f8fb64d66a9ad13d82591d
#+system-config-zsh.250277c1fe17ccb13b5efbacd35ecb3b8342e30910cdd709f89475773bb7f309
#+busybox.ee3440974794767b833fd3299226771f170d3f8601cf225cb884f0a513db8ab3
#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b
@@ -25,14 +25,14 @@
#+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2
#+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4
#+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a
-#+containers.27ba9c164931f010c6eeb0b84072bd14ff68092026d91e9de2ef99dfd9600b86
+#+containers.66428b207ac9ea1d8331e9eaab0848b88f2ce67dbb0dfc2dbc911f90ab7b7a7c
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+logincaps.3807c06e6e12534990449ba0aed2e1f43e6dfa91b928ce7d4bee7536409a5841
#+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7
#+curl.363090b3afccfe46f001c57627d39283abe5cc6a6357ee493bd55f8ab11607ba
#+git.c969489861a9208c195a11e9ec701d8f322e68505dff04cc209453a1f68fa1fc
#+xbps.e77402565036595f7c0410b63d0ede43ff75c3a9394c0ba075558b5acb8a35b9
-#+apk-tools.e9e277959018e5895740a5aa391ccffd5d0b6bdf0ffd6a796770dc033def598f
+#+apk-tools.81bbae0e3a21166adb9b536021a58df7eb0b5dc697c0137e4921ec221639d01e
#+getent.497826562f0e3021d114ff3f47654fa0b574041039df71dbc4e509d38fa55447
#+getconf.62760a9db3bdba375752c0a4f8722b5e0ee3c4eded1ab1073a73533c116f6de5
#+iconv.e574881283799fa144f1d9df753a05d9f7effa47ae0a06a92b532decde48f145
diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config
@@ -52,7 +52,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.735f83c39c31fc1e0f3083b15df0d8e310b4624d60b496bf9898b0e83313547a' \
+ 'pthbs_path_containers=/home/ccx/versions/env.09c7ef13b7fa33dec832e9943ec21ac4d36b4e9d536e10d28f6bffddcc363dc0' \
'pthbs_path_mdevd=/home/ccx/versions/env.5049027ea8b6b4d373e16aadd3cdc63a940582ff297656e395f2131eef181671' \
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
@@ -5,9 +5,9 @@
#+s6-portable-utils.1b8fd31be72bfe84afb28c3dfff03b1fc45121d11fc85f79c90f085fe61bc132
#+s6-linux-init.cd3e307b62e7dde98e1572eed297bd544e888d2589d4c1e7fd79271c4078ddf2
#+execline.1505a32c24aa5dbf362550f39283c9ff1936e717e5a82d220f8212cd9e604d8f
-#+system-config-rc.6935e621ad6804a3681d4766c3253cc98fd726e57bafa7c411c3ca58fa5db92d
+#+system-config-rc.ac51dec71ae105eab929a7b8a8147c6757bc81a210588d901ba8de2469c75e07
-s6rcdb=/home/ccx/versions/system-config-rc.6935e621ad6804a3681d4766c3253cc98fd726e57bafa7c411c3ca58fa5db92d/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.ac51dec71ae105eab929a7b8a8147c6757bc81a210588d901ba8de2469c75e07/config/s6-rc-db
prefix=/home/ccx/versions/$pthbs_package
pkgdir="$pthbs_destdir/$prefix"
diff --git a/variants/ccx-x86_64/system-config-rc b/variants/ccx-x86_64/system-config-rc
@@ -3,7 +3,7 @@
#+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc
#+s6-rc.fecfa43aebb0615904e0e120b9ce8c0596c9b6c577611cbadc8fbaca75196ed9
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
-#+system-config.f3c43f89392cab5a318c6a8bc08e857ece7587e4462ce894ee64dec69b536f48
+#+system-config.c5114f2cc85d94e6ea07a741f36f859f2ba98ba4da0f9e6291e11de483146958
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.f3c43f89392cab5a318c6a8bc08e857ece7587e4462ce894ee64dec69b536f48/config/s6-rc-source
+src=/home/ccx/versions/system-config.c5114f2cc85d94e6ea07a741f36f859f2ba98ba4da0f9e6291e11de483146958/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
@@ -20,14 +20,14 @@
#+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2
#+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4
#+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a
-#+containers.27ba9c164931f010c6eeb0b84072bd14ff68092026d91e9de2ef99dfd9600b86
+#+containers.66428b207ac9ea1d8331e9eaab0848b88f2ce67dbb0dfc2dbc911f90ab7b7a7c
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+logincaps.3807c06e6e12534990449ba0aed2e1f43e6dfa91b928ce7d4bee7536409a5841
#+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7
#+curl.363090b3afccfe46f001c57627d39283abe5cc6a6357ee493bd55f8ab11607ba
#+git.c969489861a9208c195a11e9ec701d8f322e68505dff04cc209453a1f68fa1fc
#+xbps.e77402565036595f7c0410b63d0ede43ff75c3a9394c0ba075558b5acb8a35b9
-#+apk-tools.e9e277959018e5895740a5aa391ccffd5d0b6bdf0ffd6a796770dc033def598f
+#+apk-tools.81bbae0e3a21166adb9b536021a58df7eb0b5dc697c0137e4921ec221639d01e
#+getent.497826562f0e3021d114ff3f47654fa0b574041039df71dbc4e509d38fa55447
#+getconf.62760a9db3bdba375752c0a4f8722b5e0ee3c4eded1ab1073a73533c116f6de5
#+iconv.e574881283799fa144f1d9df753a05d9f7effa47ae0a06a92b532decde48f145
diff --git a/variants/root-x86_64/apk-tools b/variants/root-x86_64/apk-tools
@@ -7,8 +7,8 @@
#+libressl.a24435b73987145b250c26263ad652c1fb8e0a4f8995f8b71f042cfe4c028139
#+zstd.a83f72c5953bd6b7afc171528a503710b3144bf9197961833fd27926b0a18137
#+pkgconf-pkg-config.ea4d3fe0fca073b8e3eb3b731df4d36c062498864ee04f68ce000a6f282b5621
-#@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools
-#@sha256:a50b6439f2d5fbc7dc5e2b6aa0d1bcce3dfe9dd005708bec11b145578b2d4e1d:apk-tools.patch
+#@git:aeb74de67818dedb3f4e1c1175e8182ef5eae8d9:apk-tools
+#@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch
check_static() {
local exe || true
diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers
@@ -3,7 +3,7 @@
#+zsh.4ac9e4166454e8d60c15837b7ca4938abe99db029b3fffa11b1cfd54d40ae09b
#+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571
#+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9
-#@git:9d4d5eb5ea0c3f8ef9bf69559dbeb01d043d9ac2:containers
+#@git:2f95e15270f2d0bf0d3b9b9b276c146c6bfd1776:containers
: ${JOBS:=1}
prefix=/versions/$pthbs_package
@@ -37,7 +37,7 @@ printf '%s\n' >"$pkgdir/zsh/site-functions/confz_containers_pthbs_init" \
"typeset -g container_xbps_install_executable='$prefix/deps/command/xbps-install.static'"
mkdir -p "$pkgdir/deps/command"
-ln -sf '/versions/apk-tools.151580c73e5f361296f6e692016a58ab3cfb716fdef1424f169ea82bbacea912/command/apk.static' "$pkgdir/deps/command/"
+ln -sf '/versions/apk-tools.f97ffbd6594847bb387ac313d61ef91c0004e2256883383e298f8d09c3df75a7/command/apk.static' "$pkgdir/deps/command/"
ln -sf '/versions/xbps.f2dcdfd8accffba33bb4a025e1b3ad227f1a9d9776422455a381cfafaac7d473/command/xbps-install.static' "$pkgdir/deps/command/"
for f in '/versions/alpine-keys.4ecd9fac6efcc329a98af1b0b1318771a77eb83ac10832c6e769ebf11c14cae1'/keys/alpine/*/*; do
diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment
@@ -6,10 +6,10 @@
#+s6-linux-utils.f7e0654375f11beedafd731ad1dd66c0de8d03452bb8e38bb647cc51cc3adb2e
#+zsh.4ac9e4166454e8d60c15837b7ca4938abe99db029b3fffa11b1cfd54d40ae09b
#+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf
-#+containers.d66a69d5a0e09b3bc0c5242d64530160ed6fcef3bdea02d2da198fa2cc118059
+#+containers.188fcff8aeb0097139b964aa4fcf0e68015b1341cbf99e512567d5647fbc92c1
#+xbps.f2dcdfd8accffba33bb4a025e1b3ad227f1a9d9776422455a381cfafaac7d473
#+zstd.a83f72c5953bd6b7afc171528a503710b3144bf9197961833fd27926b0a18137
-#+apk-tools.151580c73e5f361296f6e692016a58ab3cfb716fdef1424f169ea82bbacea912
+#+apk-tools.f97ffbd6594847bb387ac313d61ef91c0004e2256883383e298f8d09c3df75a7
#+alpine-keys.4ecd9fac6efcc329a98af1b0b1318771a77eb83ac10832c6e769ebf11c14cae1
#+getent.a4f1c1679ad9e6d4cd167e921ee8af0f7fce4a2b7886f96223b8c7fe1ba5ba97
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -1,7 +1,7 @@
-#+system-config.d580b4e26ce73b2fdcdadd2ef1f74bfef097bd7682f5daf8af33834741f1a3af
-#+system-config-rc.36d72aa720247dc03eb10035f98035b638fd8db2fa6d13cb70bd70fca3b761e3
+#+system-config.1a50ce4125552ec416e107209da4d4b439a7110cddafafc2c8f220da9e72648b
+#+system-config-rc.7ea841635884b31cef48e3b9b46ca427b34617aadcd37f3ccc43bf7987f125d0
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.ef6772aa1860e24495bd17a5a1b91bce0a2eb994f28f49aea46f08467b2c7941
+#+system-config-init.cb752fd9af1db812749f8be1eb5d1a53405ce6626d424c61221c64387e528591
#+system-config-zsh.01286ec545c7035b2e08ded96e40b73f912f33fd7eec44993a1e93e12577dc0f
#+busybox.f4ef3d511c029095beda8d21dd48f7730bec63fb09792ca951402d6620338089
#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465
@@ -25,14 +25,14 @@
#+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571
#+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f
#+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf
-#+containers.d66a69d5a0e09b3bc0c5242d64530160ed6fcef3bdea02d2da198fa2cc118059
+#+containers.188fcff8aeb0097139b964aa4fcf0e68015b1341cbf99e512567d5647fbc92c1
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.2f972abfd388f5fe599ca55104232cacf60562157bd0028d26154a578af8f14f
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
#+curl.77419befc08ac7280bdc98fe2388cde9d88721ec00a30a7f9feb7817610ae58a
#+git.7a4dbe4f09816eab374b3b020321f582a08dce75afaa97f2abeae2a58bcfe0a7
#+xbps.f2dcdfd8accffba33bb4a025e1b3ad227f1a9d9776422455a381cfafaac7d473
-#+apk-tools.151580c73e5f361296f6e692016a58ab3cfb716fdef1424f169ea82bbacea912
+#+apk-tools.f97ffbd6594847bb387ac313d61ef91c0004e2256883383e298f8d09c3df75a7
#+getent.a4f1c1679ad9e6d4cd167e921ee8af0f7fce4a2b7886f96223b8c7fe1ba5ba97
#+getconf.2d8409e202963fe34a70113b3fed7da0299f212d739c84f529126f9451886e7e
#+iconv.b537e50837859e5b0fa7cc56ee46ff152c638910b9c817cba957f09631c9aad1
diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config
@@ -52,7 +52,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.9eb3806c3022be0067d5eff3c65baf04fe96f6facd77391047d0e47a76fe85af' \
+ 'pthbs_path_containers=/versions/env.05414835389899f60f8c6a3401f5fe37762064dc31ce06f52d2f50fda4de798b' \
'pthbs_path_mdevd=/versions/env.699c310193b7957c8ec17e16d6846443f99c198e3e2ce6425066f4523de2cf1e' \
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
@@ -5,9 +5,9 @@
#+s6-portable-utils.f6171ad521d6be72875f1d5c1b28f966662ba93cfe5790e1ef010f9e76211bc3
#+s6-linux-init.8fbed3537ce9accc1a31e36f4648d1a0df0f1d155fcfa8fb5b1079786cf1442c
#+execline.c89bee1b1207461afa2d2ab9250f0940a2a6bbca3e45bdd60037049a75f4adf9
-#+system-config-rc.36d72aa720247dc03eb10035f98035b638fd8db2fa6d13cb70bd70fca3b761e3
+#+system-config-rc.7ea841635884b31cef48e3b9b46ca427b34617aadcd37f3ccc43bf7987f125d0
-s6rcdb=/versions/system-config-rc.36d72aa720247dc03eb10035f98035b638fd8db2fa6d13cb70bd70fca3b761e3/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.7ea841635884b31cef48e3b9b46ca427b34617aadcd37f3ccc43bf7987f125d0/config/s6-rc-db
prefix=/versions/$pthbs_package
pkgdir="$pthbs_destdir/$prefix"
diff --git a/variants/root-x86_64/system-config-rc b/variants/root-x86_64/system-config-rc
@@ -3,7 +3,7 @@
#+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123
#+s6-rc.c131bb99b2054bcd9705c5a5652822938265a8587a54d2894667b8b620815c7f
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
-#+system-config.d580b4e26ce73b2fdcdadd2ef1f74bfef097bd7682f5daf8af33834741f1a3af
+#+system-config.1a50ce4125552ec416e107209da4d4b439a7110cddafafc2c8f220da9e72648b
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.d580b4e26ce73b2fdcdadd2ef1f74bfef097bd7682f5daf8af33834741f1a3af/config/s6-rc-source
+src=/versions/system-config.1a50ce4125552ec416e107209da4d4b439a7110cddafafc2c8f220da9e72648b/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
@@ -20,14 +20,14 @@
#+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571
#+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f
#+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf
-#+containers.d66a69d5a0e09b3bc0c5242d64530160ed6fcef3bdea02d2da198fa2cc118059
+#+containers.188fcff8aeb0097139b964aa4fcf0e68015b1341cbf99e512567d5647fbc92c1
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.2f972abfd388f5fe599ca55104232cacf60562157bd0028d26154a578af8f14f
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
#+curl.77419befc08ac7280bdc98fe2388cde9d88721ec00a30a7f9feb7817610ae58a
#+git.7a4dbe4f09816eab374b3b020321f582a08dce75afaa97f2abeae2a58bcfe0a7
#+xbps.f2dcdfd8accffba33bb4a025e1b3ad227f1a9d9776422455a381cfafaac7d473
-#+apk-tools.151580c73e5f361296f6e692016a58ab3cfb716fdef1424f169ea82bbacea912
+#+apk-tools.f97ffbd6594847bb387ac313d61ef91c0004e2256883383e298f8d09c3df75a7
#+getent.a4f1c1679ad9e6d4cd167e921ee8af0f7fce4a2b7886f96223b8c7fe1ba5ba97
#+getconf.2d8409e202963fe34a70113b3fed7da0299f212d739c84f529126f9451886e7e
#+iconv.b537e50837859e5b0fa7cc56ee46ff152c638910b9c817cba957f09631c9aad1
