commit a5e2281acfc43a80aa00ed5ad28c22fc4956b22c
parent 817da06a42e6b6c0b790d41bb8ed45b6d901be89
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Tue, 6 May 2025 12:45:35 +0000
update containers
Diffstat:
15 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/commitlist.sha1 b/commitlist.sha1
@@ -354,7 +354,7 @@ c6aef8098d37a1773439117a5674bfc8662ef62b sources/confz
265506efe699a494bfa232c18745c0504829a1b8 sources/containers
3955e658562cef8e6012c1936a6c79c6b6628773 sources/containers
41d6ee2d6aa33b323eee611013dd4aab6a09fc89 sources/containers
-7747aaf4277539ea664b2b7bc0bea71047d2efc1 sources/containers
+50605df970917899b3eb154736952f339471f7e2 sources/containers
c33438f227efa4e8541c3152b684e3925c944f71 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.69a8c172d8dc6f60957469c555cfa3627fef38bb076dde5f758fd64854ecb275
#+xbps.0c1ece8bbd380938c5c0744cf9d37f2a2f402dd2f16dfe9b9ec891a5c84b9646
#+container-bin-image.eb707c02cf304e47f8f46bd2bd5bb827cf711e9fa652eea46a559962709adab4
-#@git:265506efe699a494bfa232c18745c0504829a1b8:containers
+#@git:50605df970917899b3eb154736952f339471f7e2: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.56cc4de211039e675c55efffdb89f3f14b0f99a2f967130886ee152df92633b5
+#+containers.6a94c3aefa8253b45bb73d449c8652ef6b7349109db8553a20ae8a6c0d1b156f
#+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.56cc4de211039e675c55efffdb89f3f14b0f99a2f967130886ee152df92633b5
+#+containers.6a94c3aefa8253b45bb73d449c8652ef6b7349109db8553a20ae8a6c0d1b156f
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+logincaps.04accf875f567934eb11016453454f691d056c66e0dc36a971f98aaaefdbe360
#+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7
@@ -37,8 +37,8 @@
#+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114
#+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8
#+strace.53097be3dbf67dbf52aa675a59980a7d965fd8cdf965ef3005035e70fc7e4103
-#+system-config.71e5ee3bd502c163abceec21b92e708f81755478c37058ea9d14bc721ec92d6a
-#+system-config-rc.1037616ef6b4ae3150395daaf75953932c12926730142afcbecbe49713d7208c
+#+system-config.cfdb78cb3d9f2699f6b3978ed5f046da6175e92a8c640d12c23adf7b0a83ae4d
+#+system-config-rc.58e56989674e045e8e822f80f4627b491547380ab876305e3d32fcfbd914f751
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.b281a9e19ef5fbdc855a7fa3fd865350c0b3042368ab4dc051c8597819892844
+#+system-config-init.6ffb550c6d5630157c1bb4fcc4be46b2a63e54c1ec449d84961ed0721d0dc69f
#+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.8589ed252edf86ee352f13dfbbb2f0aacdd34b9489e7960d4f99b352dfa0c313' \
+ 'pthbs_path_containers=/home/ccx/versions/env.4e0441ab9795388a58bb25a4235128a130a8b3f8c25f9d24f2421d68380104db' \
'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.1037616ef6b4ae3150395daaf75953932c12926730142afcbecbe49713d7208c
+#+system-config-rc.58e56989674e045e8e822f80f4627b491547380ab876305e3d32fcfbd914f751
-s6rcdb=/home/ccx/versions/system-config-rc.1037616ef6b4ae3150395daaf75953932c12926730142afcbecbe49713d7208c/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.58e56989674e045e8e822f80f4627b491547380ab876305e3d32fcfbd914f751/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.71e5ee3bd502c163abceec21b92e708f81755478c37058ea9d14bc721ec92d6a
+#+system-config.cfdb78cb3d9f2699f6b3978ed5f046da6175e92a8c640d12c23adf7b0a83ae4d
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.71e5ee3bd502c163abceec21b92e708f81755478c37058ea9d14bc721ec92d6a/config/s6-rc-source
+src=/home/ccx/versions/system-config.cfdb78cb3d9f2699f6b3978ed5f046da6175e92a8c640d12c23adf7b0a83ae4d/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.56cc4de211039e675c55efffdb89f3f14b0f99a2f967130886ee152df92633b5
+#+containers.6a94c3aefa8253b45bb73d449c8652ef6b7349109db8553a20ae8a6c0d1b156f
#+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.36bb13459deb471f66ac548b04ddf74cb730ccc89c749da9abf95e95dc49faea
-#@git:265506efe699a494bfa232c18745c0504829a1b8:containers
+#@git:50605df970917899b3eb154736952f339471f7e2: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.88bb10babc576e3b1c4bf927b93341401a9844921597742e1d8cd407e9e3b9f0
+#+containers.dfc6e6583628c7eebde3397c8e5c0d85e21e94c5a15902af6a712015f0b959ab
#+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.88bb10babc576e3b1c4bf927b93341401a9844921597742e1d8cd407e9e3b9f0
+#+containers.dfc6e6583628c7eebde3397c8e5c0d85e21e94c5a15902af6a712015f0b959ab
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
@@ -37,8 +37,8 @@
#+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac
#+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca
#+strace.ce1707d2cf1dfcd965827af80a18c6b97ca20b563b8967be8297322e8adf9296
-#+system-config.96c64ea6d8448523b3c0a8bed7a9a02dbd8751e36e446824964c405979454418
-#+system-config-rc.8776c4b772f7171ff3b9f69ed4cfeb9f36be65c437e674afcd348c06c06ebf9e
+#+system-config.1fbb591844e0823248f32eb7d9b5843c7a014de0ead47ad1a05a2adb4fd0a240
+#+system-config-rc.e77ef4059bf4d24e282e741c6bac2eee61447ff5e4f0d7d0be0419ce55496024
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.7232f87d4b7e634a3dab1749b9e7b696b764831913a2133ea170ca48eb121433
+#+system-config-init.245b79f56a03be19dafa1874cfa856b1bc471fe4f6d24ae4e9c487f307e67d56
#+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.3a8f59e591a2334703c324525031a27acd2cf3b2312a83a7fe7ac21197f92d36' \
+ 'pthbs_path_containers=/versions/env.e4aa24c03af827bc450d54d4afdee3c660735cb1e0d9b1fa45244572697ef35c' \
'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.8776c4b772f7171ff3b9f69ed4cfeb9f36be65c437e674afcd348c06c06ebf9e
+#+system-config-rc.e77ef4059bf4d24e282e741c6bac2eee61447ff5e4f0d7d0be0419ce55496024
-s6rcdb=/versions/system-config-rc.8776c4b772f7171ff3b9f69ed4cfeb9f36be65c437e674afcd348c06c06ebf9e/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.e77ef4059bf4d24e282e741c6bac2eee61447ff5e4f0d7d0be0419ce55496024/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.96c64ea6d8448523b3c0a8bed7a9a02dbd8751e36e446824964c405979454418
+#+system-config.1fbb591844e0823248f32eb7d9b5843c7a014de0ead47ad1a05a2adb4fd0a240
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.96c64ea6d8448523b3c0a8bed7a9a02dbd8751e36e446824964c405979454418/config/s6-rc-source
+src=/versions/system-config.1fbb591844e0823248f32eb7d9b5843c7a014de0ead47ad1a05a2adb4fd0a240/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.88bb10babc576e3b1c4bf927b93341401a9844921597742e1d8cd407e9e3b9f0
+#+containers.dfc6e6583628c7eebde3397c8e5c0d85e21e94c5a15902af6a712015f0b959ab
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5