commit 154479e7665303b7635165970119b934a62ee893
parent 5b4bc1e1ff004a2ab2be25adae55ed1b7945ee32
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Wed, 30 Jul 2025 09:50:57 +0000
update containers
Diffstat:
15 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/commitlist.sha1 b/commitlist.sha1
@@ -358,11 +358,11 @@ ffe18087faa553747d68ce662e0d4e9e7265fc3f sources/busybox
c5eed37c744c786076a1ec13132ade7ef410ed16 sources/ccx-utils
fae441e25a1ac266742ba6446b37ae56c8e57076 sources/ccx-utils
c6aef8098d37a1773439117a5674bfc8662ef62b sources/confz
-11e078dc257d5d3df15348a407ee1507904db027 sources/containers
41d6ee2d6aa33b323eee611013dd4aab6a09fc89 sources/containers
5d2b98a3c54b6f142b80773e4a18dea3749bfea6 sources/containers
64b6218ba7e1b23238d23933503fed4632879370 sources/containers
6f1870365d2a7e410b48f3fe633d6f1b658738ba sources/containers
+a7ab6883000621e6557a85806d8e00ef11ff6337 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.8bdd85fc47320f7ec216bb43f14f85e3530df042ceb2d72a9065f92d15e026dd
-#@git:64b6218ba7e1b23238d23933503fed4632879370:containers
+#@git:a7ab6883000621e6557a85806d8e00ef11ff6337: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.c6ac54445d6c1f19ef786bb3fab80d483f3b7f16d18755aafdb4e4e20df0ffaf
+#+containers.c8c3d0c664aaf7d4e0f34dce2251bcca1d1fe40d66c8eeb7f2d85f044eb4e272
#+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.c6ac54445d6c1f19ef786bb3fab80d483f3b7f16d18755aafdb4e4e20df0ffaf
+#+containers.c8c3d0c664aaf7d4e0f34dce2251bcca1d1fe40d66c8eeb7f2d85f044eb4e272
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+logincaps.96263bd64a359697fe7dc6343af26a7e3d535be97cb52f6010b575e05165dbf5
#+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7
@@ -38,8 +38,8 @@
#+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8
#+strace.53097be3dbf67dbf52aa675a59980a7d965fd8cdf965ef3005035e70fc7e4103
#+mlog.a63c78a5967e11f6fcac02b7eced93c023b82172f901e0f3929fad33b591f676
-#+system-config.38e1d0b5cc48da9b1859c8e254a54b4ada86250eb1e4615e3a873913f1938565
-#+system-config-rc.0f78a2d7ff59d1f863b3d6ca75ed72dc364cf1883e3727d6ec9906731f2d8f04
+#+system-config.5926c1dfebbcc0571f75873028437144fc0f9a02762af6cef6d012939c70f456
+#+system-config-rc.b505f24a37f03fdaa570851a0fdc7cf44106ff07811ef70383df3c218ddf9f95
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.f2d3e171c819af7f83c3624d4a4414ee474079ad3f0e2cff550c854c11719285
+#+system-config-init.c60924895e23bf818260c82ae7b0584dcef55493f17c27b65b14c8f2a15ff107
#+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.baecce1a51438b4f5855f734e7256aa8743dc62071a49dd55745e510b5bf1683' \
+ 'pthbs_path_containers=/home/ccx/versions/env.e26e8accf70501ad6abcf3b794382fb84490d56fb25272464329cad7b416e7cf' \
'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.0f78a2d7ff59d1f863b3d6ca75ed72dc364cf1883e3727d6ec9906731f2d8f04
+#+system-config-rc.b505f24a37f03fdaa570851a0fdc7cf44106ff07811ef70383df3c218ddf9f95
-s6rcdb=/home/ccx/versions/system-config-rc.0f78a2d7ff59d1f863b3d6ca75ed72dc364cf1883e3727d6ec9906731f2d8f04/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.b505f24a37f03fdaa570851a0fdc7cf44106ff07811ef70383df3c218ddf9f95/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.38e1d0b5cc48da9b1859c8e254a54b4ada86250eb1e4615e3a873913f1938565
+#+system-config.5926c1dfebbcc0571f75873028437144fc0f9a02762af6cef6d012939c70f456
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.38e1d0b5cc48da9b1859c8e254a54b4ada86250eb1e4615e3a873913f1938565/config/s6-rc-source
+src=/home/ccx/versions/system-config.5926c1dfebbcc0571f75873028437144fc0f9a02762af6cef6d012939c70f456/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.c6ac54445d6c1f19ef786bb3fab80d483f3b7f16d18755aafdb4e4e20df0ffaf
+#+containers.c8c3d0c664aaf7d4e0f34dce2251bcca1d1fe40d66c8eeb7f2d85f044eb4e272
#+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:64b6218ba7e1b23238d23933503fed4632879370:containers
+#@git:a7ab6883000621e6557a85806d8e00ef11ff6337: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.82cb79661cc73bc4f0833f0eb6c4a2c94f339ccafc350be68d0aeb3302e39d9b
+#+containers.8809b53f08d49249c21c63eec013c9ff2a74349aded2283eec7fb9d7f2056335
#+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.82cb79661cc73bc4f0833f0eb6c4a2c94f339ccafc350be68d0aeb3302e39d9b
+#+containers.8809b53f08d49249c21c63eec013c9ff2a74349aded2283eec7fb9d7f2056335
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.81ffbb96fbc3c630eda5e1bb2249d6691f0fba11821f56c08ce3c42cbf186620
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
@@ -38,8 +38,8 @@
#+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca
#+strace.ce1707d2cf1dfcd965827af80a18c6b97ca20b563b8967be8297322e8adf9296
#+mlog.3a2fb37a92813d4c8700d3f9eb95753b0f2b72d5de13f03ba2f52fc0732ac487
-#+system-config.0f62b116c6e65c790b95460622ca155668596332f4943e8a3a6513111652f477
-#+system-config-rc.46d154e5f8c548067d65793d7deb8c0003c23c65e08cc48cc0146ca33dbcf88d
+#+system-config.c1f651705f26496ffec0a7e4c75ab737eb29f0f97755b8e2b8316ba5600dee62
+#+system-config-rc.3ea9e0f8b4d8226d3c30e58a15ba548f61eb3c8bb2f7fc03ec8e52d59ed12134
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.9a1c49d3523e03eca690cd4fa753a9dcfe779cd0b101009c8b70e3ace6c46249
+#+system-config-init.adcd88d356150a4d8af74368f04fbe8821213cd8838715090ebbce83cfeb7ab6
#+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.1e65b1d01af2088823e967c257f028b29d9a16b9b56316368a31b928f548682a' \
+ 'pthbs_path_containers=/versions/env.2ffa7dcbc990880cd9ccd04cd9a717cf5cf16e4f4f56145e3dd291dec1137c08' \
'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.46d154e5f8c548067d65793d7deb8c0003c23c65e08cc48cc0146ca33dbcf88d
+#+system-config-rc.3ea9e0f8b4d8226d3c30e58a15ba548f61eb3c8bb2f7fc03ec8e52d59ed12134
-s6rcdb=/versions/system-config-rc.46d154e5f8c548067d65793d7deb8c0003c23c65e08cc48cc0146ca33dbcf88d/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.3ea9e0f8b4d8226d3c30e58a15ba548f61eb3c8bb2f7fc03ec8e52d59ed12134/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.0f62b116c6e65c790b95460622ca155668596332f4943e8a3a6513111652f477
+#+system-config.c1f651705f26496ffec0a7e4c75ab737eb29f0f97755b8e2b8316ba5600dee62
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.0f62b116c6e65c790b95460622ca155668596332f4943e8a3a6513111652f477/config/s6-rc-source
+src=/versions/system-config.c1f651705f26496ffec0a7e4c75ab737eb29f0f97755b8e2b8316ba5600dee62/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.82cb79661cc73bc4f0833f0eb6c4a2c94f339ccafc350be68d0aeb3302e39d9b
+#+containers.8809b53f08d49249c21c63eec013c9ff2a74349aded2283eec7fb9d7f2056335
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.81ffbb96fbc3c630eda5e1bb2249d6691f0fba11821f56c08ce3c42cbf186620
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
