commit 7fd974a0dcaf59cb8d7ea3800d8702636898666c
parent 047bb9b0048dd5189157a4d12fa7d735c37acdc4
Author: Jan Pobrislo <ccx@te2000.cz>
Date: Tue, 6 May 2025 12:39:14 +0000
update containers
Diffstat:
15 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/commitlist.sha1 b/commitlist.sha1
@@ -354,6 +354,7 @@ c6aef8098d37a1773439117a5674bfc8662ef62b sources/confz
066a430ec537775a1df9b30805dce551d78258c0 sources/containers
3955e658562cef8e6012c1936a6c79c6b6628773 sources/containers
41d6ee2d6aa33b323eee611013dd4aab6a09fc89 sources/containers
+7747aaf4277539ea664b2b7bc0bea71047d2efc1 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:066a430ec537775a1df9b30805dce551d78258c0:containers
+#@git:7747aaf4277539ea664b2b7bc0bea71047d2efc1: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.4b0412e8d0ff357c849729975cb317cd466916e3c00f24184a9bf51bc59684bd
+#+containers.9dd856d406f88a9ffde4e3ffc357dff8544b2b8120938a65e86616068fec9ae9
#+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.4b0412e8d0ff357c849729975cb317cd466916e3c00f24184a9bf51bc59684bd
+#+containers.9dd856d406f88a9ffde4e3ffc357dff8544b2b8120938a65e86616068fec9ae9
#+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737
#+logincaps.04accf875f567934eb11016453454f691d056c66e0dc36a971f98aaaefdbe360
#+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7
@@ -37,8 +37,8 @@
#+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114
#+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8
#+strace.53097be3dbf67dbf52aa675a59980a7d965fd8cdf965ef3005035e70fc7e4103
-#+system-config.4d76c319c4caf1a1fad26093c893912659f0a2d1f91187a3750d2ec1571db6e4
-#+system-config-rc.3dcc04eb3182a13b0111e15565b1aa8e153aa4ca994559cfce6820e6df853c75
+#+system-config.1dc0dc9cf60bb5e050afca76c1a3bb6f07bb030ff6bdda8ae63e84355a69750a
+#+system-config-rc.98732ed610325c158e28a583d691c4bd7e3694d05b73eb48c7e5980a8f95ef0a
#+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d
-#+system-config-init.c960f3ea773392b467ecf2fb9757acd2fbc3786dadd3b411861b26aa80db20bc
+#+system-config-init.f89816e8dc90f15248a137ed83cebb0ec37c2968376626f4ea1e8d1d6b727607
#+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.014262c7a8f642d6661905fa86e241a072c872902e92aa255994aeb85d03bfda' \
+ 'pthbs_path_containers=/home/ccx/versions/env.bc775eebc40b44a2c13efd1c3e02698e8a07572a7a87006b98beb86d3a46907e' \
'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.3dcc04eb3182a13b0111e15565b1aa8e153aa4ca994559cfce6820e6df853c75
+#+system-config-rc.98732ed610325c158e28a583d691c4bd7e3694d05b73eb48c7e5980a8f95ef0a
-s6rcdb=/home/ccx/versions/system-config-rc.3dcc04eb3182a13b0111e15565b1aa8e153aa4ca994559cfce6820e6df853c75/config/s6-rc-db
+s6rcdb=/home/ccx/versions/system-config-rc.98732ed610325c158e28a583d691c4bd7e3694d05b73eb48c7e5980a8f95ef0a/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.4d76c319c4caf1a1fad26093c893912659f0a2d1f91187a3750d2ec1571db6e4
+#+system-config.1dc0dc9cf60bb5e050afca76c1a3bb6f07bb030ff6bdda8ae63e84355a69750a
def_prefix() {
prefix=/home/ccx/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/home/ccx/versions/system-config.4d76c319c4caf1a1fad26093c893912659f0a2d1f91187a3750d2ec1571db6e4/config/s6-rc-source
+src=/home/ccx/versions/system-config.1dc0dc9cf60bb5e050afca76c1a3bb6f07bb030ff6bdda8ae63e84355a69750a/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.4b0412e8d0ff357c849729975cb317cd466916e3c00f24184a9bf51bc59684bd
+#+containers.9dd856d406f88a9ffde4e3ffc357dff8544b2b8120938a65e86616068fec9ae9
#+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:066a430ec537775a1df9b30805dce551d78258c0:containers
+#@git:7747aaf4277539ea664b2b7bc0bea71047d2efc1: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.5d4c770d6fa8be86e6f0e2fa0029c2f256f0dd3e3e61caa769f9186f4ab1f784
+#+containers.2629426a136520547ed1162c7e0ff5c22323de2f3e5765b634c7b6dff503a9a8
#+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.5d4c770d6fa8be86e6f0e2fa0029c2f256f0dd3e3e61caa769f9186f4ab1f784
+#+containers.2629426a136520547ed1162c7e0ff5c22323de2f3e5765b634c7b6dff503a9a8
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
@@ -37,8 +37,8 @@
#+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac
#+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca
#+strace.ce1707d2cf1dfcd965827af80a18c6b97ca20b563b8967be8297322e8adf9296
-#+system-config.fc2c9f12809f2c63dc3e76d694f44c75074f6e2f9ba825cc7e1e023ed296cb97
-#+system-config-rc.87f2e89d3ace0d495c153b4c03132d252768e3c17af5c8099deb01f009668cdf
+#+system-config.57065ba06a783de48fce074faab381947c9b5ffd07d0c9a8f8fea40bfc0bc8e7
+#+system-config-rc.afad5f27e01c9d735138e064ccd4cf1e3b8c83cfa0b3bd0c243943a6aa806a62
#+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378
-#+system-config-init.d66a97c4aeab5c296da24957f382fdbc7f9393544a80437ce6aac5de79645879
+#+system-config-init.d2b4eb4165a12307245be6ccdcaa0573c878c45292e0041514dfab830a75021c
#+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.5498859ac804536225b94f8bd744f5a9791647b9f020add4fa8b3d9ca0edc3f4' \
+ 'pthbs_path_containers=/versions/env.d47f1a04f4cb16adfd3ccee1c51c7bb83495ec5aa365c26d60bb4eab422288a2' \
'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.87f2e89d3ace0d495c153b4c03132d252768e3c17af5c8099deb01f009668cdf
+#+system-config-rc.afad5f27e01c9d735138e064ccd4cf1e3b8c83cfa0b3bd0c243943a6aa806a62
-s6rcdb=/versions/system-config-rc.87f2e89d3ace0d495c153b4c03132d252768e3c17af5c8099deb01f009668cdf/config/s6-rc-db
+s6rcdb=/versions/system-config-rc.afad5f27e01c9d735138e064ccd4cf1e3b8c83cfa0b3bd0c243943a6aa806a62/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.fc2c9f12809f2c63dc3e76d694f44c75074f6e2f9ba825cc7e1e023ed296cb97
+#+system-config.57065ba06a783de48fce074faab381947c9b5ffd07d0c9a8f8fea40bfc0bc8e7
def_prefix() {
prefix=/versions/$pthbs_package
@@ -13,7 +13,7 @@ def_dest() {
}
def_dest
-src=/versions/system-config.fc2c9f12809f2c63dc3e76d694f44c75074f6e2f9ba825cc7e1e023ed296cb97/config/s6-rc-source
+src=/versions/system-config.57065ba06a783de48fce074faab381947c9b5ffd07d0c9a8f8fea40bfc0bc8e7/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.5d4c770d6fa8be86e6f0e2fa0029c2f256f0dd3e3e61caa769f9186f4ab1f784
+#+containers.2629426a136520547ed1162c7e0ff5c22323de2f3e5765b634c7b6dff503a9a8
#+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150
#+logincaps.3c7957125c5700c2436df091d2fba6324b1ac5f2bfcd54948f6a5b8049047afc
#+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5
