commit 905f221663395471480ba699df66894475f17dd4
parent cddbf27fc49978ee12ffe2554cbe576cb3e9b9b9
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Tue, 6 May 2025 11:57:19 +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
+066a430ec537775a1df9b30805dce551d78258c0 sources/containers
3955e658562cef8e6012c1936a6c79c6b6628773 sources/containers
41d6ee2d6aa33b323eee611013dd4aab6a09fc89 sources/containers
c33438f227efa4e8541c3152b684e3925c944f71 sources/containers
diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers
@@ -7,7 +7,7 @@
#+apk-tools.69a8c172d8dc6f60957469c555cfa3627fef38bb076dde5f758fd64854ecb275
#+xbps.0c1ece8bbd380938c5c0744cf9d37f2a2f402dd2f16dfe9b9ec891a5c84b9646
#+container-bin-image.2b4493f2372f8c96e0082ac9abdc8e2f1c9c7150ef6a6fd4ec56146a27ff0538
-#@git:c33438f227efa4e8541c3152b684e3925c944f71:containers
+#@git:066a430ec537775a1df9b30805dce551d78258c0: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.3f8cb6d5940d12d2bcebcc51b9bf76eb1e85fa0c6bc2655c788d62b871a64ac2
+#+containers.294d8f6bdb259957a7690bfac0af2ec7d19218848286bf3bbc88ad276b356cec
#+xbps.0c1ece8bbd380938c5c0744cf9d37f2a2f402dd2f16dfe9b9ec891a5c84b9646
#+zstd.8b11bd81c450d61aa6a44ffd019654c590439df68ebd8987db4cdbbcf182d67c
#+apk-tools.69a8c172d8dc6f60957469c555cfa3627fef38bb076dde5f758fd64854ecb275
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.3f8cb6d5940d12d2bcebcc51b9bf76eb1e85fa0c6bc2655c788d62b871a64ac2
+#+containers.294d8f6bdb259957a7690bfac0af2ec7d19218848286bf3bbc88ad276b356cec
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+logincaps.04accf875f567934eb11016453454f691d056c66e0dc36a971f98aaaefdbe360
#+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7
@@ -37,8 +37,8 @@
#+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114
#+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8
#+strace.53097be3dbf67dbf52aa675a59980a7d965fd8cdf965ef3005035e70fc7e4103
-#+system-config.b838949b274572e3dcea434b9ecbf322e9705d01d943fd1bc2d8fee16213961e
-#+system-config-rc.d9909249e1d3c50e4c4081b4ee5e04fbd90ac0229debce5221cb16ce6d7d592b
+#+system-config.eba2b26495741d474572ee44c6dfce73b6c906612b115b0310604dfcf5bc796e
+#+system-config-rc.05867f4260a1f1a02bade77965cd12052e856428ffbf3b04bf7c83f95fc28bbb
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.928f03ce6118a86827e3ff190e552b0a6f9f22de1d90349c60e22bdc7ed89ab2
+#+system-config-init.0a100a43105920a28d908c00fcdf512a19df08b36663f62800043639bb4865dd
#+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.a2fd5275a2cfa76b02480ee3a498a40b340146e21ea50921ad69fd845e5c6fcb' \
+ 'pthbs_path_containers=/home/ccx/versions/env.e606480c4b55f2cf58d1161b66ab9dbb7085eaa75bace54862800c5c12a37308' \
'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.d9909249e1d3c50e4c4081b4ee5e04fbd90ac0229debce5221cb16ce6d7d592b
+#+system-config-rc.05867f4260a1f1a02bade77965cd12052e856428ffbf3b04bf7c83f95fc28bbb
-s6rcdb=/home/ccx/versions/system-config-rc.d9909249e1d3c50e4c4081b4ee5e04fbd90ac0229debce5221cb16ce6d7d592b/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.05867f4260a1f1a02bade77965cd12052e856428ffbf3b04bf7c83f95fc28bbb/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.b838949b274572e3dcea434b9ecbf322e9705d01d943fd1bc2d8fee16213961e
+#+system-config.eba2b26495741d474572ee44c6dfce73b6c906612b115b0310604dfcf5bc796e
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.b838949b274572e3dcea434b9ecbf322e9705d01d943fd1bc2d8fee16213961e/config/s6-rc-source
+src=/home/ccx/versions/system-config.eba2b26495741d474572ee44c6dfce73b6c906612b115b0310604dfcf5bc796e/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.3f8cb6d5940d12d2bcebcc51b9bf76eb1e85fa0c6bc2655c788d62b871a64ac2
+#+containers.294d8f6bdb259957a7690bfac0af2ec7d19218848286bf3bbc88ad276b356cec
#+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.f56b624a4ea26318bf9117754fb5e0c564f7f466fedde43e1c45e86278dc2552
#+xbps.e82f8c85f25413cdfa1e23926d635ec0d5aa6059a953750d63de49eeacf3c672
#+container-bin-image.0090f29a950bc5f19ae6b975292940848fe8e27a5b5e394d0e89d2ad704e4f6b
-#@git:c33438f227efa4e8541c3152b684e3925c944f71:containers
+#@git:066a430ec537775a1df9b30805dce551d78258c0: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.4e5a74aaf62f2601ff320f61e4b13ac3c694666c459b10edc656922d2e08bf4e
+#+containers.7ba1b40c117de79f020ab32f3f11a33b3d447ed5d2a54d8b5c5c1ad8e79bdd71
#+xbps.e82f8c85f25413cdfa1e23926d635ec0d5aa6059a953750d63de49eeacf3c672
#+zstd.a83f72c5953bd6b7afc171528a503710b3144bf9197961833fd27926b0a18137
#+apk-tools.f56b624a4ea26318bf9117754fb5e0c564f7f466fedde43e1c45e86278dc2552
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.4e5a74aaf62f2601ff320f61e4b13ac3c694666c459b10edc656922d2e08bf4e
+#+containers.7ba1b40c117de79f020ab32f3f11a33b3d447ed5d2a54d8b5c5c1ad8e79bdd71
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
@@ -37,8 +37,8 @@
#+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac
#+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca
#+strace.ce1707d2cf1dfcd965827af80a18c6b97ca20b563b8967be8297322e8adf9296
-#+system-config.42e42d32cf87f6a18a77d8cb569d3b94c292511388ec0b7a291a09f0afb6b965
-#+system-config-rc.339a5fcf1634be893b8dc26578ac97aee999ad18743c621251b2883f0bf14f2f
+#+system-config.04ee3598969545f7489352578b219823e819f6e71026bff2aa18841cf6bbc789
+#+system-config-rc.4973c3015e4dcf7ec9a14cb1a22d0b649703c3c87e1e3428aad1485e3b6c3fff
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.dbb135791e6543bb80e9fb548d0905c075d9d3ba9485c5dceab8a4ddc6f70eb8
+#+system-config-init.74757635ef25811c0186772cc477dda99e0b094af8e4e01b424ac4753fc2a3a2
#+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.81ecb1f92c584a6df8ec6754080bf4b75175dc78081c16ae940fb65040f09b83' \
+ 'pthbs_path_containers=/versions/env.0727e78bb3c5b14ffd4659941e9a75a677a6b940a983fb731c8c7a18773d5fed' \
'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.339a5fcf1634be893b8dc26578ac97aee999ad18743c621251b2883f0bf14f2f
+#+system-config-rc.4973c3015e4dcf7ec9a14cb1a22d0b649703c3c87e1e3428aad1485e3b6c3fff
-s6rcdb=/versions/system-config-rc.339a5fcf1634be893b8dc26578ac97aee999ad18743c621251b2883f0bf14f2f/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.4973c3015e4dcf7ec9a14cb1a22d0b649703c3c87e1e3428aad1485e3b6c3fff/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.42e42d32cf87f6a18a77d8cb569d3b94c292511388ec0b7a291a09f0afb6b965
+#+system-config.04ee3598969545f7489352578b219823e819f6e71026bff2aa18841cf6bbc789
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.42e42d32cf87f6a18a77d8cb569d3b94c292511388ec0b7a291a09f0afb6b965/config/s6-rc-source
+src=/versions/system-config.04ee3598969545f7489352578b219823e819f6e71026bff2aa18841cf6bbc789/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.4e5a74aaf62f2601ff320f61e4b13ac3c694666c459b10edc656922d2e08bf4e
+#+containers.7ba1b40c117de79f020ab32f3f11a33b3d447ed5d2a54d8b5c5c1ad8e79bdd71
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
