commit 259faf09c27fe458638c20bf501ad003c7966247
parent a8f092e17e780972f9ec6d6e2c105dc9cb4e05e8
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Sun, 20 Jul 2025 09:49:07 +0000
update containers
Diffstat:
15 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/commitlist.sha1 b/commitlist.sha1
@@ -358,6 +358,7 @@ ffe18087faa553747d68ce662e0d4e9e7265fc3f sources/busybox
c5eed37c744c786076a1ec13132ade7ef410ed16 sources/ccx-utils
fae441e25a1ac266742ba6446b37ae56c8e57076 sources/ccx-utils
c6aef8098d37a1773439117a5674bfc8662ef62b sources/confz
+11e078dc257d5d3df15348a407ee1507904db027 sources/containers
41d6ee2d6aa33b323eee611013dd4aab6a09fc89 sources/containers
5d2b98a3c54b6f142b80773e4a18dea3749bfea6 sources/containers
6f1870365d2a7e410b48f3fe633d6f1b658738ba sources/containers
@@ -2241,7 +2242,6 @@ ff066bd37e692daadc573fbd3ef622c3f1e8ec6a sources/skalibs
e9d8af262eb5e25536ea9778e3ed57aebb55488c sources/snaprep
0a1466e946de353d1947a4cdb2210b5699c141dd sources/system-config
73b979db781674fc7b06233cefd6c2b77bcaa82a sources/system-config
-f3ba2ed82a90a515c24ca09d4e1920f9bb77454f sources/system-config
f9d071a4c5870d42d00d0ca496efac527388e6f4 sources/system-config
dc793695cc0632a808af9d4415f3b0cf0f4dfba2 sources/system-config-scripts
1390434aaa6e044fc713547a232f20f2aa17f972 sources/system-config-zsh
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.8bdd85fc47320f7ec216bb43f14f85e3530df042ceb2d72a9065f92d15e026dd
-#@git:d82b6c64140415afc96fd463758968d648a08220:containers
+#@git:11e078dc257d5d3df15348a407ee1507904db027: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.96d8d12df5693d98aa6392813e960afca058623c71aa3178ca6ab0b79c7b67a7
+#+containers.7ee7b02a53555fdba163f32f52bd07cfe287942a08231caea4fb9010b1973d42
#+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.96d8d12df5693d98aa6392813e960afca058623c71aa3178ca6ab0b79c7b67a7
+#+containers.7ee7b02a53555fdba163f32f52bd07cfe287942a08231caea4fb9010b1973d42
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+logincaps.96263bd64a359697fe7dc6343af26a7e3d535be97cb52f6010b575e05165dbf5
#+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7
@@ -38,8 +38,8 @@
#+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8
#+strace.53097be3dbf67dbf52aa675a59980a7d965fd8cdf965ef3005035e70fc7e4103
#+mlog.a63c78a5967e11f6fcac02b7eced93c023b82172f901e0f3929fad33b591f676
-#+system-config.f58af40b0c9498e90e7208834d59c2632e0d872899a1a8db7bea45531d6ec79b
-#+system-config-rc.0fedd7e1b1a8a1350ef1ff06a29daa653eb5b0303595eccd93048f3b03799aa9
+#+system-config.0b6aa06c015f730a63a7d89f357efbf9b00fd80b8a5c920bef70ff42a998b5a3
+#+system-config-rc.ee8f4a33114646d257b485876050057c2200f40f041b821fa97d1e18b7d71db2
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.65dc7089deaa366eb96893e6561f217a50392e697fc912fff99469e7614ab26d
+#+system-config-init.a812b2f2ef487a4159adbb74ebdd1aa908d1cba7c4530447ca142d1520fa5604
#+system-config-zsh.c909db48540806e61eebed4572b594f9bb32b7c3db277e7c8967b652599bf80c
\ 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.dd1086883286abb3618c8e49b960f3c8bc51e3454ed6e63fb5b2e0ea72808dfb' \
+ 'pthbs_path_containers=/home/ccx/versions/env.4c5eb07a2087520e1f0becc75e45a725c5155c2865e80cbda32839e7cc71b522' \
'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.0fedd7e1b1a8a1350ef1ff06a29daa653eb5b0303595eccd93048f3b03799aa9
+#+system-config-rc.ee8f4a33114646d257b485876050057c2200f40f041b821fa97d1e18b7d71db2
-s6rcdb=/home/ccx/versions/system-config-rc.0fedd7e1b1a8a1350ef1ff06a29daa653eb5b0303595eccd93048f3b03799aa9/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.ee8f4a33114646d257b485876050057c2200f40f041b821fa97d1e18b7d71db2/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.f58af40b0c9498e90e7208834d59c2632e0d872899a1a8db7bea45531d6ec79b
+#+system-config.0b6aa06c015f730a63a7d89f357efbf9b00fd80b8a5c920bef70ff42a998b5a3
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.f58af40b0c9498e90e7208834d59c2632e0d872899a1a8db7bea45531d6ec79b/config/s6-rc-source
+src=/home/ccx/versions/system-config.0b6aa06c015f730a63a7d89f357efbf9b00fd80b8a5c920bef70ff42a998b5a3/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.96d8d12df5693d98aa6392813e960afca058623c71aa3178ca6ab0b79c7b67a7
+#+containers.7ee7b02a53555fdba163f32f52bd07cfe287942a08231caea4fb9010b1973d42
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+logincaps.96263bd64a359697fe7dc6343af26a7e3d535be97cb52f6010b575e05165dbf5
#+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.5e980a983c8d19e4c4c3acafcd762c8e9b8eaa2124607c3ddca8767d1e6d5d79
-#@git:d82b6c64140415afc96fd463758968d648a08220:containers
+#@git:11e078dc257d5d3df15348a407ee1507904db027: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.064d11451ae97bf054b07bd9998f259ae623410e9f3d0f630ea9c5a8b9c46f8d
+#+containers.211d8ead6491b50fb8a05649672e85eba70675ac387b32ff66554037fd8da4a5
#+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.064d11451ae97bf054b07bd9998f259ae623410e9f3d0f630ea9c5a8b9c46f8d
+#+containers.211d8ead6491b50fb8a05649672e85eba70675ac387b32ff66554037fd8da4a5
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.81ffbb96fbc3c630eda5e1bb2249d6691f0fba11821f56c08ce3c42cbf186620
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
@@ -38,8 +38,8 @@
#+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca
#+strace.ce1707d2cf1dfcd965827af80a18c6b97ca20b563b8967be8297322e8adf9296
#+mlog.3a2fb37a92813d4c8700d3f9eb95753b0f2b72d5de13f03ba2f52fc0732ac487
-#+system-config.6368f14c28972d610dee259bc3de6d31b8f94ae0b66de729a10b5665ca0a6a9d
-#+system-config-rc.6d3cbc25059fa56d3dab2e1342a66c134a0295de46de29b67c196e3776a76bdb
+#+system-config.5c025ec607f7ead87a9befd1fab447dc94c9f0c014d9b00990d263d1b7cf49a0
+#+system-config-rc.559a8cd8bebdc89cb3fef1f3fa857dc867431627109873c385ccb4c84e4d4c6a
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.ac28a811cd3be95773c3ab682bed43dc5a06b9173b4b5748745fb02fd0219ddd
+#+system-config-init.69a898dfeb4249ea7c3b6486efa2527cd9b2d24f2aa5a45db80e03510edc6143
#+system-config-zsh.ed06489518be3fe07b081034705aaa1c35af0c2604cf52f5ad4c59713352b220
\ 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.898d99ed6d3808c3f6169f722d37065a900c3fa9e55aad96055fdd4e1b0768ee' \
+ 'pthbs_path_containers=/versions/env.d29fea88b143d5a3784e65e4738109261ea9d12ef54bd859b5548f25a7ff6282' \
'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.6d3cbc25059fa56d3dab2e1342a66c134a0295de46de29b67c196e3776a76bdb
+#+system-config-rc.559a8cd8bebdc89cb3fef1f3fa857dc867431627109873c385ccb4c84e4d4c6a
-s6rcdb=/versions/system-config-rc.6d3cbc25059fa56d3dab2e1342a66c134a0295de46de29b67c196e3776a76bdb/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.559a8cd8bebdc89cb3fef1f3fa857dc867431627109873c385ccb4c84e4d4c6a/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.6368f14c28972d610dee259bc3de6d31b8f94ae0b66de729a10b5665ca0a6a9d
+#+system-config.5c025ec607f7ead87a9befd1fab447dc94c9f0c014d9b00990d263d1b7cf49a0
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.6368f14c28972d610dee259bc3de6d31b8f94ae0b66de729a10b5665ca0a6a9d/config/s6-rc-source
+src=/versions/system-config.5c025ec607f7ead87a9befd1fab447dc94c9f0c014d9b00990d263d1b7cf49a0/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.064d11451ae97bf054b07bd9998f259ae623410e9f3d0f630ea9c5a8b9c46f8d
+#+containers.211d8ead6491b50fb8a05649672e85eba70675ac387b32ff66554037fd8da4a5
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.81ffbb96fbc3c630eda5e1bb2249d6691f0fba11821f56c08ce3c42cbf186620
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
