commit fcb761e8f1b69b0d442f4a58c5190cf4c04be536
parent 105397a44fa3eec7a95231ba22b8bf054e4352a7
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Thu, 18 Dec 2025 20:00:11 +0000
Add libcap dependency to ccx-utils
Diffstat:
21 files changed, 49 insertions(+), 46 deletions(-)
diff --git a/templates/pkg/ccx-utils b/templates/pkg/ccx-utils
@@ -7,6 +7,7 @@
#+{{pkg_install_name("gnu-make")}}
#+{{pkg_install_name("skalibs")}}
#+{{pkg_install_name("s6")}}
+#+{{pkg_install_name("libcap")}}
{% endblock %}
{% block build -%}
build_env_static
diff --git a/variants/ccx-x86_64/ccx-utils b/variants/ccx-x86_64/ccx-utils
@@ -31,6 +31,7 @@
#+gnu-make.fb4cff1c46827d02016d0f94d5256a263e7710025f7480fffb7580dc922a6069
#+skalibs.c176e766c962904581e169dc5f7c735b91af608bd7f90f8ff461bdbacb8929e8
#+s6.8995e7d6191578e627f1a57d90c25a0e52d9afa701bbbe951f12494e5880351c
+#+libcap.ecad0ebabe3cad4c99717b80b60a24e91970f05a6ed9e37e96f147377522bee3
#@git:48aa9dd528fd650ce6b177af3aee7b8b6762d342:ccx-utils
diff --git a/variants/ccx-x86_64/container-bin-image b/variants/ccx-x86_64/container-bin-image
@@ -48,7 +48,7 @@
#+busybox-login.861e229c09761723554930888e954e43d46dec30d0e2bbc792d2c4bf6206486f
#+execline.403a4e1645c681e8c2ca9a75704a27658b788db460265916951d1d7a1e59ce8a
#+s6.8995e7d6191578e627f1a57d90c25a0e52d9afa701bbbe951f12494e5880351c
-#+ccx-utils.0d8391e28bd852e8c0697e29266b2840e4a69f218bad722069bc86f877812653
+#+ccx-utils.a0dd0b66ee77bbde1c20e981ba4ddf14995cacb0b99789c0bf50eb40286a63c6
#+applyuidgid-caps.be47ec66d7811ebb9ec5aa7383b6a4a76decca3f82d1d1180fd7c59b979173c0
#+easyseccomp.a7a8ac63b6862efbc9e3b92f971f30c1529e11e5b02b073b8f6f6187e1d8cdc7
#+mlog.ccaa6829cadd2cad0613a94d52a7dc45051407d0467f53e0d5e1fed3b73bc8d1
diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers
@@ -33,7 +33,7 @@
#+alpine-keys.f38e5db6c6e34040a43a472f8a38e9080a626bfb8b3c6ff055c91f20ce866f6a
#+apk-tools.8155ce27acbce82a7eec29d41aaa6a561136359a2b6ab5f3958ae615bf7edabc
#+xbps.1e2fce2eaace515309960e0f0e4a6586fe12cd32ab8e8ec172a666d2e45a7f1d
-#+container-bin-image.58d86c193967fb516d9b75bc2c7b4905a1d1f00439520787f244088dc3b3c3ba
+#+container-bin-image.bbe0ecbaa4a37cddb77f9e925714f539049bd61acafe6bd544f50fdd4fae0375
#@git:68a211c657547b3f5c9d3dfecb2f6d51872bb8d2:containers
@@ -91,9 +91,9 @@ for f in '/home/ccx/versions/xbps.1e2fce2eaace515309960e0f0e4a6586fe12cd32ab8e8e
ln -sf "$f" "${dest}/deps/keys/void/"
done
-test -d '/home/ccx/versions/container-bin-image.58d86c193967fb516d9b75bc2c7b4905a1d1f00439520787f244088dc3b3c3ba/container-bin-image'
-test -f '/home/ccx/versions/container-bin-image.58d86c193967fb516d9b75bc2c7b4905a1d1f00439520787f244088dc3b3c3ba/container-bin-image/if'
-ln -sf '/home/ccx/versions/container-bin-image.58d86c193967fb516d9b75bc2c7b4905a1d1f00439520787f244088dc3b3c3ba/container-bin-image' "${dest}/deps/"
+test -d '/home/ccx/versions/container-bin-image.bbe0ecbaa4a37cddb77f9e925714f539049bd61acafe6bd544f50fdd4fae0375/container-bin-image'
+test -f '/home/ccx/versions/container-bin-image.bbe0ecbaa4a37cddb77f9e925714f539049bd61acafe6bd544f50fdd4fae0375/container-bin-image/if'
+ln -sf '/home/ccx/versions/container-bin-image.bbe0ecbaa4a37cddb77f9e925714f539049bd61acafe6bd544f50fdd4fae0375/container-bin-image' "${dest}/deps/"
diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment
@@ -50,14 +50,14 @@
#+s6-linux-utils.e02e2527a80df5d5fe98615c278f0d9db7451b7a7002c1c817d47ca469d0d03f
#+zsh.bcee316426fa08a87a1cdbd36d4192206516d31160995f7cb40171cedd8cfa2f
#+confz.54cffc17e24f59492eb78f8fb861148dd737735dc81663f8c3cf31c37ee802c1
-#+containers.43a5792207dded3c70e92475659f8b100856870d6a0699c0eef851554ec195a0
+#+containers.0598e1266b9ef43e7debabcb7c8ad5fee8215577d622691f32a1a0d7bae516cb
#+xbps.1e2fce2eaace515309960e0f0e4a6586fe12cd32ab8e8ec172a666d2e45a7f1d
#+zstd.1569c43f77b4031079e930f7eb6107e77b72dd641fac5228c4d2c784a6f15361
#+apk-tools.8155ce27acbce82a7eec29d41aaa6a561136359a2b6ab5f3958ae615bf7edabc
#+alpine-keys.f38e5db6c6e34040a43a472f8a38e9080a626bfb8b3c6ff055c91f20ce866f6a
#+getent.fe6cff02ca3d49cd8fdc4dcaa6ab60f50745e25befb3b290c9fd1dec84991f12
#+fileset.a3b5845ff158d4a14da356583bcbbc7de921ea437f40d47d1f91d28549b384c0
-#+ccx-utils.0d8391e28bd852e8c0697e29266b2840e4a69f218bad722069bc86f877812653
+#+ccx-utils.a0dd0b66ee77bbde1c20e981ba4ddf14995cacb0b99789c0bf50eb40286a63c6
#+easyseccomp.a7a8ac63b6862efbc9e3b92f971f30c1529e11e5b02b073b8f6f6187e1d8cdc7
#+findutils.efdc2b649d6fcaea4f7b4716e770de6197dbc3d02ce14907eeda729116f581e2
#+nawk.ec8a7f9ea4618a151470a1c1a0026f688a5032eb06b8e459510fe82316c17a60
\ No newline at end of file
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -65,9 +65,9 @@
#+pthbs-banginstall.944f9b6485bfdb1329fd9fbc78c7996dec0c63f617ccc49ba97ec77d145eedd7
#+aat.9166428aa8236b03999fcbe9e2f6da9adefa8c4675ddd36f4b7995d6c7bb87f4
#+confz.54cffc17e24f59492eb78f8fb861148dd737735dc81663f8c3cf31c37ee802c1
-#+containers.43a5792207dded3c70e92475659f8b100856870d6a0699c0eef851554ec195a0
+#+containers.0598e1266b9ef43e7debabcb7c8ad5fee8215577d622691f32a1a0d7bae516cb
#+fileset.a3b5845ff158d4a14da356583bcbbc7de921ea437f40d47d1f91d28549b384c0
-#+logincaps.96382445a62236da2a414d262587dd45f623df0b02dcc68996e13b9500547506
+#+logincaps.536680c06902322ead7c7241797739c630cb11fb4c62d45c991e9b5fa03666ce
#+snaprep.77c41271f852de542d321eb387e5807f47a1c96f4289daaad7866be9721d4a76
#+curl.5c276fe4d4fab33e3919e64e72f77f497b6f091f3a2fcd3551530b1c85ff7642
#+git.16860e4191850edbfac3bb52aa30a2a5adac5544394f99c524453a33ea4ed02d
@@ -78,7 +78,7 @@
#+iconv.0d67e9456d04a04ee273169db2e2802f27a9d1d0b582a44bbf24c38f74a2c2e9
#+libcap.ecad0ebabe3cad4c99717b80b60a24e91970f05a6ed9e37e96f147377522bee3
#+applyuidgid-caps.be47ec66d7811ebb9ec5aa7383b6a4a76decca3f82d1d1180fd7c59b979173c0
-#+ccx-utils.0d8391e28bd852e8c0697e29266b2840e4a69f218bad722069bc86f877812653
+#+ccx-utils.a0dd0b66ee77bbde1c20e981ba4ddf14995cacb0b99789c0bf50eb40286a63c6
#+user-env.46ffb119f20a713e192e63c63a0bcc7420343381d756ee6fb5a39d3bbc395414
#+strace.16677554a13d04e241d4be4e16e2d477ebeb3ce6e38be7bde69f6fbeaf09ad79
#+mlog.ccaa6829cadd2cad0613a94d52a7dc45051407d0467f53e0d5e1fed3b73bc8d1
@@ -88,9 +88,9 @@
#+squashfs-tools.e58b08a6012ee3dc4429378aaaf55f620da924cf444b3556520fc4e6efb10946
#+mandoc.f9203b401ae6346801b1e100da2e79879b24b86f7f31c457fb4add63cf1ed170
#+tinyssh.9940616c43114ecd7767fc10062ce00eb76a738453248a490f64cd79854343d7
-#+system-config.6cf714c4b07a8c18316868fdab808724403eb12ac5f723188a6dd300e6e4a1ed
-#+system-config-rc.82a01ba68bbbd32cac54cf18d29680528af704b3ad6ca8f4a8af7935f44a98b0
+#+system-config.6b08858a986ca8dd9b6972ad4053e17326c8055de1d1b97e45485dbf47105d82
+#+system-config-rc.8dea0ea821b1f6e82ec913085cdf2ae288004d2b860d7b34abb115c95da78dac
#+system-config-scripts.35c642cad58c3945c2c3caa525fce3946ba87d0710adaf13efec1db79da75729
-#+system-config-init.c61f34d813322beaed2537d69de6e7000deb83a696b2330c7e3351eb1ea59b32
+#+system-config-init.0f36bdec401afa58530df96c7710a478ff422141e7eefe5d22e3e3c5818be8b3
#+system-config-zsh.a8d29ac3c60ef9b666edf51a0bfd60aee2be60f3aa898ed8285afd8c2955baab
#+busybox.e2eb491435a192a50d7e8291bbdacb3bb5c42a960036a2bc251e622b2c7b723a
\ No newline at end of file
diff --git a/variants/ccx-x86_64/logincaps b/variants/ccx-x86_64/logincaps
@@ -31,7 +31,7 @@
#+pthbs-banginstall.944f9b6485bfdb1329fd9fbc78c7996dec0c63f617ccc49ba97ec77d145eedd7
#+execline.403a4e1645c681e8c2ca9a75704a27658b788db460265916951d1d7a1e59ce8a
#+musl-cross-make.4bca2cd43f4a72eaaeefc4befc0b0ce736a5906ec0245552a8db7dc56fa9e5ec
-#+ccx-utils.0d8391e28bd852e8c0697e29266b2840e4a69f218bad722069bc86f877812653
+#+ccx-utils.a0dd0b66ee77bbde1c20e981ba4ddf14995cacb0b99789c0bf50eb40286a63c6
#@git:409db79b3e7e5fc6b73305471d9bbb6ac5c14036:logincaps
diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config
@@ -59,7 +59,7 @@
#+zsh.bcee316426fa08a87a1cdbd36d4192206516d31160995f7cb40171cedd8cfa2f
#+libcgroup.b965840ad051883db316a3df064f53b4562cddf8738dea3aa31a3464b23070c8
#+system-config-scripts.35c642cad58c3945c2c3caa525fce3946ba87d0710adaf13efec1db79da75729
-#+logincaps.96382445a62236da2a414d262587dd45f623df0b02dcc68996e13b9500547506
+#+logincaps.536680c06902322ead7c7241797739c630cb11fb4c62d45c991e9b5fa03666ce
#+busybox.e2eb491435a192a50d7e8291bbdacb3bb5c42a960036a2bc251e622b2c7b723a
#@git:055d24bac572481d7dedba7d4ec9df37f620fbfd:system-config
@@ -97,7 +97,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.4c735aa6d4f338981359a7cc64e874694a4048986a5af7b21696467f6b0d5c4e' \
+ 'pthbs_path_containers=/home/ccx/versions/env.27f1226f897f2fa3c677187600cd36c4649a1baf2f67dce47c22790cb749fe34' \
'pthbs_path_mdevd=/home/ccx/versions/env.d252549a97a8de5eb5b01f328ec83c4381256471275c357ed0653da1646f9679' \
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
@@ -50,7 +50,7 @@
#+s6-portable-utils.ed9b2a1a2b2eade3f210e876b2e8c08d680c2fb0f4f5a1ec4137dd262a3d9e3d
#+s6-linux-init.7af048a1da88cb89e227afc4ce78f722cfde5a4bbe2f8fef1b1c4c37b1a12b8d
#+execline.403a4e1645c681e8c2ca9a75704a27658b788db460265916951d1d7a1e59ce8a
-#+system-config-rc.82a01ba68bbbd32cac54cf18d29680528af704b3ad6ca8f4a8af7935f44a98b0
+#+system-config-rc.8dea0ea821b1f6e82ec913085cdf2ae288004d2b860d7b34abb115c95da78dac
# - build script start -
@@ -75,7 +75,7 @@ dest=${pthbs_destdir%/}${prefix}
cd '.'
-s6rcdb=/home/ccx/versions/system-config-rc.82a01ba68bbbd32cac54cf18d29680528af704b3ad6ca8f4a8af7935f44a98b0/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.8dea0ea821b1f6e82ec913085cdf2ae288004d2b860d7b34abb115c95da78dac/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
@@ -30,7 +30,7 @@
#+busybox-diffutils.eed6ca067c994ab56e63b8b97a60f6e9f3625d3f9aeda53306e23bb42186ce78
#+s6-rc.9aac5b15b54c183366ab03f193a967d0fc66134b1623410032766e062e77bc5d
#+fileset.a3b5845ff158d4a14da356583bcbbc7de921ea437f40d47d1f91d28549b384c0
-#+system-config.6cf714c4b07a8c18316868fdab808724403eb12ac5f723188a6dd300e6e4a1ed
+#+system-config.6b08858a986ca8dd9b6972ad4053e17326c8055de1d1b97e45485dbf47105d82
# - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
cd '.'
-src=/home/ccx/versions/system-config.6cf714c4b07a8c18316868fdab808724403eb12ac5f723188a6dd300e6e4a1ed/config/s6-rc-source
+src=/home/ccx/versions/system-config.6b08858a986ca8dd9b6972ad4053e17326c8055de1d1b97e45485dbf47105d82/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
@@ -65,9 +65,9 @@
#+pthbs-banginstall.944f9b6485bfdb1329fd9fbc78c7996dec0c63f617ccc49ba97ec77d145eedd7
#+aat.9166428aa8236b03999fcbe9e2f6da9adefa8c4675ddd36f4b7995d6c7bb87f4
#+confz.54cffc17e24f59492eb78f8fb861148dd737735dc81663f8c3cf31c37ee802c1
-#+containers.43a5792207dded3c70e92475659f8b100856870d6a0699c0eef851554ec195a0
+#+containers.0598e1266b9ef43e7debabcb7c8ad5fee8215577d622691f32a1a0d7bae516cb
#+fileset.a3b5845ff158d4a14da356583bcbbc7de921ea437f40d47d1f91d28549b384c0
-#+logincaps.96382445a62236da2a414d262587dd45f623df0b02dcc68996e13b9500547506
+#+logincaps.536680c06902322ead7c7241797739c630cb11fb4c62d45c991e9b5fa03666ce
#+snaprep.77c41271f852de542d321eb387e5807f47a1c96f4289daaad7866be9721d4a76
#+curl.5c276fe4d4fab33e3919e64e72f77f497b6f091f3a2fcd3551530b1c85ff7642
#+git.16860e4191850edbfac3bb52aa30a2a5adac5544394f99c524453a33ea4ed02d
@@ -78,7 +78,7 @@
#+iconv.0d67e9456d04a04ee273169db2e2802f27a9d1d0b582a44bbf24c38f74a2c2e9
#+libcap.ecad0ebabe3cad4c99717b80b60a24e91970f05a6ed9e37e96f147377522bee3
#+applyuidgid-caps.be47ec66d7811ebb9ec5aa7383b6a4a76decca3f82d1d1180fd7c59b979173c0
-#+ccx-utils.0d8391e28bd852e8c0697e29266b2840e4a69f218bad722069bc86f877812653
+#+ccx-utils.a0dd0b66ee77bbde1c20e981ba4ddf14995cacb0b99789c0bf50eb40286a63c6
#+user-env.46ffb119f20a713e192e63c63a0bcc7420343381d756ee6fb5a39d3bbc395414
#+strace.16677554a13d04e241d4be4e16e2d477ebeb3ce6e38be7bde69f6fbeaf09ad79
#+mlog.ccaa6829cadd2cad0613a94d52a7dc45051407d0467f53e0d5e1fed3b73bc8d1
diff --git a/variants/root-x86_64/ccx-utils b/variants/root-x86_64/ccx-utils
@@ -31,6 +31,7 @@
#+gnu-make.17b0037e8a3f24180cb7bb9ddb488039d540ba905aecca0315de313adfbae81c
#+skalibs.6d3bb8e0267e7955aee01b7835ae1a08dcef0cf4f865a6c5840e0a3e2bb7a374
#+s6.64db7103e34ea2b2dd5d657ebf1a62bea89d31b2a5df8cd6ef0c140ef574828f
+#+libcap.8eb713ba6242a6553f60222291d08461b1d83b63aa1aee69e69e7551e45b06cd
#@git:48aa9dd528fd650ce6b177af3aee7b8b6762d342:ccx-utils
diff --git a/variants/root-x86_64/container-bin-image b/variants/root-x86_64/container-bin-image
@@ -48,7 +48,7 @@
#+busybox-login.fd0657e839fb1c05fc9a3b3e265f192030811d720bce7f4e9360095d72cb19cc
#+execline.4e773f1ba308227aa5402fd63038f6dcbaf3866ca3fa70555a8bec9b81c8e2d2
#+s6.64db7103e34ea2b2dd5d657ebf1a62bea89d31b2a5df8cd6ef0c140ef574828f
-#+ccx-utils.fe7039538de6ab46024867474edbb6b9a0d4e9ff8575ff0464bed4fe65a2f4ce
+#+ccx-utils.03320cb6f512de325611c0af488f96433fb29ca1c4a7c71454da478b48cf607e
#+applyuidgid-caps.2916827d22d53b40674079dd28c0fbd0044fafb7af8cc7db84cd582a1e420dbd
#+easyseccomp.14113f820fb502f0771b760e125e5a222b19d76413a9cd99c1f6569281bbdb98
#+mlog.f63e3f9617bf9711d5569d7215cc91aececf0bbcd3ac887e2351b2f501d890c5
diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers
@@ -33,7 +33,7 @@
#+alpine-keys.28471830774daf16fabe3b35657f73e2ae25c8bf137fa1f0dfa70f3fd5f31ae1
#+apk-tools.bbc7958b38c0626dfcf81bfcb4f965d947cf63c3adb44292b4fe455e5f615c19
#+xbps.54db99afb1be4f67d6757cb08e9f69feeec8e7fd5b691b92abd9206844bb71aa
-#+container-bin-image.65118b1c061fbbbb11238d0cb923b50cca31f74bb5d86bf0327b9ba0135f33a3
+#+container-bin-image.907b8ae505a68f744a186000f2736a1e095446c927904fd5ab3644da7eeaf160
#@git:68a211c657547b3f5c9d3dfecb2f6d51872bb8d2:containers
@@ -91,9 +91,9 @@ for f in '/versions/xbps.54db99afb1be4f67d6757cb08e9f69feeec8e7fd5b691b92abd9206
ln -sf "$f" "${dest}/deps/keys/void/"
done
-test -d '/versions/container-bin-image.65118b1c061fbbbb11238d0cb923b50cca31f74bb5d86bf0327b9ba0135f33a3/container-bin-image'
-test -f '/versions/container-bin-image.65118b1c061fbbbb11238d0cb923b50cca31f74bb5d86bf0327b9ba0135f33a3/container-bin-image/if'
-ln -sf '/versions/container-bin-image.65118b1c061fbbbb11238d0cb923b50cca31f74bb5d86bf0327b9ba0135f33a3/container-bin-image' "${dest}/deps/"
+test -d '/versions/container-bin-image.907b8ae505a68f744a186000f2736a1e095446c927904fd5ab3644da7eeaf160/container-bin-image'
+test -f '/versions/container-bin-image.907b8ae505a68f744a186000f2736a1e095446c927904fd5ab3644da7eeaf160/container-bin-image/if'
+ln -sf '/versions/container-bin-image.907b8ae505a68f744a186000f2736a1e095446c927904fd5ab3644da7eeaf160/container-bin-image' "${dest}/deps/"
diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment
@@ -50,14 +50,14 @@
#+s6-linux-utils.34bdcec91aae280416c16a52959e513382aeb67ffd9f68bcdec6f5967434b445
#+zsh.355a949de332be38ccdfad4e0d3e4a3d60d4b2f3ee257698a87f25ce811c2008
#+confz.5dfd584a711633259aecac13da60d50f455c7716916c74e04ded1457ae04a071
-#+containers.f44fa4f7f2612721c1bb626790c37827f282127a19953e8c86cae9ef18adb180
+#+containers.2686ccca4e98fdef5f04fa8fab7773de3e9b19edec70d88d9590aa5744ca3e91
#+xbps.54db99afb1be4f67d6757cb08e9f69feeec8e7fd5b691b92abd9206844bb71aa
#+zstd.b096b77421f338e2452668ae6faa2713158264b0378007a1c772d73ab2aefd52
#+apk-tools.bbc7958b38c0626dfcf81bfcb4f965d947cf63c3adb44292b4fe455e5f615c19
#+alpine-keys.28471830774daf16fabe3b35657f73e2ae25c8bf137fa1f0dfa70f3fd5f31ae1
#+getent.20fb90694a2718bfd2c26942a1fbae3d6e61aaa49cebf1a83cec27775dc9c334
#+fileset.2156fb8cabd628b062bc9fcc2f673d772a25574dfe5c2c2b779ada64fe9d9d08
-#+ccx-utils.fe7039538de6ab46024867474edbb6b9a0d4e9ff8575ff0464bed4fe65a2f4ce
+#+ccx-utils.03320cb6f512de325611c0af488f96433fb29ca1c4a7c71454da478b48cf607e
#+easyseccomp.14113f820fb502f0771b760e125e5a222b19d76413a9cd99c1f6569281bbdb98
#+findutils.337df827b790b33c27518f2bf52fb537e3b5756ccdbde9dedfa26f6922395b60
#+nawk.84c186be0a6d09a951a8c6a5377d16b0ba0a9e476e6b554c0c832d6407ebb5b2
\ No newline at end of file
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -65,9 +65,9 @@
#+pthbs-banginstall.c568b82ef8544f41d05a56244bb32a93e2f5edd433293243a7037e36f2aa5155
#+aat.b2df2bfbff48087d5ef34ef39f712038b0d35c0112f04003b12510555fc3a1f2
#+confz.5dfd584a711633259aecac13da60d50f455c7716916c74e04ded1457ae04a071
-#+containers.f44fa4f7f2612721c1bb626790c37827f282127a19953e8c86cae9ef18adb180
+#+containers.2686ccca4e98fdef5f04fa8fab7773de3e9b19edec70d88d9590aa5744ca3e91
#+fileset.2156fb8cabd628b062bc9fcc2f673d772a25574dfe5c2c2b779ada64fe9d9d08
-#+logincaps.ea771b6547cd9c944110fa6eef4226125d533ef1cd30d840cd8f116bfe9acfbf
+#+logincaps.8eecccc5adf986da642a0e803f9dd0c71311059104c342f8f5d6d99223d793ec
#+snaprep.9367398cdf89d51bfb5e6c8cb7ec368b8fa8f18b05c4926b7249f28703977504
#+curl.de666e9e011223f6dbbf0232f52d0e43778c128b6c04e0add9b33602435ea7bb
#+git.2a486b7472935ff9e977ddeb1e6cb7209259cf2f8b67cfe1aacde4e9dd4fde29
@@ -78,7 +78,7 @@
#+iconv.49647ce39c09f8ece8c52eac0d8ae54d752c822ae6cd83b9e53aabe2c3e6a580
#+libcap.8eb713ba6242a6553f60222291d08461b1d83b63aa1aee69e69e7551e45b06cd
#+applyuidgid-caps.2916827d22d53b40674079dd28c0fbd0044fafb7af8cc7db84cd582a1e420dbd
-#+ccx-utils.fe7039538de6ab46024867474edbb6b9a0d4e9ff8575ff0464bed4fe65a2f4ce
+#+ccx-utils.03320cb6f512de325611c0af488f96433fb29ca1c4a7c71454da478b48cf607e
#+user-env.2653c8a3c2d92c1f44d82abeb9f6bfe7f5247a4bc6d222ed5feed5940cfd0816
#+strace.e8385cd2fa0e911b5d50599e5868c5a87acc53d169abe64916cf16471220d182
#+mlog.f63e3f9617bf9711d5569d7215cc91aececf0bbcd3ac887e2351b2f501d890c5
@@ -88,9 +88,9 @@
#+squashfs-tools.1b91e9f3f87cc15a2eb60ab5b95325158a49b03c20c1262801491563d93311c6
#+mandoc.24165da5b9553ff75b2b70a43d8e584d7f71ab38aa329769e7425e57790e5712
#+tinyssh.b86b96a90e668bd3500db7bac7652e8654ec0dafd0b6c9486a02682cd31f515a
-#+system-config.aeccec910a72cdff3c219122e3a96b2ba67ed1c3081ce7c669861289c26fbcdd
-#+system-config-rc.9a6eb0c798e9845a841b87bcec008353401c350ea605480ad59565557c4306be
+#+system-config.8737c45209497c38797b425c36c03656771ca1cb5a0b95c2689dc4604a8b70a9
+#+system-config-rc.421e391717b1f080dbccee0ddfc4c56859eaf4d68e2db93fd93391de25217b39
#+system-config-scripts.bfe6189587fc33d037051c22a904d60dab3f025f4d33de17745f1ea1ecc919bc
-#+system-config-init.49c590f9091ee888fcde9e4f30d44a41ecdf0056a3ccb5435715dcb1791c6caa
+#+system-config-init.0cfce24d4cc9b31192fdfbfb8efb1d5a75305b95242a40103ec98e2b60a137fb
#+system-config-zsh.f00ec445d6e46a6d06e6d33b32483662b1574b30616960465e4b3d0325d53668
#+busybox-modutils.4aef0ae5907514beeff60f30370a78d0e294055c92d2409920150a5ebeedca2a
\ No newline at end of file
diff --git a/variants/root-x86_64/logincaps b/variants/root-x86_64/logincaps
@@ -31,7 +31,7 @@
#+pthbs-banginstall.c568b82ef8544f41d05a56244bb32a93e2f5edd433293243a7037e36f2aa5155
#+execline.4e773f1ba308227aa5402fd63038f6dcbaf3866ca3fa70555a8bec9b81c8e2d2
#+musl-cross-make.19d51dec5328ccacd41d47d7f24e33bac084aebefb839cb3fecb6573577b831a
-#+ccx-utils.fe7039538de6ab46024867474edbb6b9a0d4e9ff8575ff0464bed4fe65a2f4ce
+#+ccx-utils.03320cb6f512de325611c0af488f96433fb29ca1c4a7c71454da478b48cf607e
#@git:409db79b3e7e5fc6b73305471d9bbb6ac5c14036:logincaps
diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config
@@ -59,7 +59,7 @@
#+zsh.355a949de332be38ccdfad4e0d3e4a3d60d4b2f3ee257698a87f25ce811c2008
#+libcgroup.e54a3756ee4d96e48126c3acf4f0d948dece9286359872813bd6f23104c67886
#+system-config-scripts.bfe6189587fc33d037051c22a904d60dab3f025f4d33de17745f1ea1ecc919bc
-#+logincaps.ea771b6547cd9c944110fa6eef4226125d533ef1cd30d840cd8f116bfe9acfbf
+#+logincaps.8eecccc5adf986da642a0e803f9dd0c71311059104c342f8f5d6d99223d793ec
#+busybox-modutils.4aef0ae5907514beeff60f30370a78d0e294055c92d2409920150a5ebeedca2a
#@git:055d24bac572481d7dedba7d4ec9df37f620fbfd:system-config
@@ -97,7 +97,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.6eded4e539d7ca13c392da38b9200108bbf2fe3809996d0c7a3796d471797e7a' \
+ 'pthbs_path_containers=/versions/env.823bb53941d6e1e2e6f370cd9865f78fc033d5a34227b8307ac33e95edcdd37d' \
'pthbs_path_mdevd=/versions/env.b72996087d5776ae6cc04527da2721badc870ebacff57bafde63913d7bcfad2a' \
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
@@ -50,7 +50,7 @@
#+s6-portable-utils.215fcbacf399929de5124e7f2b5d6ca4549007ccd2319a874170887bedca9a08
#+s6-linux-init.de74cb1d43a63d9c9e4e2a44ee5a7f9a50deab7776bd2b2bd0c3d67cb44f01c3
#+execline.4e773f1ba308227aa5402fd63038f6dcbaf3866ca3fa70555a8bec9b81c8e2d2
-#+system-config-rc.9a6eb0c798e9845a841b87bcec008353401c350ea605480ad59565557c4306be
+#+system-config-rc.421e391717b1f080dbccee0ddfc4c56859eaf4d68e2db93fd93391de25217b39
# - build script start -
@@ -75,7 +75,7 @@ dest=${pthbs_destdir%/}${prefix}
cd '.'
-s6rcdb=/versions/system-config-rc.9a6eb0c798e9845a841b87bcec008353401c350ea605480ad59565557c4306be/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.421e391717b1f080dbccee0ddfc4c56859eaf4d68e2db93fd93391de25217b39/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
@@ -30,7 +30,7 @@
#+busybox-diffutils.895f7a6bf6d00136038d8bafa91a6fb1e7027ce5a32e1e3b64a9119fe69ef19a
#+s6-rc.e09e2d9c42a1bbc18b406ff114d945db0d3187fd09b703ddd7c28a4d64357ad3
#+fileset.2156fb8cabd628b062bc9fcc2f673d772a25574dfe5c2c2b779ada64fe9d9d08
-#+system-config.aeccec910a72cdff3c219122e3a96b2ba67ed1c3081ce7c669861289c26fbcdd
+#+system-config.8737c45209497c38797b425c36c03656771ca1cb5a0b95c2689dc4604a8b70a9
# - build script start -
@@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix}
cd '.'
-src=/versions/system-config.aeccec910a72cdff3c219122e3a96b2ba67ed1c3081ce7c669861289c26fbcdd/config/s6-rc-source
+src=/versions/system-config.8737c45209497c38797b425c36c03656771ca1cb5a0b95c2689dc4604a8b70a9/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
@@ -65,9 +65,9 @@
#+pthbs-banginstall.c568b82ef8544f41d05a56244bb32a93e2f5edd433293243a7037e36f2aa5155
#+aat.b2df2bfbff48087d5ef34ef39f712038b0d35c0112f04003b12510555fc3a1f2
#+confz.5dfd584a711633259aecac13da60d50f455c7716916c74e04ded1457ae04a071
-#+containers.f44fa4f7f2612721c1bb626790c37827f282127a19953e8c86cae9ef18adb180
+#+containers.2686ccca4e98fdef5f04fa8fab7773de3e9b19edec70d88d9590aa5744ca3e91
#+fileset.2156fb8cabd628b062bc9fcc2f673d772a25574dfe5c2c2b779ada64fe9d9d08
-#+logincaps.ea771b6547cd9c944110fa6eef4226125d533ef1cd30d840cd8f116bfe9acfbf
+#+logincaps.8eecccc5adf986da642a0e803f9dd0c71311059104c342f8f5d6d99223d793ec
#+snaprep.9367398cdf89d51bfb5e6c8cb7ec368b8fa8f18b05c4926b7249f28703977504
#+curl.de666e9e011223f6dbbf0232f52d0e43778c128b6c04e0add9b33602435ea7bb
#+git.2a486b7472935ff9e977ddeb1e6cb7209259cf2f8b67cfe1aacde4e9dd4fde29
@@ -78,7 +78,7 @@
#+iconv.49647ce39c09f8ece8c52eac0d8ae54d752c822ae6cd83b9e53aabe2c3e6a580
#+libcap.8eb713ba6242a6553f60222291d08461b1d83b63aa1aee69e69e7551e45b06cd
#+applyuidgid-caps.2916827d22d53b40674079dd28c0fbd0044fafb7af8cc7db84cd582a1e420dbd
-#+ccx-utils.fe7039538de6ab46024867474edbb6b9a0d4e9ff8575ff0464bed4fe65a2f4ce
+#+ccx-utils.03320cb6f512de325611c0af488f96433fb29ca1c4a7c71454da478b48cf607e
#+user-env.2653c8a3c2d92c1f44d82abeb9f6bfe7f5247a4bc6d222ed5feed5940cfd0816
#+strace.e8385cd2fa0e911b5d50599e5868c5a87acc53d169abe64916cf16471220d182
#+mlog.f63e3f9617bf9711d5569d7215cc91aececf0bbcd3ac887e2351b2f501d890c5
