commit 69900d3d06d1ad3864994f8cdae334e51b0da5de parent c1c065d5085d18a2925f4932d496e37a0421c77b Author: Jan Pobrislo <ccx@te2000.cz> Date: Sat, 3 May 2025 18:07:30 +0000 error-standalone Diffstat:
15 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/templates/pkg/error-standalone b/templates/pkg/error-standalone @@ -4,6 +4,7 @@ #+{{pkg_install_name("gnu-make")}} #+{{pkg_install_name("busybox")}} #+{{pkg_install_name("busybox-diffutils")}} +#@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:. {% include "functions/build_env_static" %} prefix={{versions}}/$pthbs_package diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment @@ -15,4 +15,4 @@ #+getent.497826562f0e3021d114ff3f47654fa0b574041039df71dbc4e509d38fa55447 #+fileset.4e84d6846c9db82c5ad691b8a6b63b6364b367e84f9d1490b0942b3fa28f3737 #+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114 -#+easyseccomp.2163057fd51c5adfe230824d81234e4b1179ffc9fb2995b8f84e90ab5bb9c2b1- \ No newline at end of file +#+easyseccomp.a040b75075e56c8e042cba2a2719ecf937b090252bda41b11c1db4005bc83c36+ \ No newline at end of file diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -36,8 +36,8 @@ #+applyuidgid-caps.9856a13db04a0f0192c4208744de2c649db2ae721dc0d0dd37eb90346236a514 #+ccx-utils.ab28a8d701f60db69818ef22c546d02eca1ba3900bcdeaf5676bcc13d4b7f114 #+user-env.4e95a5387aa403e1d16a22254f21fb4cec046c69341a5eae764dd8126fb638a8 -#+system-config.7ebc106e4582f4fab561f64c1a533f47b7fd9ebb4460292bf0f66397e0aca41f -#+system-config-rc.13595ec665d1d4dcdc1598792014a79309817ae3bbf0a48a9b07ae531f588be1 +#+system-config.91b1f40af0c418d8cceaf284d5e1b1ff2b6352656867513a30e63f16ce113927 +#+system-config-rc.b79ba6be0a6b2717540aafd3f2b3a3369ced2dc87f4c25b4b2750af7591db8cb #+system-config-scripts.bdedb957b96fc1efd8259d16dac786d1d9c220dcde66996a16688989f104925d -#+system-config-init.96ec44a2e04e6cd269fe1c2e0b673545bbf2ab5376fc51d1faf9aa9549999461 +#+system-config-init.6a985c8787177517a879fc3459038dd23f52b594440a2ea5daf13ca7a200947d #+system-config-zsh.250277c1fe17ccb13b5efbacd35ecb3b8342e30910cdd709f89475773bb7f309 \ No newline at end of file diff --git a/variants/ccx-x86_64/easyseccomp b/variants/ccx-x86_64/easyseccomp @@ -7,7 +7,7 @@ #+flex.322ebabc6eba6cdfd84b1b90f25790b8d917035872c2e6bb2f4c8e2f05eabcfd #+bison.1a189980b7909de4d49b57a4821f58147c2cc150fcd4227cb88b63342551a10f #+libseccomp.8b32056ea0458b22266d8fc1b3cce05c82d08282c40a1e56d00d15fa57cdc156 -#+error-standalone.9f10536d3b805197f02026bbbe46036479454464c5368863835b18d8066b3154 +#+error-standalone.b380d044a8fcea86728c750d22f68e3159776bc7f3012d3f4b3d05597c36a7e1 #@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp #@sha256:2804690ae936210ea5d2bfacb94d501c38ad11ffd6f48e04c0611d11fef95321:easyseccomp-configure.tar diff --git a/variants/ccx-x86_64/error-standalone b/variants/ccx-x86_64/error-standalone @@ -3,6 +3,7 @@ #+gnu-make.ba8d7c64a23885182fc1c9dc0331d52adcdbc45df6000fb81e8e1dd3ee05694b #+busybox.ee3440974794767b833fd3299226771f170d3f8601cf225cb884f0a513db8ab3 #+busybox-diffutils.c2ebcfcad050ad71b8e30322a463b5c009f254c7a42e95c627d32665e17134dc +#@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:. build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" 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.b2ab7339658fd521e96e43d80dbf66d57bccd6975ae36a5060b20d6bb4d938f9' \ + 'pthbs_path_containers=/home/ccx/versions/env.b67c52f70b276e12ab37a570fa6b3b2e67b38bb33743e0255478ca958c6d389c' \ '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.13595ec665d1d4dcdc1598792014a79309817ae3bbf0a48a9b07ae531f588be1 +#+system-config-rc.b79ba6be0a6b2717540aafd3f2b3a3369ced2dc87f4c25b4b2750af7591db8cb -s6rcdb=/home/ccx/versions/system-config-rc.13595ec665d1d4dcdc1598792014a79309817ae3bbf0a48a9b07ae531f588be1/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.b79ba6be0a6b2717540aafd3f2b3a3369ced2dc87f4c25b4b2750af7591db8cb/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.7ebc106e4582f4fab561f64c1a533f47b7fd9ebb4460292bf0f66397e0aca41f +#+system-config.91b1f40af0c418d8cceaf284d5e1b1ff2b6352656867513a30e63f16ce113927 def_prefix() { prefix=/home/ccx/versions/$pthbs_package @@ -13,7 +13,7 @@ def_dest() { } def_dest -src=/home/ccx/versions/system-config.7ebc106e4582f4fab561f64c1a533f47b7fd9ebb4460292bf0f66397e0aca41f/config/s6-rc-source +src=/home/ccx/versions/system-config.91b1f40af0c418d8cceaf284d5e1b1ff2b6352656867513a30e63f16ce113927/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/containers.environment b/variants/root-x86_64/containers.environment @@ -15,4 +15,4 @@ #+getent.a4f1c1679ad9e6d4cd167e921ee8af0f7fce4a2b7886f96223b8c7fe1ba5ba97 #+fileset.7159458f5e8c9237e1e1708cafced263dd342d5fd24ccec97ae8092d9b1c5150 #+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac -#+easyseccomp.18a84dbee1df880e8f4cd29d97037e045d04db44d24bd5d4dcf1e3d4df3ff082- \ No newline at end of file +#+easyseccomp.f7851bff8803b9e60c40ca77690b1491aaeebecbbde43c9651b983e69758b80e+ \ No newline at end of file diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -36,8 +36,8 @@ #+applyuidgid-caps.2d571b717bda734b4464e7d3b36bb2c9eaa265fffd595bc090cbb137258121b8 #+ccx-utils.ccaa449ada3142ef075f3c80a6e475520219814490557f308ded4685231a70ac #+user-env.8ad55eebe32b11f005f7b5c6dc204fdccc0a53cd7294f87c1e959ea47793dbca -#+system-config.9597fcb55989a3f3c8d674009b4dbc9227d4ada4f15a4b539077d7eebd120e54 -#+system-config-rc.84cb03d3dd57ef3e177b86a11b95bc8206944d3f134b862720b91b0b3edae933 +#+system-config.cab99083408d330587c039514db530575ee4ffc9bad7fac162e28f7ae4eec8f0 +#+system-config-rc.4d53a563a3e3c2dcc10ed2097ca5b24488bdae2192375d319fb9f198866601c1 #+system-config-scripts.4c00e32b8c4f6feef53b562356abd54830cc7e889149e4f8bcb928d6e6e93378 -#+system-config-init.1a5259344dc55b1cf5ee9e430018821acebbf24f6568c267e4c0865eaf3a907f +#+system-config-init.9980f122b89db9b164cbd1aafd1e9d50246329a26e726321a00cc1d3f7fb9018 #+system-config-zsh.01286ec545c7035b2e08ded96e40b73f912f33fd7eec44993a1e93e12577dc0f \ No newline at end of file diff --git a/variants/root-x86_64/easyseccomp b/variants/root-x86_64/easyseccomp @@ -7,7 +7,7 @@ #+flex.42bdab01fb2083e92a4417d5fb289c468b9a1a5b8092904b965455b74559262f #+bison.d9992ea20119a82e24982f67479e65e94ec0fdc686f024f0ed04e87c83a00ef0 #+libseccomp.cf3861629089b6a01e1499bd0296161802ff4978c7adde69cff19c5c5a568902 -#+error-standalone.a5ea8b95e6edff41df8ce1fd25695a8a8f21cc076dc2eed7112c0e2b58c29178 +#+error-standalone.b683e6ac49f619f0b233ac78431de4860394041bdeb37bb8e75f9a25b6f528bc #@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp #@sha256:2804690ae936210ea5d2bfacb94d501c38ad11ffd6f48e04c0611d11fef95321:easyseccomp-configure.tar diff --git a/variants/root-x86_64/error-standalone b/variants/root-x86_64/error-standalone @@ -3,6 +3,7 @@ #+gnu-make.444e811a68f4f16724e21354b710fad3592e53a2dbf7c0c78658f3d4e7c8e465 #+busybox.f4ef3d511c029095beda8d21dd48f7730bec63fb09792ca951402d6620338089 #+busybox-diffutils.4a0933977737282afcd82b39d435b50946a700fe13472d24e4580a41fa852123 +#@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:. build_env_static() { export LD_LIBRARY_PATH="$pthbs_build_environment/library" 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.2b59584aa83ec38530907a59524422a798b4476687f2b59da33616bfabbb11fa' \ + 'pthbs_path_containers=/versions/env.dfc23809a268c7dee826e4c5536afe9ae89fc9358f0bcc40db29c0c824265dec' \ '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.84cb03d3dd57ef3e177b86a11b95bc8206944d3f134b862720b91b0b3edae933 +#+system-config-rc.4d53a563a3e3c2dcc10ed2097ca5b24488bdae2192375d319fb9f198866601c1 -s6rcdb=/versions/system-config-rc.84cb03d3dd57ef3e177b86a11b95bc8206944d3f134b862720b91b0b3edae933/config/s6-rc-db +s6rcdb=/versions/system-config-rc.4d53a563a3e3c2dcc10ed2097ca5b24488bdae2192375d319fb9f198866601c1/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.9597fcb55989a3f3c8d674009b4dbc9227d4ada4f15a4b539077d7eebd120e54 +#+system-config.cab99083408d330587c039514db530575ee4ffc9bad7fac162e28f7ae4eec8f0 def_prefix() { prefix=/versions/$pthbs_package @@ -13,7 +13,7 @@ def_dest() { } def_dest -src=/versions/system-config.9597fcb55989a3f3c8d674009b4dbc9227d4ada4f15a4b539077d7eebd120e54/config/s6-rc-source +src=/versions/system-config.cab99083408d330587c039514db530575ee4ffc9bad7fac162e28f7ae4eec8f0/config/s6-rc-source s6-rc-compile ./s6-rc-db "$src" mkdir -p "$dest/config" mv -v s6-rc-db "$dest/config/"