commit b8dcda3da768e0f60bc804986a017ef78349f676
parent 54a2c22a05d0894069361b8acdde86322fad4825
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Tue, 15 Apr 2025 02:45:19 +0000
update containers
Diffstat:
15 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/commitlist.sha1 b/commitlist.sha1
@@ -353,6 +353,7 @@ c6aef8098d37a1773439117a5674bfc8662ef62b sources/confz
3b0d0d748309e2c5a2057f5374cb43e8a00647aa sources/containers
41d6ee2d6aa33b323eee611013dd4aab6a09fc89 sources/containers
46761773f4cb590dc89b0f80f5e9fe07399279e7 sources/containers
+4de5ab2abd134fc298b3f990757c11144e391527 sources/containers
9d4d5eb5ea0c3f8ef9bf69559dbeb01d043d9ac2 sources/containers
94422be00da71ff44c8ad1fe3455587c62ca29d3 sources/easyseccomp
02de9565862052afc290b6848b4ebd799d8f9f37 sources/execline
@@ -1744,7 +1745,6 @@ fd1fffbfd4053059e11ea234640d50c190bd93a7 sources/libcap
fd31b6cd318194906fc8f6cea582e475c67ec207 sources/libcap
fe5933431ff6448158754e96e8115c4c79a1c540 sources/libcap
fe96617b7142db04c5fbb5f8ce6ca809ad171072 sources/libcap
-1051cb5d5ab565777f3dd9cef3b3b8d4219a4f39 sources/logincaps
41039418205b48bda59372fb7c49453852853e8a sources/logincaps
4c3d6d043f7abc2f9593e647f357199badc2668b sources/logincaps
66a7ae67b30b5b9d3ac99d1593748e1ec69a054f sources/logincaps
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:3b0d0d748309e2c5a2057f5374cb43e8a00647aa:containers
+#@git:4de5ab2abd134fc298b3f990757c11144e391527: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.24571a2ed64695863d34cdb9b3f7387dedab57d6f19a19bb2d7b9d5b7242d945
+#+containers.2fa975bfc30e1e2c97753d8e9062ea4322e5f3651ac4bec1aad9de8b68ec890c
#+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.92d21e41a7533ed9798172bc6a7575f4c7440b8767300c33d8bc956987a8c59c
-#+system-config-rc.0e8e895a0ee46915d3be09a3f8de641464f6ea50a75c91c393a07227f3641751
+#+system-config.5bd7973e7a8300588c1350cc67894c8316ff393d25e43274385f634ff04d7c8b
+#+system-config-rc.6b51d20e6af81a3e0c21524d4e622e00839582be46ee2de96547bcdcd1d3ae52
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.1e0eb4c581d25a96afee74d90454f394c3ccec51439d3fbc558216e0d4b2b713
+#+system-config-init.ad92ba4d28149d39d825f5fa963b63a0db267b847d4e3ef55659fda26906c1f6
#+system-config-zsh.250277c1fe17ccb13b5efbacd35ecb3b8342e30910cdd709f89475773bb7f309
#+busybox.ee3440974794767b833fd3299226771f170d3f8601cf225cb884f0a513db8ab3
#+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b
@@ -25,7 +25,7 @@
#+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2
#+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4
#+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a
-#+containers.24571a2ed64695863d34cdb9b3f7387dedab57d6f19a19bb2d7b9d5b7242d945
+#+containers.2fa975bfc30e1e2c97753d8e9062ea4322e5f3651ac4bec1aad9de8b68ec890c
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+logincaps.fc0cb6008135dafb32923c0b01d8529e8edb4610a8635d0d50aa9461e5c24ea1
#+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.7461af696cf4c320fc9a0d1d797ecac3dce0e0be6111e8a34bc079280716547c' \
+ 'pthbs_path_containers=/home/ccx/versions/env.735f161e3495d19efeb661c019b0961784f03ebdbe71918da41c07128ff615a2' \
'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.0e8e895a0ee46915d3be09a3f8de641464f6ea50a75c91c393a07227f3641751
+#+system-config-rc.6b51d20e6af81a3e0c21524d4e622e00839582be46ee2de96547bcdcd1d3ae52
-s6rcdb=/home/ccx/versions/system-config-rc.0e8e895a0ee46915d3be09a3f8de641464f6ea50a75c91c393a07227f3641751/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.6b51d20e6af81a3e0c21524d4e622e00839582be46ee2de96547bcdcd1d3ae52/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.92d21e41a7533ed9798172bc6a7575f4c7440b8767300c33d8bc956987a8c59c
+#+system-config.5bd7973e7a8300588c1350cc67894c8316ff393d25e43274385f634ff04d7c8b
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.92d21e41a7533ed9798172bc6a7575f4c7440b8767300c33d8bc956987a8c59c/config/s6-rc-source
+src=/home/ccx/versions/system-config.5bd7973e7a8300588c1350cc67894c8316ff393d25e43274385f634ff04d7c8b/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.24571a2ed64695863d34cdb9b3f7387dedab57d6f19a19bb2d7b9d5b7242d945
+#+containers.2fa975bfc30e1e2c97753d8e9062ea4322e5f3651ac4bec1aad9de8b68ec890c
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+logincaps.fc0cb6008135dafb32923c0b01d8529e8edb4610a8635d0d50aa9461e5c24ea1
#+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:3b0d0d748309e2c5a2057f5374cb43e8a00647aa:containers
+#@git:4de5ab2abd134fc298b3f990757c11144e391527: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.81f7b1aed1b5f8cd999ff2071678b2f7f10dba18757467855a1eccce5d8a93ab
+#+containers.2f955d7d91ecc1910ae4a1c9f8af4e7130e4fdc5be6b06f662bae3af506195a5
#+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.7e44a851a5ae4dda38d9739b406b9cd7759d90da8aa299170161672b6c771233
-#+system-config-rc.668d1e775e09f73c43aa89ea5802a23d94e6ff368e617ab9ccdcccbf5b134a54
+#+system-config.1bf43be6cc1efe8b48c79f187b410c65785ea4b5b9802fb891e1c02b8dedd191
+#+system-config-rc.84efb39c55429d9ed0f7427fcf138fa78bac77f12ef0cc95b197873d7d587a4d
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.32594d14b09c1c0b174313d3186024e26ea8958e23f71db29a7aae48abef8910
+#+system-config-init.79a03e23699b4be1253460586ca2cac2806648b7c8bb81b6bd795e2845e21297
#+system-config-zsh.01286ec545c7035b2e08ded96e40b73f912f33fd7eec44993a1e93e12577dc0f
#+busybox.f4ef3d511c029095beda8d21dd48f7730bec63fb09792ca951402d6620338089
#+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465
@@ -25,7 +25,7 @@
#+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571
#+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f
#+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf
-#+containers.81f7b1aed1b5f8cd999ff2071678b2f7f10dba18757467855a1eccce5d8a93ab
+#+containers.2f955d7d91ecc1910ae4a1c9f8af4e7130e4fdc5be6b06f662bae3af506195a5
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.bf4e51aada302ccf2633e331c6451b44fa8a63c1906958cd7b78b045a64a33da
#+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.0ddf5a745f8e276d9c4e9637ec6acc567a6c5ad313e333336286aeb3b8c13ab9' \
+ 'pthbs_path_containers=/versions/env.4820e1d8643f1dea5463cceeebfb08eb9a91b5acdc2cee1a7d8b1042b4db6aac' \
'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.668d1e775e09f73c43aa89ea5802a23d94e6ff368e617ab9ccdcccbf5b134a54
+#+system-config-rc.84efb39c55429d9ed0f7427fcf138fa78bac77f12ef0cc95b197873d7d587a4d
-s6rcdb=/versions/system-config-rc.668d1e775e09f73c43aa89ea5802a23d94e6ff368e617ab9ccdcccbf5b134a54/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.84efb39c55429d9ed0f7427fcf138fa78bac77f12ef0cc95b197873d7d587a4d/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.7e44a851a5ae4dda38d9739b406b9cd7759d90da8aa299170161672b6c771233
+#+system-config.1bf43be6cc1efe8b48c79f187b410c65785ea4b5b9802fb891e1c02b8dedd191
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.7e44a851a5ae4dda38d9739b406b9cd7759d90da8aa299170161672b6c771233/config/s6-rc-source
+src=/versions/system-config.1bf43be6cc1efe8b48c79f187b410c65785ea4b5b9802fb891e1c02b8dedd191/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.81f7b1aed1b5f8cd999ff2071678b2f7f10dba18757467855a1eccce5d8a93ab
+#+containers.2f955d7d91ecc1910ae4a1c9f8af4e7130e4fdc5be6b06f662bae3af506195a5
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.bf4e51aada302ccf2633e331c6451b44fa8a63c1906958cd7b78b045a64a33da
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
