commit 921738411b5278e3da96bf035413fc2c1de7491e
parent c4be887b06510c999eeddbe1af15241c54aef742
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Tue, 3 Jun 2025 22:50:00 +0000
update containers
Diffstat:
15 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/commitlist.sha1 b/commitlist.sha1
@@ -351,6 +351,7 @@ ffe18087faa553747d68ce662e0d4e9e7265fc3f sources/busybox
c5eed37c744c786076a1ec13132ade7ef410ed16 sources/ccx-utils
fae441e25a1ac266742ba6446b37ae56c8e57076 sources/ccx-utils
c6aef8098d37a1773439117a5674bfc8662ef62b sources/confz
+1966e9f0637bd9bddc9b6cf3d0c532ea5168d1b4 sources/containers
3955e658562cef8e6012c1936a6c79c6b6628773 sources/containers
41d6ee2d6aa33b323eee611013dd4aab6a09fc89 sources/containers
8500d11e1364b168550607bb0d3f3fa53406f42d sources/containers
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.0f876e2e86efb0645ccd18192741eed44985d3e770c31f19b5e31503ca4d77f8
-#@git:8500d11e1364b168550607bb0d3f3fa53406f42d:containers
+#@git:1966e9f0637bd9bddc9b6cf3d0c532ea5168d1b4: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.ba7fdeba174c2496cb69013111982bd817ea5c877fcd8d5ef7f02fa30cc45e26
+#+containers.6ba9cf8409fc926f189ea5ffcbc460a09a68546a4f799e0f04dd832157dc25a7
#+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.ba7fdeba174c2496cb69013111982bd817ea5c877fcd8d5ef7f02fa30cc45e26
+#+containers.6ba9cf8409fc926f189ea5ffcbc460a09a68546a4f799e0f04dd832157dc25a7
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+logincaps.b6448feda8aa2e43cbf6e305de8ba71a0416851b98b63bd567c435b2c251ea07
#+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7
@@ -38,8 +38,8 @@
#+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8
#+strace.53097be3dbf67dbf52aa675a59980a7d965fd8cdf965ef3005035e70fc7e4103
#+mlog.a63c78a5967e11f6fcac02b7eced93c023b82172f901e0f3929fad33b591f676
-#+system-config.68da3e5b309255021806796345e5827053e3cc966cb032037fe05b25a5e9a921
-#+system-config-rc.8e21d7f7dd5ee270e1aca9ec786e9cd04aae4cf51c551dc15c2bff85df757921
+#+system-config.cc875c88486fe8bbe1424343c702edf4a0cb1af8c5257d91bbf526662afdfd27
+#+system-config-rc.97caff57415b36b76819c62e8339578d3a1c17a955803a34051500f8869b4222
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.c814a0f2790cd47c367bf52ec0740d8b19a6b23f3c35985c1445e55cf3c35d43
+#+system-config-init.57f87b18f1d1d82f62262534346a9249dda67adb3d1ceb9056f293078db00eb0
#+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.25b36832fa5ae5421e0280410bc4ac0963befc1ed47df9d36b764f6c534b91eb' \
+ 'pthbs_path_containers=/home/ccx/versions/env.04c5f6d712cf7e3d935b0a06a8b5c7b4c0002c4181167382d650a2458e97260f' \
'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.8e21d7f7dd5ee270e1aca9ec786e9cd04aae4cf51c551dc15c2bff85df757921
+#+system-config-rc.97caff57415b36b76819c62e8339578d3a1c17a955803a34051500f8869b4222
-s6rcdb=/home/ccx/versions/system-config-rc.8e21d7f7dd5ee270e1aca9ec786e9cd04aae4cf51c551dc15c2bff85df757921/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.97caff57415b36b76819c62e8339578d3a1c17a955803a34051500f8869b4222/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.68da3e5b309255021806796345e5827053e3cc966cb032037fe05b25a5e9a921
+#+system-config.cc875c88486fe8bbe1424343c702edf4a0cb1af8c5257d91bbf526662afdfd27
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.68da3e5b309255021806796345e5827053e3cc966cb032037fe05b25a5e9a921/config/s6-rc-source
+src=/home/ccx/versions/system-config.cc875c88486fe8bbe1424343c702edf4a0cb1af8c5257d91bbf526662afdfd27/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.ba7fdeba174c2496cb69013111982bd817ea5c877fcd8d5ef7f02fa30cc45e26
+#+containers.6ba9cf8409fc926f189ea5ffcbc460a09a68546a4f799e0f04dd832157dc25a7
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+logincaps.b6448feda8aa2e43cbf6e305de8ba71a0416851b98b63bd567c435b2c251ea07
#+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.5f40ff6528dcff01a8f533c745347b6e6035838f63cd8cd6e5cf39989d2c66b2
-#@git:8500d11e1364b168550607bb0d3f3fa53406f42d:containers
+#@git:1966e9f0637bd9bddc9b6cf3d0c532ea5168d1b4: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.4ce9f4577698abe2aef5658132cfd32b9f7737d421773aac4cbe6830f37d6880
+#+containers.0b63f63afe374541adfc1db2deeff2897be0d5445301fd7bcbb9e3fde2ed7ac2
#+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.4ce9f4577698abe2aef5658132cfd32b9f7737d421773aac4cbe6830f37d6880
+#+containers.0b63f63afe374541adfc1db2deeff2897be0d5445301fd7bcbb9e3fde2ed7ac2
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.99361726e6ba3043eeeb1aaca8caa7c86b771726c8f55c08810bd745a19ba474
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
@@ -38,8 +38,8 @@
#+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca
#+strace.ce1707d2cf1dfcd965827af80a18c6b97ca20b563b8967be8297322e8adf9296
#+mlog.3a2fb37a92813d4c8700d3f9eb95753b0f2b72d5de13f03ba2f52fc0732ac487
-#+system-config.4b81bacb22f199a50cc68e98e9e6bdaae48dd25da7b77586eb6cac51ed44ec50
-#+system-config-rc.c463cf3b758b501bce93687f21fbec7133eabd54178fc143d9d0b578e475b021
+#+system-config.9d31ecd9b35a017d3a5dd76aca30dd2ef5452fca1fc0212059c66d6468668a67
+#+system-config-rc.875cfa04aee84abc30fe9a38ec8039227f48924efad492937d30d42463fe85c4
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.ea3b1a8c2185b62a31886632371021e4fc6006c5f9ccf203c894d6fe846f51d0
+#+system-config-init.a8ded0edba59b789f318e98a1c0c602b734a9083a2bf3bb350ed16fd65a3a711
#+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.136a23793431223f7868ea58862738a91672908167bdadaf97830e7c9e764893' \
+ 'pthbs_path_containers=/versions/env.717f0788ab623bcc303aa53afb1d321d9e52b1ffd4afe6186b1d5063c5194406' \
'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.c463cf3b758b501bce93687f21fbec7133eabd54178fc143d9d0b578e475b021
+#+system-config-rc.875cfa04aee84abc30fe9a38ec8039227f48924efad492937d30d42463fe85c4
-s6rcdb=/versions/system-config-rc.c463cf3b758b501bce93687f21fbec7133eabd54178fc143d9d0b578e475b021/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.875cfa04aee84abc30fe9a38ec8039227f48924efad492937d30d42463fe85c4/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.4b81bacb22f199a50cc68e98e9e6bdaae48dd25da7b77586eb6cac51ed44ec50
+#+system-config.9d31ecd9b35a017d3a5dd76aca30dd2ef5452fca1fc0212059c66d6468668a67
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.4b81bacb22f199a50cc68e98e9e6bdaae48dd25da7b77586eb6cac51ed44ec50/config/s6-rc-source
+src=/versions/system-config.9d31ecd9b35a017d3a5dd76aca30dd2ef5452fca1fc0212059c66d6468668a67/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.4ce9f4577698abe2aef5658132cfd32b9f7737d421773aac4cbe6830f37d6880
+#+containers.0b63f63afe374541adfc1db2deeff2897be0d5445301fd7bcbb9e3fde2ed7ac2
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.99361726e6ba3043eeeb1aaca8caa7c86b771726c8f55c08810bd745a19ba474
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
