commit e70b463cf7db4e229c01a0af86c6b0ffa2088dc2
parent a0485f9f371d783e259f368f2ba2de401c63ea2a
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Thu, 24 Apr 2025 16:56:03 +0000
update containers
Diffstat:
15 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/commitlist.sha1 b/commitlist.sha1
@@ -353,7 +353,7 @@ c6aef8098d37a1773439117a5674bfc8662ef62b sources/confz
41d6ee2d6aa33b323eee611013dd4aab6a09fc89 sources/containers
46761773f4cb590dc89b0f80f5e9fe07399279e7 sources/containers
8acdbdd3097a468e0f2e8a6cca3c23f73a673479 sources/containers
-9d4d5eb5ea0c3f8ef9bf69559dbeb01d043d9ac2 sources/containers
+ef22eeba09f7fc64ba96806f416ce44b20fafa1b sources/containers
94422be00da71ff44c8ad1fe3455587c62ca29d3 sources/easyseccomp
02de9565862052afc290b6848b4ebd799d8f9f37 sources/execline
044b623c1ad9e3152b58722c936572f09832ed17 sources/execline
@@ -1745,8 +1745,6 @@ fd31b6cd318194906fc8f6cea582e475c67ec207 sources/libcap
fe5933431ff6448158754e96e8115c4c79a1c540 sources/libcap
fe96617b7142db04c5fbb5f8ce6ca809ad171072 sources/libcap
41039418205b48bda59372fb7c49453852853e8a sources/logincaps
-4c3d6d043f7abc2f9593e647f357199badc2668b sources/logincaps
-66a7ae67b30b5b9d3ac99d1593748e1ec69a054f sources/logincaps
6c9b7c1ca9b96ab366088c4bfc50d1b0e81042eb sources/logincaps
79af0da183f068b99a69107b2764d9c8c3c3eaca sources/logincaps
e4da83dbb7d3fbea2421d5a327780653f8d1b40c sources/logincaps
@@ -2218,7 +2216,6 @@ fe6a7178c290979b822e287014f7c2f93aa0a732 sources/skalibs
ff066bd37e692daadc573fbd3ef622c3f1e8ec6a sources/skalibs
e9d8af262eb5e25536ea9778e3ed57aebb55488c sources/snaprep
0a1466e946de353d1947a4cdb2210b5699c141dd sources/system-config
-f41e8fb1dda464b6f5bf4c1f77c3fadd8593717a sources/system-config
f9d071a4c5870d42d00d0ca496efac527388e6f4 sources/system-config
dc793695cc0632a808af9d4415f3b0cf0f4dfba2 sources/system-config-scripts
1390434aaa6e044fc713547a232f20f2aa17f972 sources/system-config-zsh
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:8acdbdd3097a468e0f2e8a6cca3c23f73a673479:containers
+#@git:ef22eeba09f7fc64ba96806f416ce44b20fafa1b:containers
: ${JOBS:=1}
prefix=/home/ccx/versions/$pthbs_package
diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment
@@ -6,7 +6,7 @@
#+s6-linux-utils.1990b55837ff2c28a81500d80292c6d530c8516347eb896007eb5aed2af6c425
#+zsh.f79a20125b2f520d3719411e6f0895cf4f2e0657565c3fef07b3069436b8960f
#+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a
-#+containers.cfbcd713597eee6df12c41b4584d609afb237a59f74c8515b606a96567b601df
+#+containers.94f8ddfe40499d0ab19d2abdd5292734bd8f1a17f2c1d89601bbab5e1cc2a590
#+xbps.e77402565036595f7c0410b63d0ede43ff75c3a9394c0ba075558b5acb8a35b9
#+zstd.8b11bd81c450d61aa6a44ffd019654c590439df68ebd8987db4cdbbcf182d67c
#+apk-tools.d0d7af182121c66cd5587b51689275557a37562fa1d20b9137b33a97fa12d152
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -1,7 +1,7 @@
-#+system-config.ee6b32bc40b17660c108c0997aae6cb5c344cf541b359728f6b6cbe73e98f1a6
-#+system-config-rc.c423c7e13e980eb1a24b4f882480088c9d5a6b735955b53d9624747a09e72ac3
+#+system-config.d5159b92985d92fc1131a6b5964cdc4b3a5730871bebe9189c70c6bf619b38ca
+#+system-config-rc.da32a26ccaa77c77dd510e6d101ca67732036cc728abe5edee59d8d6f3b6ec92
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.19c6648a0abdaa3c137a8b3d6a9ec0c65696057c21fece97d226e7dd3ebc100f
+#+system-config-init.5b32c82775cafead4b2a8b0cef94534bceb12b3b813611a97953f673b7d287ed
#+system-config-zsh.250277c1fe17ccb13b5efbacd35ecb3b8342e30910cdd709f89475773bb7f309
#+busybox.ee3440974794767b833fd3299226771f170d3f8601cf225cb884f0a513db8ab3
#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b
@@ -25,7 +25,7 @@
#+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2
#+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4
#+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a
-#+containers.cfbcd713597eee6df12c41b4584d609afb237a59f74c8515b606a96567b601df
+#+containers.94f8ddfe40499d0ab19d2abdd5292734bd8f1a17f2c1d89601bbab5e1cc2a590
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+logincaps.04accf875f567934eb11016453454f691d056c66e0dc36a971f98aaaefdbe360
#+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7
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.65f04eed9615803b35e04ed5df85a2dd9f1154b621db543e99e19d38608d885d' \
+ 'pthbs_path_containers=/home/ccx/versions/env.501f27b3e3f0e4d1f21a05a4a451e931b9b1c41cede51fbc719a3a6c10683b6a' \
'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.c423c7e13e980eb1a24b4f882480088c9d5a6b735955b53d9624747a09e72ac3
+#+system-config-rc.da32a26ccaa77c77dd510e6d101ca67732036cc728abe5edee59d8d6f3b6ec92
-s6rcdb=/home/ccx/versions/system-config-rc.c423c7e13e980eb1a24b4f882480088c9d5a6b735955b53d9624747a09e72ac3/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.da32a26ccaa77c77dd510e6d101ca67732036cc728abe5edee59d8d6f3b6ec92/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.ee6b32bc40b17660c108c0997aae6cb5c344cf541b359728f6b6cbe73e98f1a6
+#+system-config.d5159b92985d92fc1131a6b5964cdc4b3a5730871bebe9189c70c6bf619b38ca
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.ee6b32bc40b17660c108c0997aae6cb5c344cf541b359728f6b6cbe73e98f1a6/config/s6-rc-source
+src=/home/ccx/versions/system-config.d5159b92985d92fc1131a6b5964cdc4b3a5730871bebe9189c70c6bf619b38ca/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,7 +20,7 @@
#+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2
#+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4
#+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a
-#+containers.cfbcd713597eee6df12c41b4584d609afb237a59f74c8515b606a96567b601df
+#+containers.94f8ddfe40499d0ab19d2abdd5292734bd8f1a17f2c1d89601bbab5e1cc2a590
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+logincaps.04accf875f567934eb11016453454f691d056c66e0dc36a971f98aaaefdbe360
#+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7
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:8acdbdd3097a468e0f2e8a6cca3c23f73a673479:containers
+#@git:ef22eeba09f7fc64ba96806f416ce44b20fafa1b:containers
: ${JOBS:=1}
prefix=/versions/$pthbs_package
diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment
@@ -6,7 +6,7 @@
#+s6-linux-utils.f7e0654375f11beedafd731ad1dd66c0de8d03452bb8e38bb647cc51cc3adb2e
#+zsh.4ac9e4166454e8d60c15837b7ca4938abe99db029b3fffa11b1cfd54d40ae09b
#+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf
-#+containers.0dcfdbff0435d2bb085a9ce3c981e676c87a98a7ec31348c56119ddef3276a1b
+#+containers.25475ecbb352230a43495f80748bb15ee42d45c810e3fda5f526f92e17033a40
#+xbps.f2dcdfd8accffba33bb4a025e1b3ad227f1a9d9776422455a381cfafaac7d473
#+zstd.a83f72c5953bd6b7afc171528a503710b3144bf9197961833fd27926b0a18137
#+apk-tools.20ad2f2e238d23a5eeac3587f85cbe9763bd717a30fb8eb659badd602a556cbf
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -1,7 +1,7 @@
-#+system-config.ed21aa5b57bb3ecacb54a42f71d7e2aeb88efdc686d1fe8aa423ff9c7c0d7abd
-#+system-config-rc.e4f11157f2f96724facf27a3758b683c1e4dc194701898204757cf7a8effc751
+#+system-config.6f3c9b764b6f1ce7afe99f6e4a32ee0d0b0309232a2ec476243246a2673e2657
+#+system-config-rc.e109f0a0444cce68d16283aba67833e6b79e697f6fd3f83cf220e39be48823e9
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.a13d4e37c22cee312525432eec97ebda1340b1cb7f3e98d311585f9b78a7eb4e
+#+system-config-init.27264f29b07c8a47ad2312133a43dd4139278419ab78d946ef990867dbc529e1
#+system-config-zsh.01286ec545c7035b2e08ded96e40b73f912f33fd7eec44993a1e93e12577dc0f
#+busybox.f4ef3d511c029095beda8d21dd48f7730bec63fb09792ca951402d6620338089
#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465
@@ -25,7 +25,7 @@
#+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571
#+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f
#+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf
-#+containers.0dcfdbff0435d2bb085a9ce3c981e676c87a98a7ec31348c56119ddef3276a1b
+#+containers.25475ecbb352230a43495f80748bb15ee42d45c810e3fda5f526f92e17033a40
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
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.4d78203aa08e381a6d5517781472b0e69674e1ae14ad50b034040e39b3850b85' \
+ 'pthbs_path_containers=/versions/env.bfc0e3a494ea1d085bf36f8c8e2e12976aecf864842d8b9b0ef337012bb08ae1' \
'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.e4f11157f2f96724facf27a3758b683c1e4dc194701898204757cf7a8effc751
+#+system-config-rc.e109f0a0444cce68d16283aba67833e6b79e697f6fd3f83cf220e39be48823e9
-s6rcdb=/versions/system-config-rc.e4f11157f2f96724facf27a3758b683c1e4dc194701898204757cf7a8effc751/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.e109f0a0444cce68d16283aba67833e6b79e697f6fd3f83cf220e39be48823e9/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.ed21aa5b57bb3ecacb54a42f71d7e2aeb88efdc686d1fe8aa423ff9c7c0d7abd
+#+system-config.6f3c9b764b6f1ce7afe99f6e4a32ee0d0b0309232a2ec476243246a2673e2657
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.ed21aa5b57bb3ecacb54a42f71d7e2aeb88efdc686d1fe8aa423ff9c7c0d7abd/config/s6-rc-source
+src=/versions/system-config.6f3c9b764b6f1ce7afe99f6e4a32ee0d0b0309232a2ec476243246a2673e2657/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,7 +20,7 @@
#+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571
#+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f
#+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf
-#+containers.0dcfdbff0435d2bb085a9ce3c981e676c87a98a7ec31348c56119ddef3276a1b
+#+containers.25475ecbb352230a43495f80748bb15ee42d45c810e3fda5f526f92e17033a40
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
