commit 9a0fa96d1d8ee78e1ea520ae081a15b40a62872a parent 8f44eac45243bb87f3874af01e932d1402cfd372 Author: Jan Pobrislo <ccx@te2000.cz> Date: Fri, 10 Oct 2025 12:49:10 +0000 misc fixes Diffstat:
49 files changed, 158 insertions(+), 164 deletions(-)
diff --git a/templates/pkg/abduco b/templates/pkg/abduco @@ -8,7 +8,6 @@ {% block configure -%} {% include "functions/build_env_static" %} build_env_static -cd abduco cat >config.mk <<EOF # Any changes made here will be lost if configure is re-run SRCDIR = . diff --git a/templates/pkg/error-standalone b/templates/pkg/error-standalone @@ -8,7 +8,6 @@ {% endblock %} {% block build -%} {% include "functions/build_env_static" %} -cd error-standalone-2.0 {{make}} PREFIX={{versions}}/$pthbs_package \ DESTDIR="$pthbs_destdir" \ INCDIR="$prefix/include" \ diff --git a/templates/pkg/execline b/templates/pkg/execline @@ -1,3 +1,4 @@ +{%- set pkg_source="git" -%} {% extends "skaware" %} {% block install -%} {{ super() -}} diff --git a/templates/pkg/kbd b/templates/pkg/kbd @@ -12,15 +12,11 @@ export LDFLAGS="--static" --disable-nls --disable-vlock --disable-werror --disable-tests \ --datadir="$prefix/data" --datarootdir="$prefix/data" {% endblock %} -{% block install -%} -{{ super() -}} -cd ../destdir -mv -v data ".$prefix/" - -{% endblock %} {% block check -%} check_static command/loadkeys {% endblock %} {% block genlinks_begin %} x["./command/loadkeys"]=1 + x["./data/keymaps/i386/qwerty/cz.map.gz"]=1 + x["./data/keymaps/i386/qwerty/us.map.gz"]=1 {% endblock %} diff --git a/templates/pkg/mdevd b/templates/pkg/mdevd @@ -1,3 +1,4 @@ +{%- set pkg_source="git" -%} {% extends "skaware" %} {% block package_deps -%} #+{{pkg_install_name("execline")}} diff --git a/variants/ccx-x86_64/abduco b/variants/ccx-x86_64/abduco @@ -18,7 +18,6 @@ build_env_static() { export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } build_env_static -cd abduco cat >config.mk <<EOF # Any changes made here will be lost if configure is re-run SRCDIR = . diff --git a/variants/ccx-x86_64/ccx-utils b/variants/ccx-x86_64/ccx-utils @@ -4,7 +4,7 @@ #+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d #+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f #+skalibs.500cbd2c80068c3d59fe0b85c90b24a74f0d4fe177211fbbb452963142f14c59 -#+s6.6c4e76ce647a7a2209a38484fa79ee1c4a03f0b2bcb99ef87ae7c02df0f8b084 +#+s6.9aebdbaa3ea4be56bfc71794f6481b41e3ba7d51eb9db2f3831b1b22334573cf #@git:fae441e25a1ac266742ba6446b37ae56c8e57076:ccx-utils diff --git a/variants/ccx-x86_64/container-bin-image b/variants/ccx-x86_64/container-bin-image @@ -2,13 +2,13 @@ #+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 #+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 #+busybox-login.7805505d57ef3df0f8147298eb7cd667d27866530fdae007f1b90ed20e511d8d -#+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 -#+s6.6c4e76ce647a7a2209a38484fa79ee1c4a03f0b2bcb99ef87ae7c02df0f8b084 -#+ccx-utils.c5928357a87b486399ba68cb01c600d6c08a577156ae2a065d7ec4838351d423 +#+execline.3afd7782c3d41b473c3b053fa738706396ba2fe6eded412c4dff8115dd1c4b36 +#+s6.9aebdbaa3ea4be56bfc71794f6481b41e3ba7d51eb9db2f3831b1b22334573cf +#+ccx-utils.5dad1c5a63eab5475df65ecf920fd4a731c98ff5d7dea34fb90312e3d45b8e13 #+applyuidgid-caps.6beed61c5f64573989a9e745689797ed0f9039ec69bab2b5b6306c2028b542fe -#+easyseccomp.46dac91d4560e81a032da86500bfc24ab337787d24d546b7cfa6b6cc5335c5e7 +#+easyseccomp.1449821ca9a56546d9a54cb7f517bc386916d08db07ff6b9fe245991e41361c6 #+mlog.c84070d774d221a0b227a54128d534959609f1e717cdd0dca461161a43c4e1a4 -#+abduco.d3c963a78ff52e04636f5b8d275331cdf4537aba236e77663ae8d077e9b8c541 +#+abduco.1a8f4b8e5b7edcf3eb996fa4a71424f6e9208089c5ac2b13c7d99a86c9f1f975 #@sha256:b9236c0fd504ffbc56f65d0522d2acadcd2683380eaa6f1873e8201eaa7388a5:default-policy.easyseccomp img="$pthbs_destdir/home/ccx/versions/$pthbs_package/container-bin-image" diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers @@ -3,11 +3,11 @@ #+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f #+zsh.adff89439e677923c0e87543c7279cae1cac203609cbdfb959d19f351ede0b40 #+pthbs-banginstall.21975d3e01147afc4c0efc21c223a55e64a78e16616411eb99f1b6a006784240 -#+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 +#+execline.3afd7782c3d41b473c3b053fa738706396ba2fe6eded412c4dff8115dd1c4b36 #+alpine-keys.5d43a7a9f0d954fd25fa71962b4fa29d51182dc1d69f408dacc4f1be93dfa8cf #+apk-tools.af402b875bdb1e237531811a48a42243c979f64c4872d661dd2a7b56eef61203 #+xbps.97e3cfd2ee9858de0f821dd69925a4f5e002d0578dd836855394af9229f6aed6 -#+container-bin-image.6b07c6e683f1e0b0f2bacb9894efdd836aa1a6f993cda1eb8bf40ebbcb2def6c +#+container-bin-image.1bf4225ab876d65ec49cb845eb7183e9aec6bb4eae22072621f4a7d4e62b7e0e #@git:8ec212c9411088ad7e116e330d6a33f68c539678:containers @@ -62,9 +62,9 @@ for f in '/home/ccx/versions/xbps.97e3cfd2ee9858de0f821dd69925a4f5e002d0578dd836 ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/home/ccx/versions/container-bin-image.6b07c6e683f1e0b0f2bacb9894efdd836aa1a6f993cda1eb8bf40ebbcb2def6c/container-bin-image' -test -f '/home/ccx/versions/container-bin-image.6b07c6e683f1e0b0f2bacb9894efdd836aa1a6f993cda1eb8bf40ebbcb2def6c/container-bin-image/if' -ln -sf '/home/ccx/versions/container-bin-image.6b07c6e683f1e0b0f2bacb9894efdd836aa1a6f993cda1eb8bf40ebbcb2def6c/container-bin-image' "${dest}/deps/" +test -d '/home/ccx/versions/container-bin-image.1bf4225ab876d65ec49cb845eb7183e9aec6bb4eae22072621f4a7d4e62b7e0e/container-bin-image' +test -f '/home/ccx/versions/container-bin-image.1bf4225ab876d65ec49cb845eb7183e9aec6bb4eae22072621f4a7d4e62b7e0e/container-bin-image/if' +ln -sf '/home/ccx/versions/container-bin-image.1bf4225ab876d65ec49cb845eb7183e9aec6bb4eae22072621f4a7d4e62b7e0e/container-bin-image' "${dest}/deps/" diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment @@ -1,18 +1,18 @@ #!/usr/bin/env pthbs-build #+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 #+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 -#+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 -#+s6.6c4e76ce647a7a2209a38484fa79ee1c4a03f0b2bcb99ef87ae7c02df0f8b084 +#+execline.3afd7782c3d41b473c3b053fa738706396ba2fe6eded412c4dff8115dd1c4b36 +#+s6.9aebdbaa3ea4be56bfc71794f6481b41e3ba7d51eb9db2f3831b1b22334573cf #+s6-portable-utils.171f71742faa2f5265177ddf14a06b967498cfee79e6899a4aa6f32023e7b2fd #+s6-linux-utils.2f79d8e46333e4fe48d42109298801446bbfd2e5ad99beef594e0f8ed5efebb0 #+zsh.adff89439e677923c0e87543c7279cae1cac203609cbdfb959d19f351ede0b40 #+confz.d7ee77236608ebb1286a0e6114c46918a81e96ea6d37c29f8bf9ac14f3a09d39 -#+containers.a877f5c856f0e3eafe8c8606ae9152de26054b04206f6df32a0d94aee4ceb9f2 +#+containers.805a749a45ea90f36e33d0a4cd8bc1bbef4d9c016e3d78743b7ba2a960e32b10 #+xbps.97e3cfd2ee9858de0f821dd69925a4f5e002d0578dd836855394af9229f6aed6 #+zstd.60eec0a0fba37da9f688bfffa76d2ec3b0629a7b41cce3fbf7830fe4a21e4af5 #+apk-tools.af402b875bdb1e237531811a48a42243c979f64c4872d661dd2a7b56eef61203 #+alpine-keys.5d43a7a9f0d954fd25fa71962b4fa29d51182dc1d69f408dacc4f1be93dfa8cf #+getent.aefe6654abc4482bdca73bcb0d7edee95a2eae874a4b6024acea75acfaf22bb9 #+fileset.7f773b04cd80b892a577a745fdd430cf38f1dea8b504a313f6d279f28e2c247f -#+ccx-utils.c5928357a87b486399ba68cb01c600d6c08a577156ae2a065d7ec4838351d423 -#+easyseccomp.46dac91d4560e81a032da86500bfc24ab337787d24d546b7cfa6b6cc5335c5e7- \ No newline at end of file +#+ccx-utils.5dad1c5a63eab5475df65ecf920fd4a731c98ff5d7dea34fb90312e3d45b8e13 +#+easyseccomp.1449821ca9a56546d9a54cb7f517bc386916d08db07ff6b9fe245991e41361c6+ \ No newline at end of file diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -7,23 +7,23 @@ #+flex.3ad3990e9165295406d5b4dfbab600bc8baba3835e525792c2f39321ff481625 #+bison.8fd32b35d9fb00cc67891e019e5e74d74090b14a0f9243696333cdfc46324e32 #+rsync.16f5b463a3d013c095155fffb730a41861a95b7d72ac259a287b527f84c992d4 -#+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 -#+s6.6c4e76ce647a7a2209a38484fa79ee1c4a03f0b2bcb99ef87ae7c02df0f8b084 -#+s6-rc.e3be4a113ee9715f7238427bb1ad692d5aa75f52ca7f687a32a3a76a648c708b +#+execline.3afd7782c3d41b473c3b053fa738706396ba2fe6eded412c4dff8115dd1c4b36 +#+s6.9aebdbaa3ea4be56bfc71794f6481b41e3ba7d51eb9db2f3831b1b22334573cf +#+s6-rc.89945b110f2c652eda57d18f78706de19776aeffc483c6701a58169910206f1c #+s6-portable-utils.171f71742faa2f5265177ddf14a06b967498cfee79e6899a4aa6f32023e7b2fd #+s6-linux-utils.2f79d8e46333e4fe48d42109298801446bbfd2e5ad99beef594e0f8ed5efebb0 -#+s6-linux-init.bbb6c6a78dc4aea8e726ad3143233439184ac9564e9e8b3210b0eabf9e7f8238 -#+mdevd.26ce383b5715db033c9cd3707798a7c1ce1f9056caf987bab46bd4586fceca7a +#+s6-linux-init.76c6a9500e708198655c4afd3f770fdab2729859fa7667deb57b112d87478f43 +#+mdevd.dffda5a654618a0903357d319b6cfe0cfdb8f3b37bda65878809a8a6461e8f35 #+s6-dns.1db2b68f9b71a747f03b48b5f25ec094ece473653bb122d9bcf75ddf932a4ca5 #+libressl.b3844633a4825247b8979b715e1fd1d3507a727aed4772c866694a5020ddc6e9 -#+s6-networking.4d2b3dac0831feebaec6dfc2fd54aa388bb65ed6c8d1526fdf286cecf608763b +#+s6-networking.c59c0a1300d363db26b7dfdc0149cb4dd02c3f8e82bcce412fedc990a529aa52 #+zsh.adff89439e677923c0e87543c7279cae1cac203609cbdfb959d19f351ede0b40 #+pthbs-banginstall.21975d3e01147afc4c0efc21c223a55e64a78e16616411eb99f1b6a006784240 #+aat.fb06e78a9b8c1bbae1065e2663c52d2770c362765a4aa4e2800c9bceab61d97f #+confz.d7ee77236608ebb1286a0e6114c46918a81e96ea6d37c29f8bf9ac14f3a09d39 -#+containers.a877f5c856f0e3eafe8c8606ae9152de26054b04206f6df32a0d94aee4ceb9f2 +#+containers.805a749a45ea90f36e33d0a4cd8bc1bbef4d9c016e3d78743b7ba2a960e32b10 #+fileset.7f773b04cd80b892a577a745fdd430cf38f1dea8b504a313f6d279f28e2c247f -#+logincaps.2657a78b59801044237361ee333b4f9bf533f5f845f0aab75388848000dec1b4 +#+logincaps.ef116169b86c717ef45be166bdadcee3d4724d477ea6893370bb969309d0d29c #+snaprep.ddba28cca63c5a50ae9c9dcc69929c45bec505ac626f64dc02e3ebe7322f6b5d #+curl.3167e593223472f7860604fb1488c3cc02c72a5e2f9feba2ffeb8587c3b9315b #+git.bef266ed9d689ca898ca42e8e4a10d40c9f4b4e03a59d3c96b9888e31390acd3 @@ -34,12 +34,12 @@ #+iconv.65ca192b9653738231bbbcf730dea15b4af7ef94528c85399496fb065a555251 #+libcap.67b33f3acf82937e9b968890011269d9f83a00d2d6aef120510d2dc017ff0606 #+applyuidgid-caps.6beed61c5f64573989a9e745689797ed0f9039ec69bab2b5b6306c2028b542fe -#+ccx-utils.c5928357a87b486399ba68cb01c600d6c08a577156ae2a065d7ec4838351d423 -#+user-env.86df1fabffc5a08d7d3251e9b766d68d7c062965331f31f02dc83d7ad02d9b1c +#+ccx-utils.5dad1c5a63eab5475df65ecf920fd4a731c98ff5d7dea34fb90312e3d45b8e13 +#+user-env.4becd3d8b7ec6ca46a7ad940304ea1a5eafc0aa20f6257fc2075a89cc8d9aa4a #+strace.0e646991d4821d32b7816544a23a351bf463055f31e02975d4c01cde4b96e921 #+mlog.c84070d774d221a0b227a54128d534959609f1e717cdd0dca461161a43c4e1a4 -#+system-config.7edd5e7027b8de5db27491a0588a0787162b6a5d5112bd93b722f920b5d4c04c -#+system-config-rc.5098cc0d19cf418650f0c9aa533647025b4a8d8998daaceaea5fd0408635d64b +#+system-config.6dbf6362644e491daf335c7219ed2893a8f65c6cc1b75f0c4ad096ae7987ddea +#+system-config-rc.9b2eab6f10b6596975419020d886d8c17a7e91750bb9b7afde44a26f54428927 #+system-config-scripts.fcef84fd59fa5985e841d72a33de16a69f2836f3fa033887b6995a5b355580d2 -#+system-config-init.88f0f64d3e78a86fe044ff6d1df3251e931f4b315bf8f9aa13e75b10f8e4657e +#+system-config-init.556206f7c0fb65aa1848e42be287b133d421058cf1175c48a8f3c03f11fadc7a #+system-config-zsh.c9f9132c6ed96f4962c8fef62d869912f35683f6d13811b395378849dce2174d \ No newline at end of file diff --git a/variants/ccx-x86_64/easyseccomp b/variants/ccx-x86_64/easyseccomp @@ -9,7 +9,7 @@ #+flex.3ad3990e9165295406d5b4dfbab600bc8baba3835e525792c2f39321ff481625 #+bison.8fd32b35d9fb00cc67891e019e5e74d74090b14a0f9243696333cdfc46324e32 #+libseccomp.267f64baf6b5faef596f4fe17cad264dab49376762033568ddc95b91f5cf754b -#+error-standalone.bb6d2a9b493e90127a91560270f5a14627bb1531126918fc5a3e5865ab31e240 +#+error-standalone.2e1ab0bf659abccaa1ce90647f0ff12788686c98f237f4435c5ea6436364cc98 #+argp-standalone.3e077a701fbfcefd88d94218d6be6d99c353c4d11ad353550d09511d3646ee19 #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp #@sha256:eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10:easyseccomp_fix_includes.patch diff --git a/variants/ccx-x86_64/error-standalone b/variants/ccx-x86_64/error-standalone @@ -18,7 +18,6 @@ build_env_static() { export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } -cd error-standalone-2.0 make -j${JOBS:-1} -l$((1+${JOBS:-1})) PREFIX=/home/ccx/versions/$pthbs_package \ DESTDIR="$pthbs_destdir" \ INCDIR="$prefix/include" \ diff --git a/variants/ccx-x86_64/execline b/variants/ccx-x86_64/execline @@ -4,6 +4,7 @@ #+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d #+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f #+skalibs.500cbd2c80068c3d59fe0b85c90b24a74f0d4fe177211fbbb452963142f14c59 +#@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline # - build script start - diff --git a/variants/ccx-x86_64/kbd b/variants/ccx-x86_64/kbd @@ -70,9 +70,6 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) make DESTDIR="$pthbs_destdir" install -cd ../destdir -mv -v data ".$prefix/" - check_static command/loadkeys @@ -81,6 +78,8 @@ cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { x["./command/loadkeys"]=1 + x["./data/keymaps/i386/qwerty/cz.map.gz"]=1 + x["./data/keymaps/i386/qwerty/us.map.gz"]=1 } function r1(s) { diff --git a/variants/ccx-x86_64/logincaps b/variants/ccx-x86_64/logincaps @@ -3,9 +3,9 @@ #+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f #+zsh.adff89439e677923c0e87543c7279cae1cac203609cbdfb959d19f351ede0b40 #+pthbs-banginstall.21975d3e01147afc4c0efc21c223a55e64a78e16616411eb99f1b6a006784240 -#+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 +#+execline.3afd7782c3d41b473c3b053fa738706396ba2fe6eded412c4dff8115dd1c4b36 #+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d -#+ccx-utils.c5928357a87b486399ba68cb01c600d6c08a577156ae2a065d7ec4838351d423 +#+ccx-utils.5dad1c5a63eab5475df65ecf920fd4a731c98ff5d7dea34fb90312e3d45b8e13 # - build script start - diff --git a/variants/ccx-x86_64/mdevd b/variants/ccx-x86_64/mdevd @@ -4,7 +4,8 @@ #+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d #+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f #+skalibs.500cbd2c80068c3d59fe0b85c90b24a74f0d4fe177211fbbb452963142f14c59 -#+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 +#+execline.3afd7782c3d41b473c3b053fa738706396ba2fe6eded412c4dff8115dd1c4b36 +#@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd # - build script start - diff --git a/variants/ccx-x86_64/mdevd.environment b/variants/ccx-x86_64/mdevd.environment @@ -1,6 +1,6 @@ #!/usr/bin/env pthbs-build #+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 -#+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 -#+s6.6c4e76ce647a7a2209a38484fa79ee1c4a03f0b2bcb99ef87ae7c02df0f8b084 +#+execline.3afd7782c3d41b473c3b053fa738706396ba2fe6eded412c4dff8115dd1c4b36 +#+s6.9aebdbaa3ea4be56bfc71794f6481b41e3ba7d51eb9db2f3831b1b22334573cf #+mdev-scripts.be82e7f53aa6e6c0f9e0163205505b70d20a42995ca53848c5ff6b2bfad99573 -#+mdevd.26ce383b5715db033c9cd3707798a7c1ce1f9056caf987bab46bd4586fceca7a- \ No newline at end of file +#+mdevd.dffda5a654618a0903357d319b6cfe0cfdb8f3b37bda65878809a8a6461e8f35+ \ No newline at end of file diff --git a/variants/ccx-x86_64/s6 b/variants/ccx-x86_64/s6 @@ -4,7 +4,7 @@ #+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d #+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f #+skalibs.500cbd2c80068c3d59fe0b85c90b24a74f0d4fe177211fbbb452963142f14c59 -#+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 +#+execline.3afd7782c3d41b473c3b053fa738706396ba2fe6eded412c4dff8115dd1c4b36 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6 diff --git a/variants/ccx-x86_64/s6-linux-init b/variants/ccx-x86_64/s6-linux-init @@ -4,8 +4,8 @@ #+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d #+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f #+skalibs.500cbd2c80068c3d59fe0b85c90b24a74f0d4fe177211fbbb452963142f14c59 -#+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 -#+s6.6c4e76ce647a7a2209a38484fa79ee1c4a03f0b2bcb99ef87ae7c02df0f8b084 +#+execline.3afd7782c3d41b473c3b053fa738706396ba2fe6eded412c4dff8115dd1c4b36 +#+s6.9aebdbaa3ea4be56bfc71794f6481b41e3ba7d51eb9db2f3831b1b22334573cf #@git:b298e515efe16210048e504e3aec89ea1e627b73:s6-linux-init diff --git a/variants/ccx-x86_64/s6-networking b/variants/ccx-x86_64/s6-networking @@ -4,8 +4,8 @@ #+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d #+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f #+skalibs.500cbd2c80068c3d59fe0b85c90b24a74f0d4fe177211fbbb452963142f14c59 -#+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 -#+s6.6c4e76ce647a7a2209a38484fa79ee1c4a03f0b2bcb99ef87ae7c02df0f8b084 +#+execline.3afd7782c3d41b473c3b053fa738706396ba2fe6eded412c4dff8115dd1c4b36 +#+s6.9aebdbaa3ea4be56bfc71794f6481b41e3ba7d51eb9db2f3831b1b22334573cf #+s6-dns.1db2b68f9b71a747f03b48b5f25ec094ece473653bb122d9bcf75ddf932a4ca5 #+libressl.b3844633a4825247b8979b715e1fd1d3507a727aed4772c866694a5020ddc6e9 #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking diff --git a/variants/ccx-x86_64/s6-rc b/variants/ccx-x86_64/s6-rc @@ -4,8 +4,8 @@ #+musl-cross-make.ea4e06b73c6978e26c0153af12c44d0e98637c2befed5ff4de04206e8eeaf36d #+gnu-make.7fe4e022ff609d39bb1dafd331b36d1fb50b5ad6891d5fcff58cf9f423c0631f #+skalibs.500cbd2c80068c3d59fe0b85c90b24a74f0d4fe177211fbbb452963142f14c59 -#+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 -#+s6.6c4e76ce647a7a2209a38484fa79ee1c4a03f0b2bcb99ef87ae7c02df0f8b084 +#+execline.3afd7782c3d41b473c3b053fa738706396ba2fe6eded412c4dff8115dd1c4b36 +#+s6.9aebdbaa3ea4be56bfc71794f6481b41e3ba7d51eb9db2f3831b1b22334573cf #@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config @@ -6,15 +6,15 @@ #+aat.fb06e78a9b8c1bbae1065e2663c52d2770c362765a4aa4e2800c9bceab61d97f #+fileset.7f773b04cd80b892a577a745fdd430cf38f1dea8b504a313f6d279f28e2c247f #+rsync.16f5b463a3d013c095155fffb730a41861a95b7d72ac259a287b527f84c992d4 -#+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 -#+kbd.36a5479f7570bf993240d126c8210b64c51406cd417b531e06d986674fcb6b0f -#+mdevd.26ce383b5715db033c9cd3707798a7c1ce1f9056caf987bab46bd4586fceca7a +#+execline.3afd7782c3d41b473c3b053fa738706396ba2fe6eded412c4dff8115dd1c4b36 +#+kbd.20aa24aca93c1af5c2d6441d06abf014ac843350302d30e8dc9cc32be4937fcd +#+mdevd.dffda5a654618a0903357d319b6cfe0cfdb8f3b37bda65878809a8a6461e8f35 #+s6-linux-utils.2f79d8e46333e4fe48d42109298801446bbfd2e5ad99beef594e0f8ed5efebb0 -#+s6-rc.e3be4a113ee9715f7238427bb1ad692d5aa75f52ca7f687a32a3a76a648c708b -#+s6.6c4e76ce647a7a2209a38484fa79ee1c4a03f0b2bcb99ef87ae7c02df0f8b084 +#+s6-rc.89945b110f2c652eda57d18f78706de19776aeffc483c6701a58169910206f1c +#+s6.9aebdbaa3ea4be56bfc71794f6481b41e3ba7d51eb9db2f3831b1b22334573cf #+zsh.adff89439e677923c0e87543c7279cae1cac203609cbdfb959d19f351ede0b40 #+system-config-scripts.fcef84fd59fa5985e841d72a33de16a69f2836f3fa033887b6995a5b355580d2 -#+logincaps.2657a78b59801044237361ee333b4f9bf533f5f845f0aab75388848000dec1b4 +#+logincaps.ef116169b86c717ef45be166bdadcee3d4724d477ea6893370bb969309d0d29c #@git:cdeb78362ceacd8087b1d04ef26573cb115b7844:system-config @@ -50,8 +50,8 @@ 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.75c4f07e85f49100f547b8a0523927092bf3ac5af1b550eefec5f1ca45cb2f1b' \ - 'pthbs_path_mdevd=/home/ccx/versions/env.30496f67fe2b41d2e3beb270ac5306c5f8a86dd9f1d7ed61ebe69343c1b0497b' \ + 'pthbs_path_containers=/home/ccx/versions/env.befa7388ad7190083636010d2721b212dafeb4d1b3e1bf066568daa484ddbaaf' \ + 'pthbs_path_mdevd=/home/ccx/versions/env.e77b8f1e32d086c0857176e713ad56d31c9909083cc9a1570b8fce1332a2ed00' \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) all sort -u build/execfile | while IFS= read exename; do diff --git a/variants/ccx-x86_64/system-config-init b/variants/ccx-x86_64/system-config-init @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build #+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 #+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f -#+s6.6c4e76ce647a7a2209a38484fa79ee1c4a03f0b2bcb99ef87ae7c02df0f8b084 -#+s6-rc.e3be4a113ee9715f7238427bb1ad692d5aa75f52ca7f687a32a3a76a648c708b +#+s6.9aebdbaa3ea4be56bfc71794f6481b41e3ba7d51eb9db2f3831b1b22334573cf +#+s6-rc.89945b110f2c652eda57d18f78706de19776aeffc483c6701a58169910206f1c #+s6-portable-utils.171f71742faa2f5265177ddf14a06b967498cfee79e6899a4aa6f32023e7b2fd -#+s6-linux-init.bbb6c6a78dc4aea8e726ad3143233439184ac9564e9e8b3210b0eabf9e7f8238 -#+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 -#+system-config-rc.5098cc0d19cf418650f0c9aa533647025b4a8d8998daaceaea5fd0408635d64b +#+s6-linux-init.76c6a9500e708198655c4afd3f770fdab2729859fa7667deb57b112d87478f43 +#+execline.3afd7782c3d41b473c3b053fa738706396ba2fe6eded412c4dff8115dd1c4b36 +#+system-config-rc.9b2eab6f10b6596975419020d886d8c17a7e91750bb9b7afde44a26f54428927 # - build script start - @@ -29,7 +29,7 @@ qx() { # register executable as dependency and quote full path to be suitable f "s6-quote" "$prefix/deps/command/$name" } -s6rcdb=/home/ccx/versions/system-config-rc.5098cc0d19cf418650f0c9aa533647025b4a8d8998daaceaea5fd0408635d64b/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.9b2eab6f10b6596975419020d886d8c17a7e91750bb9b7afde44a26f54428927/config/s6-rc-db # Generate init (${dest} must not exist but parent dir does) mkdir -p "$pthbs_destdir//home/ccx/versions" diff --git a/variants/ccx-x86_64/system-config-rc b/variants/ccx-x86_64/system-config-rc @@ -2,9 +2,9 @@ #+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 #+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f #+busybox-diffutils.9a43e1944cb3246bc5ca398713f7adbac8ffac9ffa5164a21ac475570f161ba4 -#+s6-rc.e3be4a113ee9715f7238427bb1ad692d5aa75f52ca7f687a32a3a76a648c708b +#+s6-rc.89945b110f2c652eda57d18f78706de19776aeffc483c6701a58169910206f1c #+fileset.7f773b04cd80b892a577a745fdd430cf38f1dea8b504a313f6d279f28e2c247f -#+system-config.7edd5e7027b8de5db27491a0588a0787162b6a5d5112bd93b722f920b5d4c04c +#+system-config.6dbf6362644e491daf335c7219ed2893a8f65c6cc1b75f0c4ad096ae7987ddea # - build script start - @@ -13,7 +13,7 @@ dest=${pthbs_destdir%/}${prefix} cd 'system-config-rc' -src=/home/ccx/versions/system-config.7edd5e7027b8de5db27491a0588a0787162b6a5d5112bd93b722f920b5d4c04c/config/s6-rc-source +src=/home/ccx/versions/system-config.6dbf6362644e491daf335c7219ed2893a8f65c6cc1b75f0c4ad096ae7987ddea/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/user-env b/variants/ccx-x86_64/user-env @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build #+busybox.798bd27373ec9f23a95335941c032ae376301197bc71ac8ceba389794f4ddce1 #+busybox-findutils.2994bf082af271e1e0dbbefa5d62f79d6b2e427c7e60a26007dcd66d2306193f -#+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 +#+execline.3afd7782c3d41b473c3b053fa738706396ba2fe6eded412c4dff8115dd1c4b36 #+pthbs-banginstall.21975d3e01147afc4c0efc21c223a55e64a78e16616411eb99f1b6a006784240 #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment @@ -7,23 +7,23 @@ #+flex.3ad3990e9165295406d5b4dfbab600bc8baba3835e525792c2f39321ff481625 #+bison.8fd32b35d9fb00cc67891e019e5e74d74090b14a0f9243696333cdfc46324e32 #+rsync.16f5b463a3d013c095155fffb730a41861a95b7d72ac259a287b527f84c992d4 -#+execline.285afcb63cb4476e6ccdcf136640557d679725924a47072594295fe811758fd1 -#+s6.6c4e76ce647a7a2209a38484fa79ee1c4a03f0b2bcb99ef87ae7c02df0f8b084 -#+s6-rc.e3be4a113ee9715f7238427bb1ad692d5aa75f52ca7f687a32a3a76a648c708b +#+execline.3afd7782c3d41b473c3b053fa738706396ba2fe6eded412c4dff8115dd1c4b36 +#+s6.9aebdbaa3ea4be56bfc71794f6481b41e3ba7d51eb9db2f3831b1b22334573cf +#+s6-rc.89945b110f2c652eda57d18f78706de19776aeffc483c6701a58169910206f1c #+s6-portable-utils.171f71742faa2f5265177ddf14a06b967498cfee79e6899a4aa6f32023e7b2fd #+s6-linux-utils.2f79d8e46333e4fe48d42109298801446bbfd2e5ad99beef594e0f8ed5efebb0 -#+s6-linux-init.bbb6c6a78dc4aea8e726ad3143233439184ac9564e9e8b3210b0eabf9e7f8238 -#+mdevd.26ce383b5715db033c9cd3707798a7c1ce1f9056caf987bab46bd4586fceca7a +#+s6-linux-init.76c6a9500e708198655c4afd3f770fdab2729859fa7667deb57b112d87478f43 +#+mdevd.dffda5a654618a0903357d319b6cfe0cfdb8f3b37bda65878809a8a6461e8f35 #+s6-dns.1db2b68f9b71a747f03b48b5f25ec094ece473653bb122d9bcf75ddf932a4ca5 #+libressl.b3844633a4825247b8979b715e1fd1d3507a727aed4772c866694a5020ddc6e9 -#+s6-networking.4d2b3dac0831feebaec6dfc2fd54aa388bb65ed6c8d1526fdf286cecf608763b +#+s6-networking.c59c0a1300d363db26b7dfdc0149cb4dd02c3f8e82bcce412fedc990a529aa52 #+zsh.adff89439e677923c0e87543c7279cae1cac203609cbdfb959d19f351ede0b40 #+pthbs-banginstall.21975d3e01147afc4c0efc21c223a55e64a78e16616411eb99f1b6a006784240 #+aat.fb06e78a9b8c1bbae1065e2663c52d2770c362765a4aa4e2800c9bceab61d97f #+confz.d7ee77236608ebb1286a0e6114c46918a81e96ea6d37c29f8bf9ac14f3a09d39 -#+containers.a877f5c856f0e3eafe8c8606ae9152de26054b04206f6df32a0d94aee4ceb9f2 +#+containers.805a749a45ea90f36e33d0a4cd8bc1bbef4d9c016e3d78743b7ba2a960e32b10 #+fileset.7f773b04cd80b892a577a745fdd430cf38f1dea8b504a313f6d279f28e2c247f -#+logincaps.2657a78b59801044237361ee333b4f9bf533f5f845f0aab75388848000dec1b4 +#+logincaps.ef116169b86c717ef45be166bdadcee3d4724d477ea6893370bb969309d0d29c #+snaprep.ddba28cca63c5a50ae9c9dcc69929c45bec505ac626f64dc02e3ebe7322f6b5d #+curl.3167e593223472f7860604fb1488c3cc02c72a5e2f9feba2ffeb8587c3b9315b #+git.bef266ed9d689ca898ca42e8e4a10d40c9f4b4e03a59d3c96b9888e31390acd3 @@ -34,7 +34,7 @@ #+iconv.65ca192b9653738231bbbcf730dea15b4af7ef94528c85399496fb065a555251 #+libcap.67b33f3acf82937e9b968890011269d9f83a00d2d6aef120510d2dc017ff0606 #+applyuidgid-caps.6beed61c5f64573989a9e745689797ed0f9039ec69bab2b5b6306c2028b542fe -#+ccx-utils.c5928357a87b486399ba68cb01c600d6c08a577156ae2a065d7ec4838351d423 -#+user-env.86df1fabffc5a08d7d3251e9b766d68d7c062965331f31f02dc83d7ad02d9b1c +#+ccx-utils.5dad1c5a63eab5475df65ecf920fd4a731c98ff5d7dea34fb90312e3d45b8e13 +#+user-env.4becd3d8b7ec6ca46a7ad940304ea1a5eafc0aa20f6257fc2075a89cc8d9aa4a #+strace.0e646991d4821d32b7816544a23a351bf463055f31e02975d4c01cde4b96e921 #+mlog.c84070d774d221a0b227a54128d534959609f1e717cdd0dca461161a43c4e1a4 \ No newline at end of file diff --git a/variants/root-x86_64/abduco b/variants/root-x86_64/abduco @@ -18,7 +18,6 @@ build_env_static() { export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } build_env_static -cd abduco cat >config.mk <<EOF # Any changes made here will be lost if configure is re-run SRCDIR = . diff --git a/variants/root-x86_64/ccx-utils b/variants/root-x86_64/ccx-utils @@ -4,7 +4,7 @@ #+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c #+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 #+skalibs.7de9cd74b9841db262163606f6dbef8ab49126ca21e8c844d449411723b81e0b -#+s6.2290e63355d4db5c6cee94a250cd93058660b9aab8c86588b66e558d299c7167 +#+s6.69f9d35e36b1285780daadab9500b90d3ffb4547ffbd905bced35808e5044235 #@git:fae441e25a1ac266742ba6446b37ae56c8e57076:ccx-utils diff --git a/variants/root-x86_64/container-bin-image b/variants/root-x86_64/container-bin-image @@ -2,13 +2,13 @@ #+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 #+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 #+busybox-login.137587e982688716b741fc648c84c8709882bef338d27d5e53ddefedb373ba9b -#+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 -#+s6.2290e63355d4db5c6cee94a250cd93058660b9aab8c86588b66e558d299c7167 -#+ccx-utils.44f8a3d6ec19d6da0bfbfdf73577bebedb8c6f046fb105609138bf59794b7d87 +#+execline.1db2d6fe3c17cd5bb10638dc304fbe790504f84d3bc899cc2e38ac5c688cf495 +#+s6.69f9d35e36b1285780daadab9500b90d3ffb4547ffbd905bced35808e5044235 +#+ccx-utils.7bdee00caa13b108c920bb1729519c64086625746fe377885c8a27011979f56f #+applyuidgid-caps.24cd678aacaa2c4656769739da05cf6630b2175b79bcba193b2c89cde34acabc -#+easyseccomp.520e49deae166e5d575fae91ba142bddcaed4282bd27a7d4aa152d8b022cab0d +#+easyseccomp.c6a3cea79e610b72f60184a5202a4659051d79a32a42afd410921841fd531fd8 #+mlog.f6e876fbff20d311c177432ca821cc33b98f205d343105aa37ef81d40fdf1bc0 -#+abduco.cb1ff92df788b2fdd674286b7aee6712b1ca36bc4f312d5fa1aa8eb24f7d3058 +#+abduco.127eb177038bbb3b97f35c570525df999ce3e27a05df19bd4bd581f30bc28a38 #@sha256:b9236c0fd504ffbc56f65d0522d2acadcd2683380eaa6f1873e8201eaa7388a5:default-policy.easyseccomp img="$pthbs_destdir/versions/$pthbs_package/container-bin-image" diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers @@ -3,11 +3,11 @@ #+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 #+zsh.01a31d86cd787f4ac02a6e672a26990184f9a7994a6daeac7197b37447ce273a #+pthbs-banginstall.c778079de6b3c448b7670c1d09474bfecbd64658c11e75734cf48a85196ca318 -#+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 +#+execline.1db2d6fe3c17cd5bb10638dc304fbe790504f84d3bc899cc2e38ac5c688cf495 #+alpine-keys.8fcbad8520af4e46aeb6560fe86202e9cd8ade32b7f4909df4283bdf8a98f03f #+apk-tools.43e2773cf7ba7947227a50224c4114cb2e90725e5ce677ef15ca88549c317518 #+xbps.d9fb16a1353ddd5f037638875faa46ddb6980fcdc62ba298078fba8a3218fe8b -#+container-bin-image.9d13c0804a78327340af74b59c41e1d2be51373014f2ab22f462c383ce66379e +#+container-bin-image.1b7d482aaf67c0da8f00256c9a397cd0b95260145bad431cb5aeb77a9349641a #@git:8ec212c9411088ad7e116e330d6a33f68c539678:containers @@ -62,9 +62,9 @@ for f in '/versions/xbps.d9fb16a1353ddd5f037638875faa46ddb6980fcdc62ba298078fba8 ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/versions/container-bin-image.9d13c0804a78327340af74b59c41e1d2be51373014f2ab22f462c383ce66379e/container-bin-image' -test -f '/versions/container-bin-image.9d13c0804a78327340af74b59c41e1d2be51373014f2ab22f462c383ce66379e/container-bin-image/if' -ln -sf '/versions/container-bin-image.9d13c0804a78327340af74b59c41e1d2be51373014f2ab22f462c383ce66379e/container-bin-image' "${dest}/deps/" +test -d '/versions/container-bin-image.1b7d482aaf67c0da8f00256c9a397cd0b95260145bad431cb5aeb77a9349641a/container-bin-image' +test -f '/versions/container-bin-image.1b7d482aaf67c0da8f00256c9a397cd0b95260145bad431cb5aeb77a9349641a/container-bin-image/if' +ln -sf '/versions/container-bin-image.1b7d482aaf67c0da8f00256c9a397cd0b95260145bad431cb5aeb77a9349641a/container-bin-image' "${dest}/deps/" diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment @@ -1,18 +1,18 @@ #!/usr/bin/env pthbs-build #+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 #+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 -#+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 -#+s6.2290e63355d4db5c6cee94a250cd93058660b9aab8c86588b66e558d299c7167 +#+execline.1db2d6fe3c17cd5bb10638dc304fbe790504f84d3bc899cc2e38ac5c688cf495 +#+s6.69f9d35e36b1285780daadab9500b90d3ffb4547ffbd905bced35808e5044235 #+s6-portable-utils.02a66968f0ac9c69d31491a4172e24ef37cab78fc968d5a75e46a1dcf0a588a9 #+s6-linux-utils.37b19062018cb44159d0c2b2e08b3e098134c767810ef243455abaffe4c48bf2 #+zsh.01a31d86cd787f4ac02a6e672a26990184f9a7994a6daeac7197b37447ce273a #+confz.bc3491bab75ab7de12e29d4614347f3b3c90b4987012c5817284775b89f46ff6 -#+containers.3090ac7a65c9eb7d978cafb5c4ac2687b0bdd48fd4ddc3268d0df6cb36597af8 +#+containers.1f250f4db0ebd2ece0064231ce5bc891819a587c7ebe89af1086766bd3fb8181 #+xbps.d9fb16a1353ddd5f037638875faa46ddb6980fcdc62ba298078fba8a3218fe8b #+zstd.c0b8bcba8a27ce5d349790a9588c0d5e3a0668658b31f3fee630eead62d7a22a #+apk-tools.43e2773cf7ba7947227a50224c4114cb2e90725e5ce677ef15ca88549c317518 #+alpine-keys.8fcbad8520af4e46aeb6560fe86202e9cd8ade32b7f4909df4283bdf8a98f03f #+getent.07cccc7d53d18bc3cd261612d999cd6c6deb16f40960670899606e9044b9f440 #+fileset.215ca6d3fbfb730899911dffa91b92bbd8391f14b7639a6d0b37620d26e7f1ca -#+ccx-utils.44f8a3d6ec19d6da0bfbfdf73577bebedb8c6f046fb105609138bf59794b7d87 -#+easyseccomp.520e49deae166e5d575fae91ba142bddcaed4282bd27a7d4aa152d8b022cab0d- \ No newline at end of file +#+ccx-utils.7bdee00caa13b108c920bb1729519c64086625746fe377885c8a27011979f56f +#+easyseccomp.c6a3cea79e610b72f60184a5202a4659051d79a32a42afd410921841fd531fd8+ \ No newline at end of file diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -7,23 +7,23 @@ #+flex.2237e4fdd5678fbacfef665fa1fb964ee62e1e45ab29f32a086629be17ed9001 #+bison.5fbd30012053f464c156e0c0b0fa4b59be176d9525cdd25f792ddfaad1176c84 #+rsync.15768ca4cc994c0627852b75c6f443143aab4fee22b435b6b2d0d42534d7a67c -#+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 -#+s6.2290e63355d4db5c6cee94a250cd93058660b9aab8c86588b66e558d299c7167 -#+s6-rc.3790f2b77a5785fe78e78d0ae8f036fd8e6bdd70af979ba1cd752668ae29be82 +#+execline.1db2d6fe3c17cd5bb10638dc304fbe790504f84d3bc899cc2e38ac5c688cf495 +#+s6.69f9d35e36b1285780daadab9500b90d3ffb4547ffbd905bced35808e5044235 +#+s6-rc.381640321c73bc524e2e9805c9603ad20df7187baf15ae128975292c83e7ab25 #+s6-portable-utils.02a66968f0ac9c69d31491a4172e24ef37cab78fc968d5a75e46a1dcf0a588a9 #+s6-linux-utils.37b19062018cb44159d0c2b2e08b3e098134c767810ef243455abaffe4c48bf2 -#+s6-linux-init.676e77c29e34f95108eb83ef131a78de5afa7ae0f27fecbf504d43e0d8d0d30d -#+mdevd.c2e962ba272a196b1798c2eab73f2bd1b69b168f897e72e9be3e30bef0e8d985 +#+s6-linux-init.b4b9e32bbfdd8be3e1ed78e3ad1ff367c8c837e5bead0b35016e5a49da9bd345 +#+mdevd.c2a33d2ee21d94bcced8900c89eced694475de7041e7daf6dcfd093101930c63 #+s6-dns.2a3e90f799cebf15491101cc0b1ba2a0bdc9f68320e02943cfcd4a873fb036fb #+libressl.ecd089b63222b6d2d8574961d0d10ba37071baa6bfaa1d38f1b369ece8f2ad56 -#+s6-networking.21545d4266a2511310b06c5f878f7576cc8962dd50c858d110527012502d3346 +#+s6-networking.3f005e48f5b3e9816960bb8870745ac4f5dcfa74a41eecc38a7eafc7ad39fb8d #+zsh.01a31d86cd787f4ac02a6e672a26990184f9a7994a6daeac7197b37447ce273a #+pthbs-banginstall.c778079de6b3c448b7670c1d09474bfecbd64658c11e75734cf48a85196ca318 #+aat.c744ec67755ae2988d0e53158520de7272fa0f0e7ecbd44b71559c26910bd6f8 #+confz.bc3491bab75ab7de12e29d4614347f3b3c90b4987012c5817284775b89f46ff6 -#+containers.3090ac7a65c9eb7d978cafb5c4ac2687b0bdd48fd4ddc3268d0df6cb36597af8 +#+containers.1f250f4db0ebd2ece0064231ce5bc891819a587c7ebe89af1086766bd3fb8181 #+fileset.215ca6d3fbfb730899911dffa91b92bbd8391f14b7639a6d0b37620d26e7f1ca -#+logincaps.158f87e6162f9cce62abc68cc28e3343da75cb19847c4232b82024c607dce35f +#+logincaps.3552e31f24421fb26e2ce6f5f703fd6f2d080f5546dc582e5f6eec287051072c #+snaprep.dd3c4d7374997842d23ff11c496cc9d0705df5acb6ea6511c68a3e95f6bff366 #+curl.4898b6941dbebfff9a3119566095d23d24cc9bcdd13e2beece1211fcae207056 #+git.1d648ddad55a0190c53a630cfc504c519ef574e1d83516298a50b9fe5d7c9b85 @@ -34,12 +34,12 @@ #+iconv.627703e7d8f5928e9511b059673537dae3002569c513393b42a94911f7228219 #+libcap.a01b94d3158cbf92ee91d53dea8626b351230aabfb46fb3479f7851cf6c30f3c #+applyuidgid-caps.24cd678aacaa2c4656769739da05cf6630b2175b79bcba193b2c89cde34acabc -#+ccx-utils.44f8a3d6ec19d6da0bfbfdf73577bebedb8c6f046fb105609138bf59794b7d87 -#+user-env.8d98c43570fddf00ddbb256796b8ac2abf78872f674b48e050ba71e3c5591191 +#+ccx-utils.7bdee00caa13b108c920bb1729519c64086625746fe377885c8a27011979f56f +#+user-env.7b002067bfa6b1115638dfd5cde8a0f059a1d02512fb139a7e190e65d94ba188 #+strace.801cacfe6901b6858381e9f63acd57675cf43200e02340f81966a1a9b9b008cb #+mlog.f6e876fbff20d311c177432ca821cc33b98f205d343105aa37ef81d40fdf1bc0 -#+system-config.ed67272d689f41bab4b1a652a791ee20b1c3b9460a02b4786348739cbcc96af8 -#+system-config-rc.d70771326d5b4d91f6d2e28eeaa820dba3f44ae1068a26d2872de8888bda8ab5 +#+system-config.72b93af84d39e0b54717d4576a50ae4a412c6936618ae31654b7941ea3e53c9e +#+system-config-rc.bc3c8741276dfd9dc6cb993ab002e96da56f097e21a2372a165ac734efa66723 #+system-config-scripts.280123bda87bc2c47d6ed993e8cedc4de55e9cf4d478daeacdcb554e6459180d -#+system-config-init.ad4f574aed7a41cb6c0075956b47b1a47b986ebcf5019a8ebea7de361c1e372f +#+system-config-init.0256faa54285fe3f1b2d440feb73e0a3e7df6bdc61e4e35a7cfef82ce9650a24 #+system-config-zsh.6cea9d302b79e02443a23bcc0fa29a512570db99e891ec1e74cfce7a4496b670 \ No newline at end of file diff --git a/variants/root-x86_64/easyseccomp b/variants/root-x86_64/easyseccomp @@ -9,7 +9,7 @@ #+flex.2237e4fdd5678fbacfef665fa1fb964ee62e1e45ab29f32a086629be17ed9001 #+bison.5fbd30012053f464c156e0c0b0fa4b59be176d9525cdd25f792ddfaad1176c84 #+libseccomp.eb0fcb610a962c78c7d8efab5534f6b4240c7e17f9ebcff43298ee8df3b2a26b -#+error-standalone.9f3bd5274f9ebbf8a281fbf17a540663a1900d2b899336e3c4cd1870f7637eef +#+error-standalone.8627b52de03390e069f6a5b3b1a677e12804260bc94d70af9bf3450379f9f7ae #+argp-standalone.d63bde2f556e71d497ce2a7c36814ce142b5e68820911213722f6a188ed6ae0f #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp #@sha256:eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10:easyseccomp_fix_includes.patch diff --git a/variants/root-x86_64/error-standalone b/variants/root-x86_64/error-standalone @@ -18,7 +18,6 @@ build_env_static() { export CPATH="$pthbs_build_environment/include" export LDFLAGS="-static -L$pthbs_build_environment/library $LDFLAGS" } -cd error-standalone-2.0 make -j${JOBS:-1} -l$((1+${JOBS:-1})) PREFIX=/versions/$pthbs_package \ DESTDIR="$pthbs_destdir" \ INCDIR="$prefix/include" \ diff --git a/variants/root-x86_64/execline b/variants/root-x86_64/execline @@ -4,6 +4,7 @@ #+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c #+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 #+skalibs.7de9cd74b9841db262163606f6dbef8ab49126ca21e8c844d449411723b81e0b +#@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline # - build script start - diff --git a/variants/root-x86_64/kbd b/variants/root-x86_64/kbd @@ -70,9 +70,6 @@ make -j${JOBS:-1} -l$((1+${JOBS:-1})) make DESTDIR="$pthbs_destdir" install -cd ../destdir -mv -v data ".$prefix/" - check_static command/loadkeys @@ -81,6 +78,8 @@ cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { x["./command/loadkeys"]=1 + x["./data/keymaps/i386/qwerty/cz.map.gz"]=1 + x["./data/keymaps/i386/qwerty/us.map.gz"]=1 } function r1(s) { diff --git a/variants/root-x86_64/logincaps b/variants/root-x86_64/logincaps @@ -3,9 +3,9 @@ #+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 #+zsh.01a31d86cd787f4ac02a6e672a26990184f9a7994a6daeac7197b37447ce273a #+pthbs-banginstall.c778079de6b3c448b7670c1d09474bfecbd64658c11e75734cf48a85196ca318 -#+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 +#+execline.1db2d6fe3c17cd5bb10638dc304fbe790504f84d3bc899cc2e38ac5c688cf495 #+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c -#+ccx-utils.44f8a3d6ec19d6da0bfbfdf73577bebedb8c6f046fb105609138bf59794b7d87 +#+ccx-utils.7bdee00caa13b108c920bb1729519c64086625746fe377885c8a27011979f56f # - build script start - diff --git a/variants/root-x86_64/mdevd b/variants/root-x86_64/mdevd @@ -4,7 +4,8 @@ #+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c #+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 #+skalibs.7de9cd74b9841db262163606f6dbef8ab49126ca21e8c844d449411723b81e0b -#+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 +#+execline.1db2d6fe3c17cd5bb10638dc304fbe790504f84d3bc899cc2e38ac5c688cf495 +#@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd # - build script start - diff --git a/variants/root-x86_64/mdevd.environment b/variants/root-x86_64/mdevd.environment @@ -1,6 +1,6 @@ #!/usr/bin/env pthbs-build #+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 -#+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 -#+s6.2290e63355d4db5c6cee94a250cd93058660b9aab8c86588b66e558d299c7167 +#+execline.1db2d6fe3c17cd5bb10638dc304fbe790504f84d3bc899cc2e38ac5c688cf495 +#+s6.69f9d35e36b1285780daadab9500b90d3ffb4547ffbd905bced35808e5044235 #+mdev-scripts.9194c5c7ecebe485d33528b68baba2a75e6a8689884e235c14469e891d7ebdb2 -#+mdevd.c2e962ba272a196b1798c2eab73f2bd1b69b168f897e72e9be3e30bef0e8d985- \ No newline at end of file +#+mdevd.c2a33d2ee21d94bcced8900c89eced694475de7041e7daf6dcfd093101930c63+ \ No newline at end of file diff --git a/variants/root-x86_64/s6 b/variants/root-x86_64/s6 @@ -4,7 +4,7 @@ #+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c #+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 #+skalibs.7de9cd74b9841db262163606f6dbef8ab49126ca21e8c844d449411723b81e0b -#+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 +#+execline.1db2d6fe3c17cd5bb10638dc304fbe790504f84d3bc899cc2e38ac5c688cf495 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6 diff --git a/variants/root-x86_64/s6-linux-init b/variants/root-x86_64/s6-linux-init @@ -4,8 +4,8 @@ #+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c #+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 #+skalibs.7de9cd74b9841db262163606f6dbef8ab49126ca21e8c844d449411723b81e0b -#+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 -#+s6.2290e63355d4db5c6cee94a250cd93058660b9aab8c86588b66e558d299c7167 +#+execline.1db2d6fe3c17cd5bb10638dc304fbe790504f84d3bc899cc2e38ac5c688cf495 +#+s6.69f9d35e36b1285780daadab9500b90d3ffb4547ffbd905bced35808e5044235 #@git:b298e515efe16210048e504e3aec89ea1e627b73:s6-linux-init diff --git a/variants/root-x86_64/s6-networking b/variants/root-x86_64/s6-networking @@ -4,8 +4,8 @@ #+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c #+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 #+skalibs.7de9cd74b9841db262163606f6dbef8ab49126ca21e8c844d449411723b81e0b -#+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 -#+s6.2290e63355d4db5c6cee94a250cd93058660b9aab8c86588b66e558d299c7167 +#+execline.1db2d6fe3c17cd5bb10638dc304fbe790504f84d3bc899cc2e38ac5c688cf495 +#+s6.69f9d35e36b1285780daadab9500b90d3ffb4547ffbd905bced35808e5044235 #+s6-dns.2a3e90f799cebf15491101cc0b1ba2a0bdc9f68320e02943cfcd4a873fb036fb #+libressl.ecd089b63222b6d2d8574961d0d10ba37071baa6bfaa1d38f1b369ece8f2ad56 #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking diff --git a/variants/root-x86_64/s6-rc b/variants/root-x86_64/s6-rc @@ -4,8 +4,8 @@ #+musl-cross-make.4906cfdd9c14c890a06ad2db5cb1381bfa213cc2426b328318039645ea6eeb6c #+gnu-make.de922c96dac1f5543604cbfac718b9f0e017330fa17c48cab8c552429e6b4525 #+skalibs.7de9cd74b9841db262163606f6dbef8ab49126ca21e8c844d449411723b81e0b -#+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 -#+s6.2290e63355d4db5c6cee94a250cd93058660b9aab8c86588b66e558d299c7167 +#+execline.1db2d6fe3c17cd5bb10638dc304fbe790504f84d3bc899cc2e38ac5c688cf495 +#+s6.69f9d35e36b1285780daadab9500b90d3ffb4547ffbd905bced35808e5044235 #@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config @@ -6,15 +6,15 @@ #+aat.c744ec67755ae2988d0e53158520de7272fa0f0e7ecbd44b71559c26910bd6f8 #+fileset.215ca6d3fbfb730899911dffa91b92bbd8391f14b7639a6d0b37620d26e7f1ca #+rsync.15768ca4cc994c0627852b75c6f443143aab4fee22b435b6b2d0d42534d7a67c -#+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 -#+kbd.837ef6eb78ddb4d5a8cc6f63e24696b73cbe13779f248f4036049b7fa1b0b336 -#+mdevd.c2e962ba272a196b1798c2eab73f2bd1b69b168f897e72e9be3e30bef0e8d985 +#+execline.1db2d6fe3c17cd5bb10638dc304fbe790504f84d3bc899cc2e38ac5c688cf495 +#+kbd.053d6b6d1b89d8942434986ef3fcf73d0681e909b05f8710679a7abb8fb75220 +#+mdevd.c2a33d2ee21d94bcced8900c89eced694475de7041e7daf6dcfd093101930c63 #+s6-linux-utils.37b19062018cb44159d0c2b2e08b3e098134c767810ef243455abaffe4c48bf2 -#+s6-rc.3790f2b77a5785fe78e78d0ae8f036fd8e6bdd70af979ba1cd752668ae29be82 -#+s6.2290e63355d4db5c6cee94a250cd93058660b9aab8c86588b66e558d299c7167 +#+s6-rc.381640321c73bc524e2e9805c9603ad20df7187baf15ae128975292c83e7ab25 +#+s6.69f9d35e36b1285780daadab9500b90d3ffb4547ffbd905bced35808e5044235 #+zsh.01a31d86cd787f4ac02a6e672a26990184f9a7994a6daeac7197b37447ce273a #+system-config-scripts.280123bda87bc2c47d6ed993e8cedc4de55e9cf4d478daeacdcb554e6459180d -#+logincaps.158f87e6162f9cce62abc68cc28e3343da75cb19847c4232b82024c607dce35f +#+logincaps.3552e31f24421fb26e2ce6f5f703fd6f2d080f5546dc582e5f6eec287051072c #@git:cdeb78362ceacd8087b1d04ef26573cb115b7844:system-config @@ -50,8 +50,8 @@ printf '%s\n' >config/etc/skel/loginexec \ chmod +x config/etc/skel/loginexec env 'pthbs_path_system-config'="$prefix" \ - 'pthbs_path_containers=/versions/env.7e07546bb30ffa811e8009ef01732a1a5462c234818d7179978eba107149aef9' \ - 'pthbs_path_mdevd=/versions/env.d807e78e177309501d36becd2dd34f58b557c5e718b650e7a972d46fc46ce2cf' \ + 'pthbs_path_containers=/versions/env.b3455c34dc547b14974b09ffd9907f300b1359e154584b13317ba7a9066151ce' \ + 'pthbs_path_mdevd=/versions/env.015198a1aef5c0a62035a9dea0285f94b80371ddd08c46e50fd37c159ea634dd' \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) all sort -u build/execfile | while IFS= read exename; do diff --git a/variants/root-x86_64/system-config-init b/variants/root-x86_64/system-config-init @@ -1,12 +1,12 @@ #!/usr/bin/env pthbs-build #+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 #+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 -#+s6.2290e63355d4db5c6cee94a250cd93058660b9aab8c86588b66e558d299c7167 -#+s6-rc.3790f2b77a5785fe78e78d0ae8f036fd8e6bdd70af979ba1cd752668ae29be82 +#+s6.69f9d35e36b1285780daadab9500b90d3ffb4547ffbd905bced35808e5044235 +#+s6-rc.381640321c73bc524e2e9805c9603ad20df7187baf15ae128975292c83e7ab25 #+s6-portable-utils.02a66968f0ac9c69d31491a4172e24ef37cab78fc968d5a75e46a1dcf0a588a9 -#+s6-linux-init.676e77c29e34f95108eb83ef131a78de5afa7ae0f27fecbf504d43e0d8d0d30d -#+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 -#+system-config-rc.d70771326d5b4d91f6d2e28eeaa820dba3f44ae1068a26d2872de8888bda8ab5 +#+s6-linux-init.b4b9e32bbfdd8be3e1ed78e3ad1ff367c8c837e5bead0b35016e5a49da9bd345 +#+execline.1db2d6fe3c17cd5bb10638dc304fbe790504f84d3bc899cc2e38ac5c688cf495 +#+system-config-rc.bc3c8741276dfd9dc6cb993ab002e96da56f097e21a2372a165ac734efa66723 # - build script start - @@ -29,7 +29,7 @@ qx() { # register executable as dependency and quote full path to be suitable f "s6-quote" "$prefix/deps/command/$name" } -s6rcdb=/versions/system-config-rc.d70771326d5b4d91f6d2e28eeaa820dba3f44ae1068a26d2872de8888bda8ab5/config/s6-rc-db +s6rcdb=/versions/system-config-rc.bc3c8741276dfd9dc6cb993ab002e96da56f097e21a2372a165ac734efa66723/config/s6-rc-db # Generate init (${dest} must not exist but parent dir does) mkdir -p "$pthbs_destdir//versions" diff --git a/variants/root-x86_64/system-config-rc b/variants/root-x86_64/system-config-rc @@ -2,9 +2,9 @@ #+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 #+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 #+busybox-diffutils.3a93ac55c9f8a17e5231882393b771c7fbbf7cc6ef5886732e0f47ae148f4705 -#+s6-rc.3790f2b77a5785fe78e78d0ae8f036fd8e6bdd70af979ba1cd752668ae29be82 +#+s6-rc.381640321c73bc524e2e9805c9603ad20df7187baf15ae128975292c83e7ab25 #+fileset.215ca6d3fbfb730899911dffa91b92bbd8391f14b7639a6d0b37620d26e7f1ca -#+system-config.ed67272d689f41bab4b1a652a791ee20b1c3b9460a02b4786348739cbcc96af8 +#+system-config.72b93af84d39e0b54717d4576a50ae4a412c6936618ae31654b7941ea3e53c9e # - build script start - @@ -13,7 +13,7 @@ dest=${pthbs_destdir%/}${prefix} cd 'system-config-rc' -src=/versions/system-config.ed67272d689f41bab4b1a652a791ee20b1c3b9460a02b4786348739cbcc96af8/config/s6-rc-source +src=/versions/system-config.72b93af84d39e0b54717d4576a50ae4a412c6936618ae31654b7941ea3e53c9e/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/user-env b/variants/root-x86_64/user-env @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build #+busybox.6fa2710bbe26c1489e19aee5f024bc54d8aed3f6d42773f1681e64980e5f59c5 #+busybox-findutils.fa3be9a4292625d72dbf40786bcf85d6753a706ad5268e454384726faca34b47 -#+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 +#+execline.1db2d6fe3c17cd5bb10638dc304fbe790504f84d3bc899cc2e38ac5c688cf495 #+pthbs-banginstall.c778079de6b3c448b7670c1d09474bfecbd64658c11e75734cf48a85196ca318 #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment @@ -7,23 +7,23 @@ #+flex.2237e4fdd5678fbacfef665fa1fb964ee62e1e45ab29f32a086629be17ed9001 #+bison.5fbd30012053f464c156e0c0b0fa4b59be176d9525cdd25f792ddfaad1176c84 #+rsync.15768ca4cc994c0627852b75c6f443143aab4fee22b435b6b2d0d42534d7a67c -#+execline.8e6cc83a61d6052a4b5ead2db2d76b693dc2db140eab1da8d34f29dfc647d975 -#+s6.2290e63355d4db5c6cee94a250cd93058660b9aab8c86588b66e558d299c7167 -#+s6-rc.3790f2b77a5785fe78e78d0ae8f036fd8e6bdd70af979ba1cd752668ae29be82 +#+execline.1db2d6fe3c17cd5bb10638dc304fbe790504f84d3bc899cc2e38ac5c688cf495 +#+s6.69f9d35e36b1285780daadab9500b90d3ffb4547ffbd905bced35808e5044235 +#+s6-rc.381640321c73bc524e2e9805c9603ad20df7187baf15ae128975292c83e7ab25 #+s6-portable-utils.02a66968f0ac9c69d31491a4172e24ef37cab78fc968d5a75e46a1dcf0a588a9 #+s6-linux-utils.37b19062018cb44159d0c2b2e08b3e098134c767810ef243455abaffe4c48bf2 -#+s6-linux-init.676e77c29e34f95108eb83ef131a78de5afa7ae0f27fecbf504d43e0d8d0d30d -#+mdevd.c2e962ba272a196b1798c2eab73f2bd1b69b168f897e72e9be3e30bef0e8d985 +#+s6-linux-init.b4b9e32bbfdd8be3e1ed78e3ad1ff367c8c837e5bead0b35016e5a49da9bd345 +#+mdevd.c2a33d2ee21d94bcced8900c89eced694475de7041e7daf6dcfd093101930c63 #+s6-dns.2a3e90f799cebf15491101cc0b1ba2a0bdc9f68320e02943cfcd4a873fb036fb #+libressl.ecd089b63222b6d2d8574961d0d10ba37071baa6bfaa1d38f1b369ece8f2ad56 -#+s6-networking.21545d4266a2511310b06c5f878f7576cc8962dd50c858d110527012502d3346 +#+s6-networking.3f005e48f5b3e9816960bb8870745ac4f5dcfa74a41eecc38a7eafc7ad39fb8d #+zsh.01a31d86cd787f4ac02a6e672a26990184f9a7994a6daeac7197b37447ce273a #+pthbs-banginstall.c778079de6b3c448b7670c1d09474bfecbd64658c11e75734cf48a85196ca318 #+aat.c744ec67755ae2988d0e53158520de7272fa0f0e7ecbd44b71559c26910bd6f8 #+confz.bc3491bab75ab7de12e29d4614347f3b3c90b4987012c5817284775b89f46ff6 -#+containers.3090ac7a65c9eb7d978cafb5c4ac2687b0bdd48fd4ddc3268d0df6cb36597af8 +#+containers.1f250f4db0ebd2ece0064231ce5bc891819a587c7ebe89af1086766bd3fb8181 #+fileset.215ca6d3fbfb730899911dffa91b92bbd8391f14b7639a6d0b37620d26e7f1ca -#+logincaps.158f87e6162f9cce62abc68cc28e3343da75cb19847c4232b82024c607dce35f +#+logincaps.3552e31f24421fb26e2ce6f5f703fd6f2d080f5546dc582e5f6eec287051072c #+snaprep.dd3c4d7374997842d23ff11c496cc9d0705df5acb6ea6511c68a3e95f6bff366 #+curl.4898b6941dbebfff9a3119566095d23d24cc9bcdd13e2beece1211fcae207056 #+git.1d648ddad55a0190c53a630cfc504c519ef574e1d83516298a50b9fe5d7c9b85 @@ -34,7 +34,7 @@ #+iconv.627703e7d8f5928e9511b059673537dae3002569c513393b42a94911f7228219 #+libcap.a01b94d3158cbf92ee91d53dea8626b351230aabfb46fb3479f7851cf6c30f3c #+applyuidgid-caps.24cd678aacaa2c4656769739da05cf6630b2175b79bcba193b2c89cde34acabc -#+ccx-utils.44f8a3d6ec19d6da0bfbfdf73577bebedb8c6f046fb105609138bf59794b7d87 -#+user-env.8d98c43570fddf00ddbb256796b8ac2abf78872f674b48e050ba71e3c5591191 +#+ccx-utils.7bdee00caa13b108c920bb1729519c64086625746fe377885c8a27011979f56f +#+user-env.7b002067bfa6b1115638dfd5cde8a0f059a1d02512fb139a7e190e65d94ba188 #+strace.801cacfe6901b6858381e9f63acd57675cf43200e02340f81966a1a9b9b008cb #+mlog.f6e876fbff20d311c177432ca821cc33b98f205d343105aa37ef81d40fdf1bc0 \ No newline at end of file