commit 575e824cb36b06000cc93b612b6334f88ca3025c parent 58ffc720f89cf4a2a78fd476966a14bc4f6ce5c9 Author: Jan Pobrislo <ccx@te2000.cz> Date: Sun, 3 Aug 2025 13:23:07 +0000 containers Diffstat:
14 files changed, 24 insertions(+), 24 deletions(-)
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:d19aa9efc8a1dcb952c0465e4317a46f2d05c9a7:containers +#@git:04f721be0f9ee174f5567c6925fe4f68f88f0c07: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.c922ca3bc18165a1b8761dff5fa139b903526a079196ccc16ef5525c7ad8f58a +#+containers.34cde28fd981fe002971ad10e34fd6571ca7924a9c09032f10a9c0488f0bd812 #+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.c922ca3bc18165a1b8761dff5fa139b903526a079196ccc16ef5525c7ad8f58a +#+containers.34cde28fd981fe002971ad10e34fd6571ca7924a9c09032f10a9c0488f0bd812 #+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737 #+logincaps.96263bd64a359697fe7dc6343af26a7e3d535be97cb52f6010b575e05165dbf5 #+snaprep.00aa9b9a8cd250e823959881ee26d93cab1be5fe7bbb06ad9abc7242c481b4f7 @@ -38,8 +38,8 @@ #+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8 #+strace.53097be3dbf67dbf52aa675a59980a7d965fd8cdf965ef3005035e70fc7e4103 #+mlog.a63c78a5967e11f6fcac02b7eced93c023b82172f901e0f3929fad33b591f676 -#+system-config.7f226c1482f93168a3dce232d8f14361aed43da7b688b26b380d6e7360632331 -#+system-config-rc.bf4bd3e620511c4f891740a717e7ef3943f63b53f0321a4c7f56c7bc8a77ad9a +#+system-config.2af15276c7dfedb2903b05d6347e25cc08205c0315b2199ff6c1b7e3a511845c +#+system-config-rc.9bc6fa418216778db5501d6a39ee286d4970c5215f40236503b4417d12d8950b #+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d -#+system-config-init.ef73bc739943077434cc233038b4121fffb52945d93d90ad1780c8564be50085 +#+system-config-init.f2e198b84ce35614f2bd3a6809a4382a44bf907b2e67028aa13b0affdbf55f73 #+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.44901f9fe2aa4f46945135a8e6ded575df91564fe8fe31b4301c7371f950d5dc' \ + 'pthbs_path_containers=/home/ccx/versions/env.eca6d04fad1067c7843bfb97067fd411ab4242bd074c4b7235f76facc18666a7' \ '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.bf4bd3e620511c4f891740a717e7ef3943f63b53f0321a4c7f56c7bc8a77ad9a +#+system-config-rc.9bc6fa418216778db5501d6a39ee286d4970c5215f40236503b4417d12d8950b -s6rcdb=/home/ccx/versions/system-config-rc.bf4bd3e620511c4f891740a717e7ef3943f63b53f0321a4c7f56c7bc8a77ad9a/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.9bc6fa418216778db5501d6a39ee286d4970c5215f40236503b4417d12d8950b/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.7f226c1482f93168a3dce232d8f14361aed43da7b688b26b380d6e7360632331 +#+system-config.2af15276c7dfedb2903b05d6347e25cc08205c0315b2199ff6c1b7e3a511845c def_prefix() { prefix=/home/ccx/versions/$pthbs_package @@ -13,7 +13,7 @@ def_dest() { } def_dest -src=/home/ccx/versions/system-config.7f226c1482f93168a3dce232d8f14361aed43da7b688b26b380d6e7360632331/config/s6-rc-source +src=/home/ccx/versions/system-config.2af15276c7dfedb2903b05d6347e25cc08205c0315b2199ff6c1b7e3a511845c/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.c922ca3bc18165a1b8761dff5fa139b903526a079196ccc16ef5525c7ad8f58a +#+containers.34cde28fd981fe002971ad10e34fd6571ca7924a9c09032f10a9c0488f0bd812 #+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:d19aa9efc8a1dcb952c0465e4317a46f2d05c9a7:containers +#@git:04f721be0f9ee174f5567c6925fe4f68f88f0c07: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.05423df82a3bc2493cc11d87bdad446f40848bd87cbcdb7b91e485c861f4913d +#+containers.551fbb2d009cc200497fb37a29093da904e2aff11e8ac16f8ad9494e6e74c8a0 #+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.05423df82a3bc2493cc11d87bdad446f40848bd87cbcdb7b91e485c861f4913d +#+containers.551fbb2d009cc200497fb37a29093da904e2aff11e8ac16f8ad9494e6e74c8a0 #+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150 #+logincaps.81ffbb96fbc3c630eda5e1bb2249d6691f0fba11821f56c08ce3c42cbf186620 #+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5 @@ -38,8 +38,8 @@ #+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca #+strace.ce1707d2cf1dfcd965827af80a18c6b97ca20b563b8967be8297322e8adf9296 #+mlog.3a2fb37a92813d4c8700d3f9eb95753b0f2b72d5de13f03ba2f52fc0732ac487 -#+system-config.2bd52332adf5e7f91ee9f4a1eb7ab0f64ad0024642210f4b08ec4e0d1e4879a0 -#+system-config-rc.c138f9de30933ee57fa8541e1ad20343f72c78c8be5eaf6166c1c709298d398d +#+system-config.3e7844f83375062060aa400d7374603951754e93f1da253a6fd6340232c4f4b1 +#+system-config-rc.65165141976a589b856198d5de2a4d00498ff483058e19a87bf2da5a510fed7f #+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378 -#+system-config-init.a09e8203c5128bef352b7859dba641728d54900e796a0272dea7a1fe36fab1a9 +#+system-config-init.e177da8dc4a3bd47e4a58407a2c62980fd75bfbf6b3373ba7f4f3ef7b7b83f12 #+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.c2dc38fe31fec69059b96c84b428fd142600682d7546cd9a86f676768c37a999' \ + 'pthbs_path_containers=/versions/env.f17f47d57884d9333cc68e167b24df2ac182e1c10a371a5df108c6e449a2e046' \ '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.c138f9de30933ee57fa8541e1ad20343f72c78c8be5eaf6166c1c709298d398d +#+system-config-rc.65165141976a589b856198d5de2a4d00498ff483058e19a87bf2da5a510fed7f -s6rcdb=/versions/system-config-rc.c138f9de30933ee57fa8541e1ad20343f72c78c8be5eaf6166c1c709298d398d/config/s6-rc-db +s6rcdb=/versions/system-config-rc.65165141976a589b856198d5de2a4d00498ff483058e19a87bf2da5a510fed7f/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.2bd52332adf5e7f91ee9f4a1eb7ab0f64ad0024642210f4b08ec4e0d1e4879a0 +#+system-config.3e7844f83375062060aa400d7374603951754e93f1da253a6fd6340232c4f4b1 def_prefix() { prefix=/versions/$pthbs_package @@ -13,7 +13,7 @@ def_dest() { } def_dest -src=/versions/system-config.2bd52332adf5e7f91ee9f4a1eb7ab0f64ad0024642210f4b08ec4e0d1e4879a0/config/s6-rc-source +src=/versions/system-config.3e7844f83375062060aa400d7374603951754e93f1da253a6fd6340232c4f4b1/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.05423df82a3bc2493cc11d87bdad446f40848bd87cbcdb7b91e485c861f4913d +#+containers.551fbb2d009cc200497fb37a29093da904e2aff11e8ac16f8ad9494e6e74c8a0 #+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150 #+logincaps.81ffbb96fbc3c630eda5e1bb2249d6691f0fba11821f56c08ce3c42cbf186620 #+snaprep.73784e7863284b4cc1597b76b0d869eb2eaaa5eed08245e629937044a2c0c3b5