commit e32d7fa60f8292eddbc0a690127b0b89f208c6ee
parent 735290cbe34c4db06af7cd227ccbb45eb5b474ee
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Sat, 17 May 2025 18:34:59 +0000
update containers
Diffstat:
15 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/commitlist.sha1 b/commitlist.sha1
@@ -351,10 +351,10 @@ ffe18087faa553747d68ce662e0d4e9e7265fc3f sources/busybox
c5eed37c744c786076a1ec13132ade7ef410ed16 sources/ccx-utils
fae441e25a1ac266742ba6446b37ae56c8e57076 sources/ccx-utils
c6aef8098d37a1773439117a5674bfc8662ef62b sources/confz
+23a72ae5f0c1b606310a1d580afb737a832bcc30 sources/containers
3955e658562cef8e6012c1936a6c79c6b6628773 sources/containers
41d6ee2d6aa33b323eee611013dd4aab6a09fc89 sources/containers
5bfb70641b22c126b5240dc71090b2feaeab09e2 sources/containers
-e7e83520b4e197fdc823efc7efcbfdbbaf3a8c06 sources/containers
e8dfe8dcb4396ac0f12f0d0017f9836fa113e3a6 sources/containers
94422be00da71ff44c8ad1fe3455587c62ca29d3 sources/easyseccomp
02de9565862052afc290b6848b4ebd799d8f9f37 sources/execline
diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers
@@ -7,7 +7,7 @@
#+apk-tools.e556b101ee41fc88c653ea4a9c405942ce921c65d378def15c77fd19aec3beaf
#+xbps.a8e42fa55614db5c7453b7513e917b19070a71abb801ef22cff7ef004e13241b
#+container-bin-image.dd44703955b3f5a5637663ce7bb17d6819d2484aaafe5e5fa0e486b035e60dc6
-#@git:5bfb70641b22c126b5240dc71090b2feaeab09e2:containers
+#@git:23a72ae5f0c1b606310a1d580afb737a832bcc30: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
@@ -7,7 +7,7 @@
#+s6-linux-utils.1990b55837ff2c28a81500d80292c6d530c8516347eb896007eb5aed2af6c425
#+zsh.f79a20125b2f520d3719411e6f0895cf4f2e0657565c3fef07b3069436b8960f
#+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a
-#+containers.e805995fa664fdda206d90cb5efc1b34a32107b0bf7067404cc608388a427aa9
+#+containers.c3668446cfb51cd0c2585c58a6b9c6904e10b735afd623e1c11c10d3e7947fc8
#+xbps.a8e42fa55614db5c7453b7513e917b19070a71abb801ef22cff7ef004e13241b
#+zstd.8b11bd81c450d61aa6a44ffd019654c590439df68ebd8987db4cdbbcf182d67c
#+apk-tools.e556b101ee41fc88c653ea4a9c405942ce921c65d378def15c77fd19aec3beaf
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -21,7 +21,7 @@
#+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2
#+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4
#+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a
-#+containers.e805995fa664fdda206d90cb5efc1b34a32107b0bf7067404cc608388a427aa9
+#+containers.c3668446cfb51cd0c2585c58a6b9c6904e10b735afd623e1c11c10d3e7947fc8
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+logincaps.04accf875f567934eb11016453454f691d056c66e0dc36a971f98aaaefdbe360
#+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7
@@ -37,8 +37,8 @@
#+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114
#+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8
#+strace.53097be3dbf67dbf52aa675a59980a7d965fd8cdf965ef3005035e70fc7e4103
-#+system-config.501b5b1c897d0f08fc0f30c598c28b71b54044411e4d8be8ff407405ff5d398f
-#+system-config-rc.32e68dac04cffd5cdfe9a4be8e63e8076713478e94495115a613b33a97b31a25
+#+system-config.dd7d321cc61c6a01a4fa8df74cc09a9b05c47b9640e9b1ebf94d18511d63a734
+#+system-config-rc.09fef2cebaa30dc59b6052fdb7404e56dd6e8c6108305842eb6ac11f21b24ccc
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.4f5034138018e0b343b31540c32eacd68ed7be05e99ebb4f01bf50fb6ea3007d
+#+system-config-init.636835e05bdb9fd100d5bbad9e25f95ffc7e87aa05fc670898bec25c00375a4f
#+system-config-zsh.250277c1fe17ccb13b5efbacd35ecb3b8342e30910cdd709f89475773bb7f309
\ No newline at end of file
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.4dec6ff6ffe0ae994e01b48ef88b9657c15c0e19dc7ed2a1cac95d984747534e' \
+ 'pthbs_path_containers=/home/ccx/versions/env.ff4dab8eb3a1312911b474c908d70bf687f7d4e715dec8c898504e691e8dec8e' \
'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.32e68dac04cffd5cdfe9a4be8e63e8076713478e94495115a613b33a97b31a25
+#+system-config-rc.09fef2cebaa30dc59b6052fdb7404e56dd6e8c6108305842eb6ac11f21b24ccc
-s6rcdb=/home/ccx/versions/system-config-rc.32e68dac04cffd5cdfe9a4be8e63e8076713478e94495115a613b33a97b31a25/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.09fef2cebaa30dc59b6052fdb7404e56dd6e8c6108305842eb6ac11f21b24ccc/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.501b5b1c897d0f08fc0f30c598c28b71b54044411e4d8be8ff407405ff5d398f
+#+system-config.dd7d321cc61c6a01a4fa8df74cc09a9b05c47b9640e9b1ebf94d18511d63a734
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.501b5b1c897d0f08fc0f30c598c28b71b54044411e4d8be8ff407405ff5d398f/config/s6-rc-source
+src=/home/ccx/versions/system-config.dd7d321cc61c6a01a4fa8df74cc09a9b05c47b9640e9b1ebf94d18511d63a734/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,7 +21,7 @@
#+pthbs-banginstall.7ddbf08ba8b1298841fad793d4ed7ba4979b9346155195489fc5e492ed5f0fe2
#+aat.0698d0082830b7f8bcf3840f3f8c25382ef2d9f174dd6d5407c5e2132d1f16e4
#+confz.9733b0a5d832c848bfeeb2dc737c05a77163fc4d8aca4156a18f2074f2902b8a
-#+containers.e805995fa664fdda206d90cb5efc1b34a32107b0bf7067404cc608388a427aa9
+#+containers.c3668446cfb51cd0c2585c58a6b9c6904e10b735afd623e1c11c10d3e7947fc8
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+logincaps.04accf875f567934eb11016453454f691d056c66e0dc36a971f98aaaefdbe360
#+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7
diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers
@@ -7,7 +7,7 @@
#+apk-tools.c38f943bab7fe83e4c5e2c1029b587565e70bcc76cf96e55232e29a13d42b5fa
#+xbps.f860fd980433f32edb85953f72c3d3f50872ad6f9cfb4e7a0cfa5b9529a3ae6d
#+container-bin-image.c90a5287c1f288e461b632f9ad1585a7f0493000ee78bf5715c740c3f3a2960b
-#@git:5bfb70641b22c126b5240dc71090b2feaeab09e2:containers
+#@git:23a72ae5f0c1b606310a1d580afb737a832bcc30:containers
: ${JOBS:=1}
prefix=/versions/$pthbs_package
diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment
@@ -7,7 +7,7 @@
#+s6-linux-utils.f7e0654375f11beedafd731ad1dd66c0de8d03452bb8e38bb647cc51cc3adb2e
#+zsh.4ac9e4166454e8d60c15837b7ca4938abe99db029b3fffa11b1cfd54d40ae09b
#+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf
-#+containers.0ed86f6285d25f5ad710e74bf2114e16aa2eed16e74ed86b8b3ee24de165f290
+#+containers.40d9c69fc72f094bac6670c3d713b0469ba69dc747876db14c0db982c140c3b2
#+xbps.f860fd980433f32edb85953f72c3d3f50872ad6f9cfb4e7a0cfa5b9529a3ae6d
#+zstd.a83f72c5953bd6b7afc171528a503710b3144bf9197961833fd27926b0a18137
#+apk-tools.c38f943bab7fe83e4c5e2c1029b587565e70bcc76cf96e55232e29a13d42b5fa
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -21,7 +21,7 @@
#+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571
#+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f
#+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf
-#+containers.0ed86f6285d25f5ad710e74bf2114e16aa2eed16e74ed86b8b3ee24de165f290
+#+containers.40d9c69fc72f094bac6670c3d713b0469ba69dc747876db14c0db982c140c3b2
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
@@ -37,8 +37,8 @@
#+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac
#+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca
#+strace.ce1707d2cf1dfcd965827af80a18c6b97ca20b563b8967be8297322e8adf9296
-#+system-config.0c38615a087b2a1b4967cc8e34b3da0481b882cdcdf299c6b2f241437f961655
-#+system-config-rc.e1cac4d65476a636889b9a9d6dcdf0f9d58d233d28e3c9832b27bfb9d2893569
+#+system-config.a674e9c04e64cac0582b73c0621dc7a611156fa9302fb30437b2c4d5ce8f6047
+#+system-config-rc.7b2f5d8fd497a608c588e56d66bb1f2b64b736fa6aca452efc20415fef91a585
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.9efb9c03e1d74a2bab15be0ef5e986c026951ca66575253ce7f07555d543ca4a
+#+system-config-init.e4bfa2a8750e38dbd91da769d334ec7a76468d2c46b58d02e20adae5cfa9fbd1
#+system-config-zsh.01286ec545c7035b2e08ded96e40b73f912f33fd7eec44993a1e93e12577dc0f
\ No newline at end of file
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.89e8273b5be117ac96d2f3ef437bd6396a88954495adbac9d563f0d639a1b200' \
+ 'pthbs_path_containers=/versions/env.fa4d2b84f1399428b437394a94d98ba5a1581075d4fd1106125830631453347c' \
'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.e1cac4d65476a636889b9a9d6dcdf0f9d58d233d28e3c9832b27bfb9d2893569
+#+system-config-rc.7b2f5d8fd497a608c588e56d66bb1f2b64b736fa6aca452efc20415fef91a585
-s6rcdb=/versions/system-config-rc.e1cac4d65476a636889b9a9d6dcdf0f9d58d233d28e3c9832b27bfb9d2893569/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.7b2f5d8fd497a608c588e56d66bb1f2b64b736fa6aca452efc20415fef91a585/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.0c38615a087b2a1b4967cc8e34b3da0481b882cdcdf299c6b2f241437f961655
+#+system-config.a674e9c04e64cac0582b73c0621dc7a611156fa9302fb30437b2c4d5ce8f6047
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.0c38615a087b2a1b4967cc8e34b3da0481b882cdcdf299c6b2f241437f961655/config/s6-rc-source
+src=/versions/system-config.a674e9c04e64cac0582b73c0621dc7a611156fa9302fb30437b2c4d5ce8f6047/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,7 +21,7 @@
#+pthbs-banginstall.30ed98ef3fedfb6b25b3f58c27e845f123a22a756b37a5cd75764315bba23571
#+aat.9432aa485263e75ca3e43d6511c561a9cd328c417ebe26b890ed4a8061fee06f
#+confz.2c5f5b9bb69976bb57be5de332d8e7a2cf69c0b41c006ee7e6912abe8e8a0edf
-#+containers.0ed86f6285d25f5ad710e74bf2114e16aa2eed16e74ed86b8b3ee24de165f290
+#+containers.40d9c69fc72f094bac6670c3d713b0469ba69dc747876db14c0db982c140c3b2
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
