commit 1bfc68a915775da8e729be9377e4f6c242be10a0
parent 34f64c9c798bea763e607180d659eda2b8796ee2
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Wed, 11 Jun 2025 11:12:13 +0000
update containers
Diffstat:
15 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/commitlist.sha1 b/commitlist.sha1
@@ -353,7 +353,7 @@ fae441e25a1ac266742ba6446b37ae56c8e57076 sources/ccx-utils
c6aef8098d37a1773439117a5674bfc8662ef62b sources/confz
3955e658562cef8e6012c1936a6c79c6b6628773 sources/containers
41d6ee2d6aa33b323eee611013dd4aab6a09fc89 sources/containers
-8af86cafcb267d2ff70bb86c0453b8d45a0376d1 sources/containers
+69f45cf255a73eb1dffc6d9fd2bc21cc94abf3a6 sources/containers
9c9b03b8b03467a25f2ef560222956ec1f7aec33 sources/containers
d5fcac3d3b68b3fafa06e08884e1b826ce66211d sources/containers
e8dfe8dcb4396ac0f12f0d0017f9836fa113e3a6 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:9c9b03b8b03467a25f2ef560222956ec1f7aec33:containers
+#@git:69f45cf255a73eb1dffc6d9fd2bc21cc94abf3a6: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.01fbebf6e8e2f4a7485a6d84eeab3b19c51c80a227b300e5f83ed23206f35200
+#+containers.46ec801e71933919325ce1afb736f0e7de487bdff6007813fda3114b119f4340
#+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.01fbebf6e8e2f4a7485a6d84eeab3b19c51c80a227b300e5f83ed23206f35200
+#+containers.46ec801e71933919325ce1afb736f0e7de487bdff6007813fda3114b119f4340
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+logincaps.96263bd64a359697fe7dc6343af26a7e3d535be97cb52f6010b575e05165dbf5
#+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7
@@ -38,8 +38,8 @@
#+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8
#+strace.53097be3dbf67dbf52aa675a59980a7d965fd8cdf965ef3005035e70fc7e4103
#+mlog.a63c78a5967e11f6fcac02b7eced93c023b82172f901e0f3929fad33b591f676
-#+system-config.670afec0faa83a0d8ec322b8e856e52a9ba1ef26df8125d99d51f85182c5f2d3
-#+system-config-rc.28a6d27d0d94f4742a90269d5cae5461d77837c1e16f860842bd5814c2b3719e
+#+system-config.44d53dd9044eb2bffc431951abf02b8c1e72bcc1ccf69c9d944901611a7bd1a8
+#+system-config-rc.4cc1c077a5ae5564ece0bac5ccfbf58d80ebf480f91d1c2a5ed04bbed2b55b37
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.61cb68b8c3f2850e0ee65da7c828b5aa5bbe4a83924e70fc351de7c422a617ef
+#+system-config-init.d244b339f03e829cc2043413e535c47e0215dfba424a9f9c3f881c3098bac26e
#+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.a61feda29407668cab8a943a7eb914f68507dec61beed92121c3e87a9e6809d2' \
+ 'pthbs_path_containers=/home/ccx/versions/env.f740763acd15391d6ab79841e91bd5d70bec9fa4caa0a50f5137677ac2b9e675' \
'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.28a6d27d0d94f4742a90269d5cae5461d77837c1e16f860842bd5814c2b3719e
+#+system-config-rc.4cc1c077a5ae5564ece0bac5ccfbf58d80ebf480f91d1c2a5ed04bbed2b55b37
-s6rcdb=/home/ccx/versions/system-config-rc.28a6d27d0d94f4742a90269d5cae5461d77837c1e16f860842bd5814c2b3719e/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.4cc1c077a5ae5564ece0bac5ccfbf58d80ebf480f91d1c2a5ed04bbed2b55b37/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.670afec0faa83a0d8ec322b8e856e52a9ba1ef26df8125d99d51f85182c5f2d3
+#+system-config.44d53dd9044eb2bffc431951abf02b8c1e72bcc1ccf69c9d944901611a7bd1a8
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.670afec0faa83a0d8ec322b8e856e52a9ba1ef26df8125d99d51f85182c5f2d3/config/s6-rc-source
+src=/home/ccx/versions/system-config.44d53dd9044eb2bffc431951abf02b8c1e72bcc1ccf69c9d944901611a7bd1a8/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.01fbebf6e8e2f4a7485a6d84eeab3b19c51c80a227b300e5f83ed23206f35200
+#+containers.46ec801e71933919325ce1afb736f0e7de487bdff6007813fda3114b119f4340
#+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.5f40ff6528dcff01a8f533c745347b6e6035838f63cd8cd6e5cf39989d2c66b2
-#@git:9c9b03b8b03467a25f2ef560222956ec1f7aec33:containers
+#@git:69f45cf255a73eb1dffc6d9fd2bc21cc94abf3a6: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.26a701780d13e396638d5d67b83a279ba61ff3ad0bf22583a3b197ac0cae4802
+#+containers.b8c054ccf700bfbf8c213f005db98445218ca3ab29b0356313e70eb3fbcfb6a0
#+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.26a701780d13e396638d5d67b83a279ba61ff3ad0bf22583a3b197ac0cae4802
+#+containers.b8c054ccf700bfbf8c213f005db98445218ca3ab29b0356313e70eb3fbcfb6a0
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.81ffbb96fbc3c630eda5e1bb2249d6691f0fba11821f56c08ce3c42cbf186620
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
@@ -38,8 +38,8 @@
#+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca
#+strace.ce1707d2cf1dfcd965827af80a18c6b97ca20b563b8967be8297322e8adf9296
#+mlog.3a2fb37a92813d4c8700d3f9eb95753b0f2b72d5de13f03ba2f52fc0732ac487
-#+system-config.53749a32727bc3e7a233af207405c79d14690f48ed0d43f0b63453c6296db268
-#+system-config-rc.0e8cabea6f8c7e6da3a1c49c332f86249181e28766c0eae1300e5688aaac49a3
+#+system-config.c71b44c2a858f3c611f646fa5db332f30b190ae11535a4afd075bf74cb6cc6f7
+#+system-config-rc.5deba526ad7bd40b2246d2409b81f6a28ae9d17569517278ba9c3118d53b663b
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.1fa7d02a1b3e43d4a555bae2941ab61d53339cc712053d0cc6d5b53742dce585
+#+system-config-init.7faacfb654c2cf2944a0275b7134061559bfa0981156f7b3fe9f95772fd6f356
#+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.f0ad10bb92f32f420799ff6f1d66fad199666ddbfc71167f4c127b32a5cb1c3b' \
+ 'pthbs_path_containers=/versions/env.67f1f764bd6ddd404afab8d7f3f90b0c850faca948acf41ee6231f9e5019e5a4' \
'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.0e8cabea6f8c7e6da3a1c49c332f86249181e28766c0eae1300e5688aaac49a3
+#+system-config-rc.5deba526ad7bd40b2246d2409b81f6a28ae9d17569517278ba9c3118d53b663b
-s6rcdb=/versions/system-config-rc.0e8cabea6f8c7e6da3a1c49c332f86249181e28766c0eae1300e5688aaac49a3/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.5deba526ad7bd40b2246d2409b81f6a28ae9d17569517278ba9c3118d53b663b/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.53749a32727bc3e7a233af207405c79d14690f48ed0d43f0b63453c6296db268
+#+system-config.c71b44c2a858f3c611f646fa5db332f30b190ae11535a4afd075bf74cb6cc6f7
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.53749a32727bc3e7a233af207405c79d14690f48ed0d43f0b63453c6296db268/config/s6-rc-source
+src=/versions/system-config.c71b44c2a858f3c611f646fa5db332f30b190ae11535a4afd075bf74cb6cc6f7/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.26a701780d13e396638d5d67b83a279ba61ff3ad0bf22583a3b197ac0cae4802
+#+containers.b8c054ccf700bfbf8c213f005db98445218ca3ab29b0356313e70eb3fbcfb6a0
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.81ffbb96fbc3c630eda5e1bb2249d6691f0fba11821f56c08ce3c42cbf186620
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5