commit 3fa215eb3800ca13db8ff7613dd95a5971301502
parent 470a040006a3e5243e4c7d99e5f503919dffbc4c
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Sat, 17 May 2025 23:29:45 +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
-178eb89bddd6220a6a8190fd375b3fd320d07803 sources/containers
3955e658562cef8e6012c1936a6c79c6b6628773 sources/containers
41d6ee2d6aa33b323eee611013dd4aab6a09fc89 sources/containers
51876d0974896d8c8131e619e78804d9eae6c392 sources/containers
+c42e0a94993320e6704cfa75c7938a2ee1ba6f0e 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:51876d0974896d8c8131e619e78804d9eae6c392:containers
+#@git:c42e0a94993320e6704cfa75c7938a2ee1ba6f0e: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.018d817a71e87d95d0f3bee013059999fd6eb667ac3042dc5b81ebe52db9dcb6
+#+containers.8fa6732124087e5c0b22df607adef664a330b451de1308020d3af15c6d35f628
#+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.018d817a71e87d95d0f3bee013059999fd6eb667ac3042dc5b81ebe52db9dcb6
+#+containers.8fa6732124087e5c0b22df607adef664a330b451de1308020d3af15c6d35f628
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+logincaps.04accf875f567934eb11016453454f691d056c66e0dc36a971f98aaaefdbe360
#+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7
@@ -37,8 +37,8 @@
#+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114
#+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8
#+strace.53097be3dbf67dbf52aa675a59980a7d965fd8cdf965ef3005035e70fc7e4103
-#+system-config.d3a94129c59811766fd1c8781b541a09f5625b7b491de33df354241bbdcc028b
-#+system-config-rc.56a9bba93dad40e08427861075220f3652b0cae487f7093d6d5a4f4c2225ec89
+#+system-config.895178b277b7cbc4e96fa3fbb89bdbe6a676ab8c67cf0706513dded9f13dac19
+#+system-config-rc.95c26bcbc568401f3f4a5a2b44d7e3dd108813e42e9d08475b9a37452609ed0b
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.a7c18725187d991446178e811837bda6102b841fe4376f2d4e74a85018b0fb59
+#+system-config-init.dea6fe751c14e3e8f40858c5bf39c84d0f9d73bc596da46265fbe24a612f832f
#+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.f954392c1febafe1e34b8a26fdd789e27e7283ec09a3b66eb5dff4ab63a57fab' \
+ 'pthbs_path_containers=/home/ccx/versions/env.07c7493060294c9edd4245d0c8bf308cd255c1a0c2de4b64f96d30ae996fb2e7' \
'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.56a9bba93dad40e08427861075220f3652b0cae487f7093d6d5a4f4c2225ec89
+#+system-config-rc.95c26bcbc568401f3f4a5a2b44d7e3dd108813e42e9d08475b9a37452609ed0b
-s6rcdb=/home/ccx/versions/system-config-rc.56a9bba93dad40e08427861075220f3652b0cae487f7093d6d5a4f4c2225ec89/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.95c26bcbc568401f3f4a5a2b44d7e3dd108813e42e9d08475b9a37452609ed0b/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.d3a94129c59811766fd1c8781b541a09f5625b7b491de33df354241bbdcc028b
+#+system-config.895178b277b7cbc4e96fa3fbb89bdbe6a676ab8c67cf0706513dded9f13dac19
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.d3a94129c59811766fd1c8781b541a09f5625b7b491de33df354241bbdcc028b/config/s6-rc-source
+src=/home/ccx/versions/system-config.895178b277b7cbc4e96fa3fbb89bdbe6a676ab8c67cf0706513dded9f13dac19/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.018d817a71e87d95d0f3bee013059999fd6eb667ac3042dc5b81ebe52db9dcb6
+#+containers.8fa6732124087e5c0b22df607adef664a330b451de1308020d3af15c6d35f628
#+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:51876d0974896d8c8131e619e78804d9eae6c392:containers
+#@git:c42e0a94993320e6704cfa75c7938a2ee1ba6f0e: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.007af0f97646cedb829af5222a437c87d3bf90aa2313b1e35f213931151f6c15
+#+containers.9d0ed095c4bb197557d6c0d063c2e9beddcd7dee8ac27bf2cb1c7fd0d07f4e57
#+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.007af0f97646cedb829af5222a437c87d3bf90aa2313b1e35f213931151f6c15
+#+containers.9d0ed095c4bb197557d6c0d063c2e9beddcd7dee8ac27bf2cb1c7fd0d07f4e57
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
@@ -37,8 +37,8 @@
#+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac
#+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca
#+strace.ce1707d2cf1dfcd965827af80a18c6b97ca20b563b8967be8297322e8adf9296
-#+system-config.d9aa5c19d9c3f231ab710c084808440a8fa6cfaade52d6ce25bc56c807d5160c
-#+system-config-rc.36b1d53a88177c650b5a1a42ed1340ef3b53b666bc54eded60a86e768bfb3ca1
+#+system-config.5b7c2c8ac1570bca9b0e8007458c702dc870d73c0da90274e455e57129d41e57
+#+system-config-rc.afea94f041ad192905af36811ac68f922be47a6f0e8c80874f7832223cc56cf3
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.888459d4b75c818efd9dfee2086a956f1950f0fb2f6fe711939d82c429b122a4
+#+system-config-init.635126d411464be56a31584049d69898ed012d23fa2607d3b5a9b29ed3a4f2ac
#+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.c419341d2bf637f046b0848a94f67eb4d9764d958f4c9b9628603d48def08854' \
+ 'pthbs_path_containers=/versions/env.686638d8f14a0c86f53f5e02283209634638a6c9dc468c4c9e212f3feb43d455' \
'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.36b1d53a88177c650b5a1a42ed1340ef3b53b666bc54eded60a86e768bfb3ca1
+#+system-config-rc.afea94f041ad192905af36811ac68f922be47a6f0e8c80874f7832223cc56cf3
-s6rcdb=/versions/system-config-rc.36b1d53a88177c650b5a1a42ed1340ef3b53b666bc54eded60a86e768bfb3ca1/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.afea94f041ad192905af36811ac68f922be47a6f0e8c80874f7832223cc56cf3/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.d9aa5c19d9c3f231ab710c084808440a8fa6cfaade52d6ce25bc56c807d5160c
+#+system-config.5b7c2c8ac1570bca9b0e8007458c702dc870d73c0da90274e455e57129d41e57
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.d9aa5c19d9c3f231ab710c084808440a8fa6cfaade52d6ce25bc56c807d5160c/config/s6-rc-source
+src=/versions/system-config.5b7c2c8ac1570bca9b0e8007458c702dc870d73c0da90274e455e57129d41e57/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.007af0f97646cedb829af5222a437c87d3bf90aa2313b1e35f213931151f6c15
+#+containers.9d0ed095c4bb197557d6c0d063c2e9beddcd7dee8ac27bf2cb1c7fd0d07f4e57
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
