commit 8ac56d3e4e976b2b0bde6fb02b0d63888b51b730 parent 977f73d920e401be17182e7321b9419fee227145 Author: Jan Pobrislo <ccx@te2000.cz> Date: Sun, 26 Oct 2025 21:44:47 +0000 fix pkgconf-pkg-config Diffstat:
84 files changed, 242 insertions(+), 259 deletions(-)
diff --git a/templates/generic b/templates/generic @@ -51,11 +51,11 @@ make DESTDIR="$pthbs_destdir" install {% block check -%} {% endblock check %} {% block finish -%} -{% if env_template %} +{% if env_template -%} mkdir -p "$dest/.env-template" -{% for key, value in env_template | dictsort %} +{% for key, value in env_template | dictsort -%} printf '%s' >"$dest/.env-template"/{{key|shesc}} {{value|shesc}} -{% endfor %} +{% endfor -%} {% endif %} {% endblock finish %} {%- endblock script %} diff --git a/templates/pkg/pkgconf-pkg-config b/templates/pkg/pkgconf-pkg-config @@ -8,6 +8,7 @@ cd "$pthbs_destdir{{versions}}/$pthbs_package" exe=$(realpath "$(which pkgconf)") mkdir command ln -sf "$exe" command/pkg-config +mkdir -p ".env-template" printf '%s' >".env-template/PKG_CONFIG_LIBDIR" "@ENVROOT@/library/pkgconfig" printf '%s\t%s\n' "./command/pkg-config" "./command/pkg-config" >>.install-links.new mv .install-links.new .install-links diff --git a/variants/ccx-x86_64/aat b/variants/ccx-x86_64/aat @@ -2,8 +2,8 @@ #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b -#+zsh.2648e0a529efe55a570fd4623464c4177772c05e176b0f12294119dfa6604da7 -#+pthbs-banginstall.dd343e2ad14074d84f1327791b391255fceeff5752f9d9639c0f032abb3b75cf +#+zsh.336c0613d4f3bd70fba36f5efcb72d4a3ab4867d8ef3e3506352e5deb6f1acc6 +#+pthbs-banginstall.07ae293865aeba50cbb19e5613f6786ca150575e436515c68fa24cd1fbda0aee #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat diff --git a/variants/ccx-x86_64/apk-tools b/variants/ccx-x86_64/apk-tools @@ -8,7 +8,7 @@ #+patch.71865adfe1b1a83862c182902ff3bf77fcce6168cde6b35cd59fd5a85916e7c8 #+libressl.3c695ed4a79eb6a22d402fd9c9aff21db481385d7f2281bb02d7e92dd931b894 #+zstd.3aa7a31b787480effc16a34130b5199a5160b690d71ef0912b080d71e6031e88 -#+pkgconf-pkg-config.0d42ae507ed08b49639dfc49dced38f5e847c762f01f3ee8c464db7870762890 +#+pkgconf-pkg-config.9ef6f064d957ceddaed52ccf783c4dcd2b72892d7463482170fa9b576b20e4a7 #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools diff --git a/variants/ccx-x86_64/applyuidgid-caps b/variants/ccx-x86_64/applyuidgid-caps @@ -4,7 +4,7 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f #+skalibs.9bcaae5f66b172ce64f9c640a4f1e0f6c4602a3192ede08d81954dec77b2df92 -#+libcap.fc48cbe8970c897119bdea61f9aca96aa83466deec6f73b892fef626c50c81c6 +#+libcap.6588056f9b7500422c48c6a250a02428095fa7deb86ead446eaa5d23dca7033a #@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c diff --git a/variants/ccx-x86_64/busybox:modutils b/variants/ccx-x86_64/busybox:modutils @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+linux.e53fd689466a1a06f4d2309492d46c599b6da489346cd26a779e7beac08905b8 +#+linux.0ebc17ccf9099c1ba053bcb559c8c1b863311ec2d775fa355bc7f7707154e73f #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f #+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f @@ -34,7 +34,7 @@ export CFLAGS="-D_GNU_SOURCE" export LDFLAGS="-static" # TODO: indirection via deps directory/symlink cat >>.config <<EOF -CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux.e53fd689466a1a06f4d2309492d46c599b6da489346cd26a779e7beac08905b8" +CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux.0ebc17ccf9099c1ba053bcb559c8c1b863311ec2d775fa355bc7f7707154e73f" EOF make oldconfig cat .config diff --git a/variants/ccx-x86_64/confz b/variants/ccx-x86_64/confz @@ -2,8 +2,8 @@ #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b -#+zsh.2648e0a529efe55a570fd4623464c4177772c05e176b0f12294119dfa6604da7 -#+pthbs-banginstall.dd343e2ad14074d84f1327791b391255fceeff5752f9d9639c0f032abb3b75cf +#+zsh.336c0613d4f3bd70fba36f5efcb72d4a3ab4867d8ef3e3506352e5deb6f1acc6 +#+pthbs-banginstall.07ae293865aeba50cbb19e5613f6786ca150575e436515c68fa24cd1fbda0aee #@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz diff --git a/variants/ccx-x86_64/container-bin-image b/variants/ccx-x86_64/container-bin-image @@ -5,8 +5,8 @@ #+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a #+s6.aba44e80074ee5ae8921a773c04c3f2433945ad5566cb986e3edc5fe5c5600cf #+ccx-utils.ff0ba3fc3db06a0bbee9cfc410b7894b7d06c158e35b01162f46f6ece9e2dbdf -#+applyuidgid-caps.0d9f2a5244a3e94c44300b14c70315442da7c0fba70e7c2af6152402b65894d2 -#+easyseccomp.20df320b86e103ee0a73a184f93bd3c692fe75f98e336a25e3b7f43c0dbd86fc +#+applyuidgid-caps.4036b2e0cd983d266db7b4fcf30bc362c1065d521909c4128ff591768c684ae1 +#+easyseccomp.11330b43fad76dd84b6d0b0fcb532b40c61c5cff63a9885938e3334cf4f0dad2 #+mlog.d3f90010a808d81d0e4e26efefd0b2325b395fd1b011f1d94cdc0be1cb017339 #+abduco.e426fc1d139e8bfcfd6ebd986ac28b8d62bff115bdc379ad9c84b4bc97024065 #+nawk.24907cbb8100b37ab37723f0335e79103b0135b8ae6175e179b145bbdbe500e0 diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers @@ -2,13 +2,13 @@ #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b -#+zsh.2648e0a529efe55a570fd4623464c4177772c05e176b0f12294119dfa6604da7 -#+pthbs-banginstall.dd343e2ad14074d84f1327791b391255fceeff5752f9d9639c0f032abb3b75cf +#+zsh.336c0613d4f3bd70fba36f5efcb72d4a3ab4867d8ef3e3506352e5deb6f1acc6 +#+pthbs-banginstall.07ae293865aeba50cbb19e5613f6786ca150575e436515c68fa24cd1fbda0aee #+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a #+alpine-keys.58180943d1e4712df08cb1eae2454fafcf543d90ac169c524e84eef81df9af01 -#+apk-tools.176bec07196d0ccba9d37db88adc2c3161a6786385b6cec22627f51bc3a67207 -#+xbps.9442e6ef041812989dc692d87029b55b31f89c929545613db8bbbe5f60330441 -#+container-bin-image.6ef224032d2f4dfc2aa1ffeb50f3d10649b955d5da0b283588f6ad735ed53de7 +#+apk-tools.3e8eac89fdc1dd9623b8e5c50dc60c024aa782a06e1619d339f56a478968685b +#+xbps.445bd0e4c5abd2e3b5a7c132bf3cdfcc243a9aa5eb5159ab3cfe48b1539b110c +#+container-bin-image.1c08e48b4a0419dfe1ad7d36dece62c0f0a48ac20943f58931ef7add46f4d172 #@git:8ec212c9411088ad7e116e330d6a33f68c539678:containers @@ -51,8 +51,8 @@ printf '%s\n' >"${dest}/zsh/site-functions/confz_containers_pthbs_init" \ "typeset -g container_xbps_install_executable='$prefix/deps/command/xbps-install.static'" mkdir -p "${dest}/deps/command" -ln -sf '/home/ccx/versions/apk-tools.176bec07196d0ccba9d37db88adc2c3161a6786385b6cec22627f51bc3a67207/command/apk.static' "${dest}/deps/command/" -ln -sf '/home/ccx/versions/xbps.9442e6ef041812989dc692d87029b55b31f89c929545613db8bbbe5f60330441/command/xbps-install.static' "${dest}/deps/command/" +ln -sf '/home/ccx/versions/apk-tools.3e8eac89fdc1dd9623b8e5c50dc60c024aa782a06e1619d339f56a478968685b/command/apk.static' "${dest}/deps/command/" +ln -sf '/home/ccx/versions/xbps.445bd0e4c5abd2e3b5a7c132bf3cdfcc243a9aa5eb5159ab3cfe48b1539b110c/command/xbps-install.static' "${dest}/deps/command/" for f in '/home/ccx/versions/alpine-keys.58180943d1e4712df08cb1eae2454fafcf543d90ac169c524e84eef81df9af01'/keys/alpine/*/*; do test -f "$f" @@ -62,13 +62,13 @@ for f in '/home/ccx/versions/alpine-keys.58180943d1e4712df08cb1eae2454fafcf543d9 done mkdir -p "${dest}/deps/keys/void" -for f in '/home/ccx/versions/xbps.9442e6ef041812989dc692d87029b55b31f89c929545613db8bbbe5f60330441'/keys/void/*; do +for f in '/home/ccx/versions/xbps.445bd0e4c5abd2e3b5a7c132bf3cdfcc243a9aa5eb5159ab3cfe48b1539b110c'/keys/void/*; do ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/home/ccx/versions/container-bin-image.6ef224032d2f4dfc2aa1ffeb50f3d10649b955d5da0b283588f6ad735ed53de7/container-bin-image' -test -f '/home/ccx/versions/container-bin-image.6ef224032d2f4dfc2aa1ffeb50f3d10649b955d5da0b283588f6ad735ed53de7/container-bin-image/if' -ln -sf '/home/ccx/versions/container-bin-image.6ef224032d2f4dfc2aa1ffeb50f3d10649b955d5da0b283588f6ad735ed53de7/container-bin-image' "${dest}/deps/" +test -d '/home/ccx/versions/container-bin-image.1c08e48b4a0419dfe1ad7d36dece62c0f0a48ac20943f58931ef7add46f4d172/container-bin-image' +test -f '/home/ccx/versions/container-bin-image.1c08e48b4a0419dfe1ad7d36dece62c0f0a48ac20943f58931ef7add46f4d172/container-bin-image/if' +ln -sf '/home/ccx/versions/container-bin-image.1c08e48b4a0419dfe1ad7d36dece62c0f0a48ac20943f58931ef7add46f4d172/container-bin-image' "${dest}/deps/" diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment @@ -5,16 +5,16 @@ #+s6.aba44e80074ee5ae8921a773c04c3f2433945ad5566cb986e3edc5fe5c5600cf #+s6-portable-utils.945ba0fbba6153923f5a761abc154568d30fc1db69b26f03ead9fe248f87d351 #+s6-linux-utils.664dc33ed8e500126bfb4e74c565990e8632879b9e165b09f7f48ac054c89a22 -#+zsh.2648e0a529efe55a570fd4623464c4177772c05e176b0f12294119dfa6604da7 -#+confz.b67a7630d1faeda6e06d979b1a0c36163f279849108177f02658a35d7152ae45 -#+containers.5a2d5f35f4856166e2f3bacde111a64a24156197c79d3a7662117615fb8b170e -#+xbps.9442e6ef041812989dc692d87029b55b31f89c929545613db8bbbe5f60330441 +#+zsh.336c0613d4f3bd70fba36f5efcb72d4a3ab4867d8ef3e3506352e5deb6f1acc6 +#+confz.1c7c274fa01467bdf851c5046369a70b5fe226bc2e66f502bc8c099baac94449 +#+containers.704dc84901f79cd7c79ccbb56738e449d582006982aac57274a09a2877fbdf74 +#+xbps.445bd0e4c5abd2e3b5a7c132bf3cdfcc243a9aa5eb5159ab3cfe48b1539b110c #+zstd.3aa7a31b787480effc16a34130b5199a5160b690d71ef0912b080d71e6031e88 -#+apk-tools.176bec07196d0ccba9d37db88adc2c3161a6786385b6cec22627f51bc3a67207 +#+apk-tools.3e8eac89fdc1dd9623b8e5c50dc60c024aa782a06e1619d339f56a478968685b #+alpine-keys.58180943d1e4712df08cb1eae2454fafcf543d90ac169c524e84eef81df9af01 #+getent.2608d23855b8d871fc65438dcc9889a93095bf0131f55045e517e037243898f1 -#+fileset.afc9e2d86825d2423202dfb40dcaf0ae374005c8c70c39182b9eebcec07be152 +#+fileset.9093c2e7c657c88e275cfde76289c8f105d72814b7840ea8be25c2f526b4a6bc #+ccx-utils.ff0ba3fc3db06a0bbee9cfc410b7894b7d06c158e35b01162f46f6ece9e2dbdf -#+easyseccomp.20df320b86e103ee0a73a184f93bd3c692fe75f98e336a25e3b7f43c0dbd86fc +#+easyseccomp.11330b43fad76dd84b6d0b0fcb532b40c61c5cff63a9885938e3334cf4f0dad2 #+findutils.c80b9056e275f82f7d371a44035a3c11dd43faae948a696f9cea0cd681b76aef #+nawk.24907cbb8100b37ab37723f0335e79103b0135b8ae6175e179b145bbdbe500e0 \ No newline at end of file diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -17,31 +17,31 @@ #+s6-dns.d0134713eb4f2fa10036f492ca4dc945e2188a8b648a78fcd8bb085a5bd627d4 #+libressl.3c695ed4a79eb6a22d402fd9c9aff21db481385d7f2281bb02d7e92dd931b894 #+s6-networking.f4a78285871a0559cd61c17855bc3d610f4b5a77c67fdc93418d599d0af1c207 -#+zsh.2648e0a529efe55a570fd4623464c4177772c05e176b0f12294119dfa6604da7 -#+pthbs-banginstall.dd343e2ad14074d84f1327791b391255fceeff5752f9d9639c0f032abb3b75cf -#+aat.bed1cceeeaf99718e61a89a54d526460202c2de1e3a5052ed9f85cec7269ea30 -#+confz.b67a7630d1faeda6e06d979b1a0c36163f279849108177f02658a35d7152ae45 -#+containers.5a2d5f35f4856166e2f3bacde111a64a24156197c79d3a7662117615fb8b170e -#+fileset.afc9e2d86825d2423202dfb40dcaf0ae374005c8c70c39182b9eebcec07be152 -#+logincaps.128ce50c29de922317b0efaafaf79708fd0ab685ef39df6e7267c05d578eaa8f -#+snaprep.092a6f35542a956ef6f9990177cbe209d48d4eb64be1f20368a87cac7903921d +#+zsh.336c0613d4f3bd70fba36f5efcb72d4a3ab4867d8ef3e3506352e5deb6f1acc6 +#+pthbs-banginstall.07ae293865aeba50cbb19e5613f6786ca150575e436515c68fa24cd1fbda0aee +#+aat.ce0d5d4b1b0aac9845b06a28ea1d17e7b51c23e1fee433300d0a4e333a2c22a4 +#+confz.1c7c274fa01467bdf851c5046369a70b5fe226bc2e66f502bc8c099baac94449 +#+containers.704dc84901f79cd7c79ccbb56738e449d582006982aac57274a09a2877fbdf74 +#+fileset.9093c2e7c657c88e275cfde76289c8f105d72814b7840ea8be25c2f526b4a6bc +#+logincaps.4af3c50d58a5001c018aadac72b97ffe374acf069ef4b8588cc2533cd4407de8 +#+snaprep.eede6a95d02b609873fc23d90276e157bac1b21c9fcf39a73e5ca31621701c10 #+curl.10fc879ea14256ab6e511319c63f19da974300ecbf2fadf3e3ccc2c6e77c9994 #+git.e9d3f4c1010863e3b73ab7d33d013793a4839e989361dda16178e2b118595292 -#+xbps.9442e6ef041812989dc692d87029b55b31f89c929545613db8bbbe5f60330441 -#+apk-tools.176bec07196d0ccba9d37db88adc2c3161a6786385b6cec22627f51bc3a67207 +#+xbps.445bd0e4c5abd2e3b5a7c132bf3cdfcc243a9aa5eb5159ab3cfe48b1539b110c +#+apk-tools.3e8eac89fdc1dd9623b8e5c50dc60c024aa782a06e1619d339f56a478968685b #+getent.2608d23855b8d871fc65438dcc9889a93095bf0131f55045e517e037243898f1 #+getconf.3f6e9e56867c13fc1f1bc3a95e692c675500944f94bd0726e34ee010d8213697 #+iconv.0618baa01d98a1805b5ff362de984adfca782727cfe5335327341c376a8c3602 -#+libcap.fc48cbe8970c897119bdea61f9aca96aa83466deec6f73b892fef626c50c81c6 -#+applyuidgid-caps.0d9f2a5244a3e94c44300b14c70315442da7c0fba70e7c2af6152402b65894d2 +#+libcap.6588056f9b7500422c48c6a250a02428095fa7deb86ead446eaa5d23dca7033a +#+applyuidgid-caps.4036b2e0cd983d266db7b4fcf30bc362c1065d521909c4128ff591768c684ae1 #+ccx-utils.ff0ba3fc3db06a0bbee9cfc410b7894b7d06c158e35b01162f46f6ece9e2dbdf -#+user-env.cc0683d9ca6986c3642304613640e0c096ca5fa18bfef1acd1d72cbdba119f78 +#+user-env.f82e155000095cd9f3d8494d76591a5aab5f0ce263bb6c0e70f60ee88aafe1c6 #+strace.24f817d87229531d5a2218f804224619ed7635b8f847c96ccb8f8926478b144a #+mlog.d3f90010a808d81d0e4e26efefd0b2325b395fd1b011f1d94cdc0be1cb017339 #+findutils.c80b9056e275f82f7d371a44035a3c11dd43faae948a696f9cea0cd681b76aef #+nawk.24907cbb8100b37ab37723f0335e79103b0135b8ae6175e179b145bbdbe500e0 -#+system-config.cdc72c1309b4160da5adfad3bbbb1a5fb6048204397d0f9673ac3cc50fd377c9 -#+system-config-rc.40006d90309372d553ff5766ffbb290ef4c3e01cc5e2474ca676125202988b2c -#+system-config-scripts.d01b8ef0ad1be29f1bb6fc41a34cbad9c4deedb1280934f542c27fda98613932 -#+system-config-init.62bcca0c52145acee0f5a300547f6ac0c78a0b81ccd3473046facca93dfe3ce1 -#+system-config-zsh.4e8afd597caaa75555d975b16b77c1dc37f975e723ee9602c2dab690a5387a36- \ No newline at end of file +#+system-config.ae135450685dc027d9bd7552d0285065ad26dda27e883781183736d316a5e5ba +#+system-config-rc.58f8e68efc43200d817d7eed7bbb5b7f47fbdcc3ee368664a1f8169be4e290f0 +#+system-config-scripts.d24a638b05ec84833a96ec10e33364a76a7ae51815b455821aa3385507e0b2c0 +#+system-config-init.523d9793fadbcb30913c603edb6d4b9395fce492be9805a45be2254b70757b86 +#+system-config-zsh.1ed25edadf44769fefaedd1acaf9667ea8c97683cbc45f105b284da6dd17cee7+ \ No newline at end of file diff --git a/variants/ccx-x86_64/dune b/variants/ccx-x86_64/dune @@ -4,7 +4,7 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.c505cec20d99ea947c08fe70bb226650ef884f3bc0b505cef922e550caa217e1 +#+ocaml.e8475f64632713e769637c58e0a5753d06059a949ea3f60ace8da2eb99014ea8 #@untar:-z:sha256:579c738f8ca191ba0a9b22dbe78f1377542442c9827cf4939f8964f09f9edb28:. diff --git a/variants/ccx-x86_64/easyseccomp b/variants/ccx-x86_64/easyseccomp @@ -9,7 +9,7 @@ #+patch.71865adfe1b1a83862c182902ff3bf77fcce6168cde6b35cd59fd5a85916e7c8 #+flex.d82e65569a261bd6140e6daafad40475f4c37a706fdaac7048bdf24d7200b63c #+bison.9264e348887dcc4943fb8b8a49bbf2462e53852ce4d782bc1ad95513eb225240 -#+libseccomp.e95c5389aa8ae16e130813277f8089f006fa422d30c6b0a1f48d6ad6cfabc14b +#+libseccomp.ca834b76a4dcd05fd82c7131e5e6c0037da0d1305a967bbcfadf07c8d7872174 #+error-standalone.c5bed16451398238f10e83182031c3f5a22949b6b98c723567214828b9053c37 #+argp-standalone.12091fe79283b890260cdf7d47a9aa9f7a57b63f1a9f4127dd537e2f897c4399 #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp diff --git a/variants/ccx-x86_64/fileset b/variants/ccx-x86_64/fileset @@ -2,8 +2,8 @@ #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b -#+zsh.2648e0a529efe55a570fd4623464c4177772c05e176b0f12294119dfa6604da7 -#+pthbs-banginstall.dd343e2ad14074d84f1327791b391255fceeff5752f9d9639c0f032abb3b75cf +#+zsh.336c0613d4f3bd70fba36f5efcb72d4a3ab4867d8ef3e3506352e5deb6f1acc6 +#+pthbs-banginstall.07ae293865aeba50cbb19e5613f6786ca150575e436515c68fa24cd1fbda0aee #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset diff --git a/variants/ccx-x86_64/kernel.environment b/variants/ccx-x86_64/kernel.environment @@ -1,3 +1,3 @@ #!/usr/bin/env pthbs-build -#+linux.e53fd689466a1a06f4d2309492d46c599b6da489346cd26a779e7beac08905b8 -#+busybox.7a32f0b3c3175153d6c85ba40e3de363964ec212b8f803cb259fa3f131a4413a- \ No newline at end of file +#+linux.0ebc17ccf9099c1ba053bcb559c8c1b863311ec2d775fa355bc7f7707154e73f +#+busybox.93f43b45ab9fa73ac6ed18328291b8566a84bdbb453bb4cf32100f71d599181f+ \ No newline at end of file diff --git a/variants/ccx-x86_64/libcap b/variants/ccx-x86_64/libcap @@ -5,7 +5,7 @@ #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f #+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 -#+pkgconf-pkg-config.0d42ae507ed08b49639dfc49dced38f5e847c762f01f3ee8c464db7870762890 +#+pkgconf-pkg-config.9ef6f064d957ceddaed52ccf783c4dcd2b72892d7463482170fa9b576b20e4a7 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:. diff --git a/variants/ccx-x86_64/libseccomp b/variants/ccx-x86_64/libseccomp @@ -6,7 +6,7 @@ #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f #+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 #+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d -#+pkgconf-pkg-config.0d42ae507ed08b49639dfc49dced38f5e847c762f01f3ee8c464db7870762890 +#+pkgconf-pkg-config.9ef6f064d957ceddaed52ccf783c4dcd2b72892d7463482170fa9b576b20e4a7 #+gperf.07a9122cf4d1c1a15a072266b7a4adf0a607f1178b2d326491500c6ac589d7df #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:. diff --git a/variants/ccx-x86_64/linux b/variants/ccx-x86_64/linux @@ -11,7 +11,7 @@ #+rsync.55276833e2833a1041e73acab778feec8f1e456f1010a6c3b02379bcdde02d39 #+zstd.3aa7a31b787480effc16a34130b5199a5160b690d71ef0912b080d71e6031e88 #+libelf.ccbb68a9c6feaf4b434ea0cfd38b3027ff369507165cbf8b01abb8c6e3eabe98 -#+pkgconf-pkg-config.0d42ae507ed08b49639dfc49dced38f5e847c762f01f3ee8c464db7870762890 +#+pkgconf-pkg-config.9ef6f064d957ceddaed52ccf783c4dcd2b72892d7463482170fa9b576b20e4a7 #+nawk.24907cbb8100b37ab37723f0335e79103b0135b8ae6175e179b145bbdbe500e0 #@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:. #@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz diff --git a/variants/ccx-x86_64/linux-qemu-guest b/variants/ccx-x86_64/linux-qemu-guest @@ -11,7 +11,7 @@ #+rsync.55276833e2833a1041e73acab778feec8f1e456f1010a6c3b02379bcdde02d39 #+zstd.3aa7a31b787480effc16a34130b5199a5160b690d71ef0912b080d71e6031e88 #+libelf.ccbb68a9c6feaf4b434ea0cfd38b3027ff369507165cbf8b01abb8c6e3eabe98 -#+pkgconf-pkg-config.0d42ae507ed08b49639dfc49dced38f5e847c762f01f3ee8c464db7870762890 +#+pkgconf-pkg-config.9ef6f064d957ceddaed52ccf783c4dcd2b72892d7463482170fa9b576b20e4a7 #+nawk.24907cbb8100b37ab37723f0335e79103b0135b8ae6175e179b145bbdbe500e0 #@untar:-J:sha256:7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764:. #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config diff --git a/variants/ccx-x86_64/logincaps b/variants/ccx-x86_64/logincaps @@ -2,8 +2,8 @@ #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b -#+zsh.2648e0a529efe55a570fd4623464c4177772c05e176b0f12294119dfa6604da7 -#+pthbs-banginstall.dd343e2ad14074d84f1327791b391255fceeff5752f9d9639c0f032abb3b75cf +#+zsh.336c0613d4f3bd70fba36f5efcb72d4a3ab4867d8ef3e3506352e5deb6f1acc6 +#+pthbs-banginstall.07ae293865aeba50cbb19e5613f6786ca150575e436515c68fa24cd1fbda0aee #+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f #+ccx-utils.ff0ba3fc3db06a0bbee9cfc410b7894b7d06c158e35b01162f46f6ece9e2dbdf diff --git a/variants/ccx-x86_64/mdev-scripts b/variants/ccx-x86_64/mdev-scripts @@ -1,6 +1,6 @@ #!/usr/bin/env pthbs-build -#+zsh.2648e0a529efe55a570fd4623464c4177772c05e176b0f12294119dfa6604da7 -#+pthbs-banginstall.dd343e2ad14074d84f1327791b391255fceeff5752f9d9639c0f032abb3b75cf +#+zsh.336c0613d4f3bd70fba36f5efcb72d4a3ab4867d8ef3e3506352e5deb6f1acc6 +#+pthbs-banginstall.07ae293865aeba50cbb19e5613f6786ca150575e436515c68fa24cd1fbda0aee #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts diff --git a/variants/ccx-x86_64/mdevd.environment b/variants/ccx-x86_64/mdevd.environment @@ -2,6 +2,6 @@ #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a #+s6.aba44e80074ee5ae8921a773c04c3f2433945ad5566cb986e3edc5fe5c5600cf -#+mdev-scripts.1d4cba8f6d152ac91f93838b4915c025931b4382deb359826bcde055acb7239c +#+mdev-scripts.32e5de6960fffdaa2e8e74a0dfc7bad4f9ac59a1e83eff6135411a89f032a73b #+mdevd.f93eb2eff2928fd4618a959255b19e6a01e056a6a9287ce5d1a3bce89eca1a15 -#+busybox.7a32f0b3c3175153d6c85ba40e3de363964ec212b8f803cb259fa3f131a4413a- \ No newline at end of file +#+busybox.93f43b45ab9fa73ac6ed18328291b8566a84bdbb453bb4cf32100f71d599181f+ \ No newline at end of file diff --git a/variants/ccx-x86_64/ocaml b/variants/ccx-x86_64/ocaml @@ -72,14 +72,10 @@ make DESTDIR="$pthbs_destdir" install check_static command/ocamlopt - mkdir -p "$dest/.env-template" - printf '%s' >"$dest/.env-template"/'OCAMLPARAM' 'I=@ENVROOT@/library.ocaml,_' - printf '%s' >"$dest/.env-template"/'OCAMLPATH' '@ENVROOT@/library.ocaml' - cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/ocaml-base b/variants/ccx-x86_64/ocaml-base @@ -4,9 +4,9 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.c505cec20d99ea947c08fe70bb226650ef884f3bc0b505cef922e550caa217e1 -#+dune.686975ff583761e2ad730de0d76c9e1a64024750e43fdbbdfd3e420900caa0a3 -#+ocaml_intrinsics_kernel.61c53027bd411f0b868ba1ad082ea426cb81c03b0adabf72a458f52d52efce39 +#+ocaml.e8475f64632713e769637c58e0a5753d06059a949ea3f60ace8da2eb99014ea8 +#+dune.4d25da5fd6964b19d45eb912817fe49a4149c29b66dd37f308e3be0978cabab4 +#+ocaml_intrinsics_kernel.ab0e6c0c75a6fddce1083ad9fe7d2b2088600f17cfa3b9dad6305ad212c9ebbf #@untar:-z:sha256:3f3f64789ab25bb5cb7f5f907dd651dec9cc9440981822fe75df6b94344b7208:. diff --git a/variants/ccx-x86_64/ocaml-findlib b/variants/ccx-x86_64/ocaml-findlib @@ -6,7 +6,7 @@ #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f #+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 #+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d -#+ocaml.c505cec20d99ea947c08fe70bb226650ef884f3bc0b505cef922e550caa217e1 +#+ocaml.e8475f64632713e769637c58e0a5753d06059a949ea3f60ace8da2eb99014ea8 #@untar:-z:sha256:d6899935ccabf67f067a9af3f3f88d94e310075d13c648fa03ff498769ce039d:. diff --git a/variants/ccx-x86_64/ocaml_intrinsics_kernel b/variants/ccx-x86_64/ocaml_intrinsics_kernel @@ -4,8 +4,8 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.c505cec20d99ea947c08fe70bb226650ef884f3bc0b505cef922e550caa217e1 -#+dune.686975ff583761e2ad730de0d76c9e1a64024750e43fdbbdfd3e420900caa0a3 +#+ocaml.e8475f64632713e769637c58e0a5753d06059a949ea3f60ace8da2eb99014ea8 +#+dune.4d25da5fd6964b19d45eb912817fe49a4149c29b66dd37f308e3be0978cabab4 #@untar:-z:sha256:c988b7769a59749631c3c98ba5edd1d2fe91f5dc380b5e0593c073c92f4bee01:. diff --git a/variants/ccx-x86_64/ocamlbuild b/variants/ccx-x86_64/ocamlbuild @@ -6,7 +6,7 @@ #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f #+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 #+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d -#+ocaml.c505cec20d99ea947c08fe70bb226650ef884f3bc0b505cef922e550caa217e1 +#+ocaml.e8475f64632713e769637c58e0a5753d06059a949ea3f60ace8da2eb99014ea8 #@untar:-z:sha256:2ba6857f2991b7f69368e8db818b163d31cf5a367f15f5953bf8f01a77b3d4fc:. diff --git a/variants/ccx-x86_64/opam b/variants/ccx-x86_64/opam @@ -4,8 +4,8 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+ocaml.c505cec20d99ea947c08fe70bb226650ef884f3bc0b505cef922e550caa217e1 -#+dune.686975ff583761e2ad730de0d76c9e1a64024750e43fdbbdfd3e420900caa0a3 +#+ocaml.e8475f64632713e769637c58e0a5753d06059a949ea3f60ace8da2eb99014ea8 +#+dune.4d25da5fd6964b19d45eb912817fe49a4149c29b66dd37f308e3be0978cabab4 #@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:. @@ -42,7 +42,7 @@ cd 'opam-full-2.4.1' --infodir="$prefix/info" \ --localedir="$prefix/locale" \ --localstatedir='/var/pthbs' \ - --with-dune='/home/ccx/versions/dune.686975ff583761e2ad730de0d76c9e1a64024750e43fdbbdfd3e420900caa0a3/command/dune' \ + --with-dune='/home/ccx/versions/dune.4d25da5fd6964b19d45eb912817fe49a4149c29b66dd37f308e3be0978cabab4/command/dune' \ --with-mccs \ --with-vendored-deps diff --git a/variants/ccx-x86_64/pkgconf b/variants/ccx-x86_64/pkgconf @@ -73,12 +73,9 @@ make DESTDIR="$pthbs_destdir" install check_static command/pkgconf - mkdir -p "$dest/.env-template" - printf '%s' >"$dest/.env-template"/'PKG_CONFIG_LIBDIR' '@ENVROOT@/library/pkgconfig' - cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/ccx-x86_64/pkgconf-pkg-config b/variants/ccx-x86_64/pkgconf-pkg-config @@ -1,12 +1,13 @@ #!/usr/bin/env pthbs-build #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f -#+pkgconf.d59f11db89100bc653f02b4991a118548f698013b6d2f50665f5350e33399f2c +#+pkgconf.775fdaeb52f76357bb6927d328d8eb195f66f46b81dc54ddc17f2e1675900351 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" exe=$(realpath "$(which pkgconf)") mkdir command ln -sf "$exe" command/pkg-config +mkdir -p ".env-template" printf '%s' >".env-template/PKG_CONFIG_LIBDIR" "@ENVROOT@/library/pkgconfig" printf '%s\t%s\n' "./command/pkg-config" "./command/pkg-config" >>.install-links.new mv .install-links.new .install-links diff --git a/variants/ccx-x86_64/pthbs-banginstall b/variants/ccx-x86_64/pthbs-banginstall @@ -2,7 +2,7 @@ #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b -#+zsh.2648e0a529efe55a570fd4623464c4177772c05e176b0f12294119dfa6604da7 +#+zsh.336c0613d4f3bd70fba36f5efcb72d4a3ab4867d8ef3e3506352e5deb6f1acc6 #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall diff --git a/variants/ccx-x86_64/snaprep b/variants/ccx-x86_64/snaprep @@ -2,8 +2,8 @@ #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b -#+zsh.2648e0a529efe55a570fd4623464c4177772c05e176b0f12294119dfa6604da7 -#+pthbs-banginstall.dd343e2ad14074d84f1327791b391255fceeff5752f9d9639c0f032abb3b75cf +#+zsh.336c0613d4f3bd70fba36f5efcb72d4a3ab4867d8ef3e3506352e5deb6f1acc6 +#+pthbs-banginstall.07ae293865aeba50cbb19e5613f6786ca150575e436515c68fa24cd1fbda0aee #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config @@ -4,8 +4,8 @@ #+nawk.24907cbb8100b37ab37723f0335e79103b0135b8ae6175e179b145bbdbe500e0 #+diffutils.70f9ddaec27568b14a011789f3c6c51ee4b849637a2b8ea9dc8f6685a646c3cf #+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+aat.bed1cceeeaf99718e61a89a54d526460202c2de1e3a5052ed9f85cec7269ea30 -#+fileset.afc9e2d86825d2423202dfb40dcaf0ae374005c8c70c39182b9eebcec07be152 +#+aat.ce0d5d4b1b0aac9845b06a28ea1d17e7b51c23e1fee433300d0a4e333a2c22a4 +#+fileset.9093c2e7c657c88e275cfde76289c8f105d72814b7840ea8be25c2f526b4a6bc #+rsync.55276833e2833a1041e73acab778feec8f1e456f1010a6c3b02379bcdde02d39 #+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a #+kbd.fc6daccf346ad764ded16dc20acffe20e41966ff0bff0747aabc4b68306b8485 @@ -13,10 +13,10 @@ #+s6-linux-utils.664dc33ed8e500126bfb4e74c565990e8632879b9e165b09f7f48ac054c89a22 #+s6-rc.77ee4f3326027d4463fb531273c8b42b4d8f6fabba2d075e15e18eb2cb2a8c50 #+s6.aba44e80074ee5ae8921a773c04c3f2433945ad5566cb986e3edc5fe5c5600cf -#+zsh.2648e0a529efe55a570fd4623464c4177772c05e176b0f12294119dfa6604da7 -#+system-config-scripts.d01b8ef0ad1be29f1bb6fc41a34cbad9c4deedb1280934f542c27fda98613932 -#+logincaps.128ce50c29de922317b0efaafaf79708fd0ab685ef39df6e7267c05d578eaa8f -#+busybox.7a32f0b3c3175153d6c85ba40e3de363964ec212b8f803cb259fa3f131a4413a +#+zsh.336c0613d4f3bd70fba36f5efcb72d4a3ab4867d8ef3e3506352e5deb6f1acc6 +#+system-config-scripts.d24a638b05ec84833a96ec10e33364a76a7ae51815b455821aa3385507e0b2c0 +#+logincaps.4af3c50d58a5001c018aadac72b97ffe374acf069ef4b8588cc2533cd4407de8 +#+busybox.93f43b45ab9fa73ac6ed18328291b8566a84bdbb453bb4cf32100f71d599181f #@git:ddb20e067ab184cd18ee8b88d74044dfeeaaad4c:system-config @@ -53,8 +53,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.dd61f8b0d9fe1815b7b720801fc1c91ffbca7e2835853ddfef496ad389e786d8' \ - 'pthbs_path_mdevd=/home/ccx/versions/env.ed5735e0a289b4fe7788d2fe43e4c1da646ccc6444357fa6036d4d9cf6ebb101' \ + 'pthbs_path_containers=/home/ccx/versions/env.920d6ce8cd31c057ace4302365c13c969af4d3d44ac5b2edab45b3a88e8770e5' \ + 'pthbs_path_mdevd=/home/ccx/versions/env.88f7b0a58ed2473a99b75a7399951ad491a6c8db37a66cbd90ba40d767c76afa' \ 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 @@ -7,7 +7,7 @@ #+s6-portable-utils.945ba0fbba6153923f5a761abc154568d30fc1db69b26f03ead9fe248f87d351 #+s6-linux-init.30ee852e07291b5f3c94ed4037e403122037366bcc655a87f5527f1813332d62 #+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a -#+system-config-rc.40006d90309372d553ff5766ffbb290ef4c3e01cc5e2474ca676125202988b2c +#+system-config-rc.58f8e68efc43200d817d7eed7bbb5b7f47fbdcc3ee368664a1f8169be4e290f0 # - build script start - @@ -32,7 +32,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/home/ccx/versions/system-config-rc.40006d90309372d553ff5766ffbb290ef4c3e01cc5e2474ca676125202988b2c/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.58f8e68efc43200d817d7eed7bbb5b7f47fbdcc3ee368664a1f8169be4e290f0/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 @@ -4,8 +4,8 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+s6-rc.77ee4f3326027d4463fb531273c8b42b4d8f6fabba2d075e15e18eb2cb2a8c50 -#+fileset.afc9e2d86825d2423202dfb40dcaf0ae374005c8c70c39182b9eebcec07be152 -#+system-config.cdc72c1309b4160da5adfad3bbbb1a5fb6048204397d0f9673ac3cc50fd377c9 +#+fileset.9093c2e7c657c88e275cfde76289c8f105d72814b7840ea8be25c2f526b4a6bc +#+system-config.ae135450685dc027d9bd7552d0285065ad26dda27e883781183736d316a5e5ba # - build script start - @@ -15,7 +15,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/home/ccx/versions/system-config.cdc72c1309b4160da5adfad3bbbb1a5fb6048204397d0f9673ac3cc50fd377c9/config/s6-rc-source +src=/home/ccx/versions/system-config.ae135450685dc027d9bd7552d0285065ad26dda27e883781183736d316a5e5ba/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/system-config-scripts b/variants/ccx-x86_64/system-config-scripts @@ -2,8 +2,8 @@ #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b -#+zsh.2648e0a529efe55a570fd4623464c4177772c05e176b0f12294119dfa6604da7 -#+pthbs-banginstall.dd343e2ad14074d84f1327791b391255fceeff5752f9d9639c0f032abb3b75cf +#+zsh.336c0613d4f3bd70fba36f5efcb72d4a3ab4867d8ef3e3506352e5deb6f1acc6 +#+pthbs-banginstall.07ae293865aeba50cbb19e5613f6786ca150575e436515c68fa24cd1fbda0aee #@git:dc793695cc0632a808af9d4415f3b0cf0f4dfba2:system-config-scripts diff --git a/variants/ccx-x86_64/system-config-zsh b/variants/ccx-x86_64/system-config-zsh @@ -2,7 +2,7 @@ #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b -#+zsh.2648e0a529efe55a570fd4623464c4177772c05e176b0f12294119dfa6604da7 +#+zsh.336c0613d4f3bd70fba36f5efcb72d4a3ab4867d8ef3e3506352e5deb6f1acc6 #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh diff --git a/variants/ccx-x86_64/user-env b/variants/ccx-x86_64/user-env @@ -3,7 +3,7 @@ #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a -#+pthbs-banginstall.dd343e2ad14074d84f1327791b391255fceeff5752f9d9639c0f032abb3b75cf +#+pthbs-banginstall.07ae293865aeba50cbb19e5613f6786ca150575e436515c68fa24cd1fbda0aee #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment @@ -17,25 +17,25 @@ #+s6-dns.d0134713eb4f2fa10036f492ca4dc945e2188a8b648a78fcd8bb085a5bd627d4 #+libressl.3c695ed4a79eb6a22d402fd9c9aff21db481385d7f2281bb02d7e92dd931b894 #+s6-networking.f4a78285871a0559cd61c17855bc3d610f4b5a77c67fdc93418d599d0af1c207 -#+zsh.2648e0a529efe55a570fd4623464c4177772c05e176b0f12294119dfa6604da7 -#+pthbs-banginstall.dd343e2ad14074d84f1327791b391255fceeff5752f9d9639c0f032abb3b75cf -#+aat.bed1cceeeaf99718e61a89a54d526460202c2de1e3a5052ed9f85cec7269ea30 -#+confz.b67a7630d1faeda6e06d979b1a0c36163f279849108177f02658a35d7152ae45 -#+containers.5a2d5f35f4856166e2f3bacde111a64a24156197c79d3a7662117615fb8b170e -#+fileset.afc9e2d86825d2423202dfb40dcaf0ae374005c8c70c39182b9eebcec07be152 -#+logincaps.128ce50c29de922317b0efaafaf79708fd0ab685ef39df6e7267c05d578eaa8f -#+snaprep.092a6f35542a956ef6f9990177cbe209d48d4eb64be1f20368a87cac7903921d +#+zsh.336c0613d4f3bd70fba36f5efcb72d4a3ab4867d8ef3e3506352e5deb6f1acc6 +#+pthbs-banginstall.07ae293865aeba50cbb19e5613f6786ca150575e436515c68fa24cd1fbda0aee +#+aat.ce0d5d4b1b0aac9845b06a28ea1d17e7b51c23e1fee433300d0a4e333a2c22a4 +#+confz.1c7c274fa01467bdf851c5046369a70b5fe226bc2e66f502bc8c099baac94449 +#+containers.704dc84901f79cd7c79ccbb56738e449d582006982aac57274a09a2877fbdf74 +#+fileset.9093c2e7c657c88e275cfde76289c8f105d72814b7840ea8be25c2f526b4a6bc +#+logincaps.4af3c50d58a5001c018aadac72b97ffe374acf069ef4b8588cc2533cd4407de8 +#+snaprep.eede6a95d02b609873fc23d90276e157bac1b21c9fcf39a73e5ca31621701c10 #+curl.10fc879ea14256ab6e511319c63f19da974300ecbf2fadf3e3ccc2c6e77c9994 #+git.e9d3f4c1010863e3b73ab7d33d013793a4839e989361dda16178e2b118595292 -#+xbps.9442e6ef041812989dc692d87029b55b31f89c929545613db8bbbe5f60330441 -#+apk-tools.176bec07196d0ccba9d37db88adc2c3161a6786385b6cec22627f51bc3a67207 +#+xbps.445bd0e4c5abd2e3b5a7c132bf3cdfcc243a9aa5eb5159ab3cfe48b1539b110c +#+apk-tools.3e8eac89fdc1dd9623b8e5c50dc60c024aa782a06e1619d339f56a478968685b #+getent.2608d23855b8d871fc65438dcc9889a93095bf0131f55045e517e037243898f1 #+getconf.3f6e9e56867c13fc1f1bc3a95e692c675500944f94bd0726e34ee010d8213697 #+iconv.0618baa01d98a1805b5ff362de984adfca782727cfe5335327341c376a8c3602 -#+libcap.fc48cbe8970c897119bdea61f9aca96aa83466deec6f73b892fef626c50c81c6 -#+applyuidgid-caps.0d9f2a5244a3e94c44300b14c70315442da7c0fba70e7c2af6152402b65894d2 +#+libcap.6588056f9b7500422c48c6a250a02428095fa7deb86ead446eaa5d23dca7033a +#+applyuidgid-caps.4036b2e0cd983d266db7b4fcf30bc362c1065d521909c4128ff591768c684ae1 #+ccx-utils.ff0ba3fc3db06a0bbee9cfc410b7894b7d06c158e35b01162f46f6ece9e2dbdf -#+user-env.cc0683d9ca6986c3642304613640e0c096ca5fa18bfef1acd1d72cbdba119f78 +#+user-env.f82e155000095cd9f3d8494d76591a5aab5f0ce263bb6c0e70f60ee88aafe1c6 #+strace.24f817d87229531d5a2218f804224619ed7635b8f847c96ccb8f8926478b144a #+mlog.d3f90010a808d81d0e4e26efefd0b2325b395fd1b011f1d94cdc0be1cb017339 #+findutils.c80b9056e275f82f7d371a44035a3c11dd43faae948a696f9cea0cd681b76aef diff --git a/variants/ccx-x86_64/vm.environment b/variants/ccx-x86_64/vm.environment @@ -1,2 +1,2 @@ #!/usr/bin/env pthbs-build -#+linux-qemu-guest.0db6ce4d4301ecb2f1f211321bd7baef5bcbc502178d86fc65e45dfc95811cad- \ No newline at end of file +#+linux-qemu-guest.ec933b1898b4cef64d9e543db562654a3ca6964bbf024e830f67181885ba1cd6+ \ No newline at end of file diff --git a/variants/ccx-x86_64/wip.environment b/variants/ccx-x86_64/wip.environment @@ -1,6 +1,6 @@ #!/usr/bin/env pthbs-build -#+ocaml.c505cec20d99ea947c08fe70bb226650ef884f3bc0b505cef922e550caa217e1 -#+dune.686975ff583761e2ad730de0d76c9e1a64024750e43fdbbdfd3e420900caa0a3 -#+ocamlbuild.2124c357a9766798e604200695ea67824031468bb2fb4a685d4f5e69823859eb -#+ocaml-base.05f6bc61cfa38f09c274b5e73218bdb7e294826c6ab144370c845359e558920c -#+opam.6e1e1a50624ea19bc7dc380c8c3006f6e5b2673db926eb3d308162fef281561b- \ No newline at end of file +#+ocaml.e8475f64632713e769637c58e0a5753d06059a949ea3f60ace8da2eb99014ea8 +#+dune.4d25da5fd6964b19d45eb912817fe49a4149c29b66dd37f308e3be0978cabab4 +#+ocamlbuild.3079a0b5afd5dae1ef08a6769496b029094ffe4f123fb58ebf08e48ab569582e +#+ocaml-base.ccafeceb4b907fd29e03478c278b701d20b2d92ad2df43b73f934ba00e946e9a +#+opam.5dcfb6fd36ce02e567bd6e8cc012852ff865627a8a07a1334d4d3b082ed2efd8+ \ No newline at end of file diff --git a/variants/ccx-x86_64/xbps b/variants/ccx-x86_64/xbps @@ -6,7 +6,7 @@ #+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 #+libarchive.0ca4db115d929056aa3588b2f3b3ad24c8189c10ad71a6c0189aac4a802b9a66 #+libressl.3c695ed4a79eb6a22d402fd9c9aff21db481385d7f2281bb02d7e92dd931b894 -#+pkgconf-pkg-config.0d42ae507ed08b49639dfc49dced38f5e847c762f01f3ee8c464db7870762890 +#+pkgconf-pkg-config.9ef6f064d957ceddaed52ccf783c4dcd2b72892d7463482170fa9b576b20e4a7 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:. diff --git a/variants/ccx-x86_64/zsh b/variants/ccx-x86_64/zsh @@ -94,12 +94,9 @@ mv -v ../zsh_config/zsh-functions/* "${dest}/zsh/site-functions/" check_static command/zsh - mkdir -p "$dest/.env-template" - printf '%s' >"$dest/.env-template"/'FPATH' '@ENVROOT@/zsh/site-functions:@ENVROOT@/zsh/functions' - cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/aat b/variants/root-x86_64/aat @@ -2,8 +2,8 @@ #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b -#+zsh.c314c3a6ed8bef958d5a03eeded90b911ffc78de0403204340dae24c640be6ee -#+pthbs-banginstall.b6f065725dbe483bf89c60c23b0674ccbc75f458055166e3e4664734f07508a2 +#+zsh.1e5d7adeb0231a6acf1e5ba0ead76084c96ddbe0cb0c060aefe58c07129a453b +#+pthbs-banginstall.27dde5262c02bd5d3674d61c4418e2965fa77d78363fd2c5f0d8f7354ad9df96 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat diff --git a/variants/root-x86_64/apk-tools b/variants/root-x86_64/apk-tools @@ -8,7 +8,7 @@ #+patch.1f7ab95c511ea31573c4b2e3338bd15925cd1b93631a0681388475e41678d93f #+libressl.86f9dd5a8a3bb042d9561ef187d7fb64f9cc2be3bb707b9e171208bae5c684ef #+zstd.38b14331a2c89a3fc5d568ddddc14918031315ba2a24b6ffa8bd874c6f54bbc1 -#+pkgconf-pkg-config.4362e2da94de8985f68a5598e669ded394917cd956553b08983d3095c535bc32 +#+pkgconf-pkg-config.4e0907690130fe80a9012048db13879e65e8f0529d86358440a1e7f0e144bf2e #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools diff --git a/variants/root-x86_64/applyuidgid-caps b/variants/root-x86_64/applyuidgid-caps @@ -4,7 +4,7 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 #+skalibs.a26d2e6f716163365561db4c61d78907be5ed9b34cfbc9d2475962029ba39aeb -#+libcap.2e1454476c6b914797e000e8820842c0fcd62e998f80dfd3abb51ed3457ca05e +#+libcap.274e01d3aa696328f42127db9000d4ac9ede051e78479e5abbe830e2c6ada098 #@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c diff --git a/variants/root-x86_64/busybox:modutils b/variants/root-x86_64/busybox:modutils @@ -1,5 +1,5 @@ #!/usr/bin/env pthbs-build -#+linux.18ba2b8d7db1cbaf44e01b676acc2b537986376c023e0f0890e0bb7f5544a5f4 +#+linux.d9bb271bb913c09bf78fcc1a2cdf84219cc2e00ba0d0976728bd6e87dde0a104 #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 #+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 @@ -34,7 +34,7 @@ export CFLAGS="-D_GNU_SOURCE" export LDFLAGS="-static" # TODO: indirection via deps directory/symlink cat >>.config <<EOF -CONFIG_DEFAULT_MODULES_DIR="/versions/linux.18ba2b8d7db1cbaf44e01b676acc2b537986376c023e0f0890e0bb7f5544a5f4" +CONFIG_DEFAULT_MODULES_DIR="/versions/linux.d9bb271bb913c09bf78fcc1a2cdf84219cc2e00ba0d0976728bd6e87dde0a104" EOF make oldconfig cat .config diff --git a/variants/root-x86_64/confz b/variants/root-x86_64/confz @@ -2,8 +2,8 @@ #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b -#+zsh.c314c3a6ed8bef958d5a03eeded90b911ffc78de0403204340dae24c640be6ee -#+pthbs-banginstall.b6f065725dbe483bf89c60c23b0674ccbc75f458055166e3e4664734f07508a2 +#+zsh.1e5d7adeb0231a6acf1e5ba0ead76084c96ddbe0cb0c060aefe58c07129a453b +#+pthbs-banginstall.27dde5262c02bd5d3674d61c4418e2965fa77d78363fd2c5f0d8f7354ad9df96 #@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz diff --git a/variants/root-x86_64/container-bin-image b/variants/root-x86_64/container-bin-image @@ -5,8 +5,8 @@ #+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284 #+s6.344af4b89dee417e72484532005f0a223e20675a15daac49d498a554812bac61 #+ccx-utils.769c165236aa3bc0564901e48e65c035ab3d342564dd1a440a512347d62d4ce9 -#+applyuidgid-caps.4dda6d0ddc60e8cbfee67b4099eedc0daecbaeede25f83bd80e6bfc1d5ee5d95 -#+easyseccomp.d909049a6ef20a6ea9a63e4ddc53a4409d576d8162e2451b40ac50cca2f1b9d4 +#+applyuidgid-caps.0fb7e638b9066415474fefe0b92796ba48c88c80cf523aa9d55b8d951f3faa7c +#+easyseccomp.db9051920fbf53f0066a2b81d32a92923aedf6aaed3f9ad8739fd607a2733e2e #+mlog.f9e7afa9325b4affd4298e6de0a07d22a074799f0ea7bda1e3fb58a37b98e398 #+abduco.089653d0849acda0e1723469ed2913556b6b86a32056932b8f4069c5ceec76ae #+nawk.8521bf13f53618b7897b7f2e070a506a0101c985f6b9bb527d5eb15d8e8d4858 diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers @@ -2,13 +2,13 @@ #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b -#+zsh.c314c3a6ed8bef958d5a03eeded90b911ffc78de0403204340dae24c640be6ee -#+pthbs-banginstall.b6f065725dbe483bf89c60c23b0674ccbc75f458055166e3e4664734f07508a2 +#+zsh.1e5d7adeb0231a6acf1e5ba0ead76084c96ddbe0cb0c060aefe58c07129a453b +#+pthbs-banginstall.27dde5262c02bd5d3674d61c4418e2965fa77d78363fd2c5f0d8f7354ad9df96 #+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284 #+alpine-keys.9903799b52320b5d6618a3e3c87cef9da76e3b5291abfe1fd563fddfd04f35ae -#+apk-tools.96cd8b3b3dab479ecd78c79c97df0d247a815b17d4c4cebcc474e08cb4c5c47d -#+xbps.bd25ff9ede8402b5add7b98eff8f7a82eaef01bbdd77abadd10fbacc1b3634e8 -#+container-bin-image.9b82298a3f2a585d7fcdd3158eefdf0e1d3b85e4ce2dcf4088b36affa0e13ae4 +#+apk-tools.1e9a695ca86141b00b149ed05058a2189dd863633181b7f871d8a0b3774952e0 +#+xbps.6eed71df6447b6118e7ffa05013a213ad13b768423ffaf3d8dbfc1b6f040f60c +#+container-bin-image.205a8c422fdb61ee1badb11a5b9dd857d1b2b43c111a8416c78fe8331e818277 #@git:8ec212c9411088ad7e116e330d6a33f68c539678:containers @@ -51,8 +51,8 @@ printf '%s\n' >"${dest}/zsh/site-functions/confz_containers_pthbs_init" \ "typeset -g container_xbps_install_executable='$prefix/deps/command/xbps-install.static'" mkdir -p "${dest}/deps/command" -ln -sf '/versions/apk-tools.96cd8b3b3dab479ecd78c79c97df0d247a815b17d4c4cebcc474e08cb4c5c47d/command/apk.static' "${dest}/deps/command/" -ln -sf '/versions/xbps.bd25ff9ede8402b5add7b98eff8f7a82eaef01bbdd77abadd10fbacc1b3634e8/command/xbps-install.static' "${dest}/deps/command/" +ln -sf '/versions/apk-tools.1e9a695ca86141b00b149ed05058a2189dd863633181b7f871d8a0b3774952e0/command/apk.static' "${dest}/deps/command/" +ln -sf '/versions/xbps.6eed71df6447b6118e7ffa05013a213ad13b768423ffaf3d8dbfc1b6f040f60c/command/xbps-install.static' "${dest}/deps/command/" for f in '/versions/alpine-keys.9903799b52320b5d6618a3e3c87cef9da76e3b5291abfe1fd563fddfd04f35ae'/keys/alpine/*/*; do test -f "$f" @@ -62,13 +62,13 @@ for f in '/versions/alpine-keys.9903799b52320b5d6618a3e3c87cef9da76e3b5291abfe1f done mkdir -p "${dest}/deps/keys/void" -for f in '/versions/xbps.bd25ff9ede8402b5add7b98eff8f7a82eaef01bbdd77abadd10fbacc1b3634e8'/keys/void/*; do +for f in '/versions/xbps.6eed71df6447b6118e7ffa05013a213ad13b768423ffaf3d8dbfc1b6f040f60c'/keys/void/*; do ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/versions/container-bin-image.9b82298a3f2a585d7fcdd3158eefdf0e1d3b85e4ce2dcf4088b36affa0e13ae4/container-bin-image' -test -f '/versions/container-bin-image.9b82298a3f2a585d7fcdd3158eefdf0e1d3b85e4ce2dcf4088b36affa0e13ae4/container-bin-image/if' -ln -sf '/versions/container-bin-image.9b82298a3f2a585d7fcdd3158eefdf0e1d3b85e4ce2dcf4088b36affa0e13ae4/container-bin-image' "${dest}/deps/" +test -d '/versions/container-bin-image.205a8c422fdb61ee1badb11a5b9dd857d1b2b43c111a8416c78fe8331e818277/container-bin-image' +test -f '/versions/container-bin-image.205a8c422fdb61ee1badb11a5b9dd857d1b2b43c111a8416c78fe8331e818277/container-bin-image/if' +ln -sf '/versions/container-bin-image.205a8c422fdb61ee1badb11a5b9dd857d1b2b43c111a8416c78fe8331e818277/container-bin-image' "${dest}/deps/" diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment @@ -5,16 +5,16 @@ #+s6.344af4b89dee417e72484532005f0a223e20675a15daac49d498a554812bac61 #+s6-portable-utils.07e8ff4d2d45a743ec810d3e27268460d201bafbb0a765756da09179758d4b0d #+s6-linux-utils.2e5ac9209104c458e8935a4b4e9ce3ed6e9aa3e6c4d85675a1e945d1fe77530f -#+zsh.c314c3a6ed8bef958d5a03eeded90b911ffc78de0403204340dae24c640be6ee -#+confz.b97475076615ecc6da4d79b348861a469c76564de60be552a257a11815203bda -#+containers.ed133713390de0824820c5462099ad661b1d35f3686c317f1e6431a8e0f9de1f -#+xbps.bd25ff9ede8402b5add7b98eff8f7a82eaef01bbdd77abadd10fbacc1b3634e8 +#+zsh.1e5d7adeb0231a6acf1e5ba0ead76084c96ddbe0cb0c060aefe58c07129a453b +#+confz.494e7da0820e49fc080473d285433648c8d7b7e2f3edac0dd1f80e368cdcde03 +#+containers.bd974b36ae1b09c73ecf8c366672384e19724d7d7c9236e791dd77e095d8c97f +#+xbps.6eed71df6447b6118e7ffa05013a213ad13b768423ffaf3d8dbfc1b6f040f60c #+zstd.38b14331a2c89a3fc5d568ddddc14918031315ba2a24b6ffa8bd874c6f54bbc1 -#+apk-tools.96cd8b3b3dab479ecd78c79c97df0d247a815b17d4c4cebcc474e08cb4c5c47d +#+apk-tools.1e9a695ca86141b00b149ed05058a2189dd863633181b7f871d8a0b3774952e0 #+alpine-keys.9903799b52320b5d6618a3e3c87cef9da76e3b5291abfe1fd563fddfd04f35ae #+getent.219406db8d31c860d8fb9052a1158f072c8b77ef4d1b71ef24e5fcc649201521 -#+fileset.b3f6c456223edd6beb7b4492e851f3f9c05d5ebbf1ff36f2d6a07603e8a5c37a +#+fileset.81ce80171feac7d136ca42835a6fb161d9183fc2e3aaf1d60541b6e5c6965a50 #+ccx-utils.769c165236aa3bc0564901e48e65c035ab3d342564dd1a440a512347d62d4ce9 -#+easyseccomp.d909049a6ef20a6ea9a63e4ddc53a4409d576d8162e2451b40ac50cca2f1b9d4 +#+easyseccomp.db9051920fbf53f0066a2b81d32a92923aedf6aaed3f9ad8739fd607a2733e2e #+findutils.1edbb84f016e9dc61540b8396e85a2163570b9281a408f8787f17e404f685ce0 #+nawk.8521bf13f53618b7897b7f2e070a506a0101c985f6b9bb527d5eb15d8e8d4858 \ No newline at end of file diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -17,31 +17,31 @@ #+s6-dns.66def5b5ecaa018779d26f6f341b8477f6e2ef8e6aee5e4f30e2f4ee36d59299 #+libressl.86f9dd5a8a3bb042d9561ef187d7fb64f9cc2be3bb707b9e171208bae5c684ef #+s6-networking.2e3a2b62476afed6b35e208fda1dfb764dc27b8319ec876411dcdb0c8e3bdc3e -#+zsh.c314c3a6ed8bef958d5a03eeded90b911ffc78de0403204340dae24c640be6ee -#+pthbs-banginstall.b6f065725dbe483bf89c60c23b0674ccbc75f458055166e3e4664734f07508a2 -#+aat.13a9895e0bae8d3653d847a595f4e4cafd0fcc7c96e71b18dd0021d2fa034646 -#+confz.b97475076615ecc6da4d79b348861a469c76564de60be552a257a11815203bda -#+containers.ed133713390de0824820c5462099ad661b1d35f3686c317f1e6431a8e0f9de1f -#+fileset.b3f6c456223edd6beb7b4492e851f3f9c05d5ebbf1ff36f2d6a07603e8a5c37a -#+logincaps.9521f2ed324c343657aa56e7483577509f567566b97b84bac012a869096a4fff -#+snaprep.995dc0361dc0ae81c7e079a2f785b716ee88490680be562cd751a2808328632c +#+zsh.1e5d7adeb0231a6acf1e5ba0ead76084c96ddbe0cb0c060aefe58c07129a453b +#+pthbs-banginstall.27dde5262c02bd5d3674d61c4418e2965fa77d78363fd2c5f0d8f7354ad9df96 +#+aat.76cf0cf351a0b6933594dca30b3f1cd494d85168fe1c79cbb7027ec52add090e +#+confz.494e7da0820e49fc080473d285433648c8d7b7e2f3edac0dd1f80e368cdcde03 +#+containers.bd974b36ae1b09c73ecf8c366672384e19724d7d7c9236e791dd77e095d8c97f +#+fileset.81ce80171feac7d136ca42835a6fb161d9183fc2e3aaf1d60541b6e5c6965a50 +#+logincaps.f50e34ad4a2eac15dfbad518129c9f5e829501d88821716b5aad6e9a5ad7c3cb +#+snaprep.352af7e6195c84c6ade6f25fc5f451ca9ec9ca92d086fa08e21b8185bba78f82 #+curl.718c045c064f1e9fd5a7c71f50384345e35e1fc80e3ae7fdacadce73454dd3e7 #+git.96c05646b93e3a672c5591f704106d3f6fea912d796cd0df6abd655b243d86eb -#+xbps.bd25ff9ede8402b5add7b98eff8f7a82eaef01bbdd77abadd10fbacc1b3634e8 -#+apk-tools.96cd8b3b3dab479ecd78c79c97df0d247a815b17d4c4cebcc474e08cb4c5c47d +#+xbps.6eed71df6447b6118e7ffa05013a213ad13b768423ffaf3d8dbfc1b6f040f60c +#+apk-tools.1e9a695ca86141b00b149ed05058a2189dd863633181b7f871d8a0b3774952e0 #+getent.219406db8d31c860d8fb9052a1158f072c8b77ef4d1b71ef24e5fcc649201521 #+getconf.a13baa310359caefe186a823f0386190b6286fccf30aaf8301e115f3dc973d44 #+iconv.7afe835f0a03884e71f41bd2a96a88e9e1e73233137cb94da9f73a6721ed3001 -#+libcap.2e1454476c6b914797e000e8820842c0fcd62e998f80dfd3abb51ed3457ca05e -#+applyuidgid-caps.4dda6d0ddc60e8cbfee67b4099eedc0daecbaeede25f83bd80e6bfc1d5ee5d95 +#+libcap.274e01d3aa696328f42127db9000d4ac9ede051e78479e5abbe830e2c6ada098 +#+applyuidgid-caps.0fb7e638b9066415474fefe0b92796ba48c88c80cf523aa9d55b8d951f3faa7c #+ccx-utils.769c165236aa3bc0564901e48e65c035ab3d342564dd1a440a512347d62d4ce9 -#+user-env.78b039be2e0732709774f80dd3455f3785f2b5febb591a956303c2aeed468547 +#+user-env.f2f4b3ce00d174692fd29ce6bcfebe05c0b54d5d99677350b6dd93af20e1a998 #+strace.f67bc48859477eb362b356c2f4fd4d3a6a38fb3d32969338ec7f87dd48634904 #+mlog.f9e7afa9325b4affd4298e6de0a07d22a074799f0ea7bda1e3fb58a37b98e398 #+findutils.1edbb84f016e9dc61540b8396e85a2163570b9281a408f8787f17e404f685ce0 #+nawk.8521bf13f53618b7897b7f2e070a506a0101c985f6b9bb527d5eb15d8e8d4858 -#+system-config.d7f5d21257eb60da8df3dc4bc8b3ad0dc34538297072ee45bca2363e76dd1aeb -#+system-config-rc.48e88f05896a1a062cf612fe98cd87f07540fbf80179ee6536850c9fb4945d25 -#+system-config-scripts.6c3b2eb373b9768ac4d1ad2a919e8f514ef81d028db8dd4a27e7472cc7d97258 -#+system-config-init.439b0d68164b2f990989141c8e2951c5e6bf51bc4545d8f36ddfcaf47dca884d -#+system-config-zsh.b20e8d491536b4a2107fba55e995f077668ab62f6a239ea1a2c7a492688b8d52- \ No newline at end of file +#+system-config.d7e10f0a6c886d98581fb8db1d004c62ce344b30e67368ac2a32e3664cb0b196 +#+system-config-rc.73d64e871796c24344bfa7567a58528d8b879d04744db988c2fae58c4e96a67d +#+system-config-scripts.eb0793597e00029d02c25440f576a52b522b472e9a2f259e96b22a5bfb6497bd +#+system-config-init.b1f1e160753cb0c872866f058d71bac261631d4a3b9b723e3b428cbbc4f57036 +#+system-config-zsh.2e07707c6746db408cf5d753af283c87f2d6cc591318a88a495c0a44ee424bbc+ \ No newline at end of file diff --git a/variants/root-x86_64/dune b/variants/root-x86_64/dune @@ -4,7 +4,7 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.39aee0f50cdbe3680c2a6e92531454b56eb03ec7d245394f8086b29fcec3a50d +#+ocaml.216504d39c27c787ed0182fab857700af35d56d800e8e90fcabba6434d7a37fe #@untar:-z:sha256:579c738f8ca191ba0a9b22dbe78f1377542442c9827cf4939f8964f09f9edb28:. diff --git a/variants/root-x86_64/easyseccomp b/variants/root-x86_64/easyseccomp @@ -9,7 +9,7 @@ #+patch.1f7ab95c511ea31573c4b2e3338bd15925cd1b93631a0681388475e41678d93f #+flex.a0b530df71023dab46f59c8c0a6255bae4c6e8e8d88087364e36fcc86318f41b #+bison.50a879da42f360f6a461ecb3eaafaed1ee77389f064b469614f27328bbd15e44 -#+libseccomp.18f27e2c812e97027388dc00a83c0dc5d11109d5d685582e20cffc32b32c9b60 +#+libseccomp.7d175debd4e2f25cd260f513237a3531dc86560c28b62a31d41c26dafa2fe58b #+error-standalone.83fe263a36f70674cf9285b3acc3ded8716d9f7ad735642160d203c3516d0b81 #+argp-standalone.ce895c27959569e1e8043165ffc45a83f91bbab063876272eabd4870766f3721 #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp diff --git a/variants/root-x86_64/fileset b/variants/root-x86_64/fileset @@ -2,8 +2,8 @@ #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b -#+zsh.c314c3a6ed8bef958d5a03eeded90b911ffc78de0403204340dae24c640be6ee -#+pthbs-banginstall.b6f065725dbe483bf89c60c23b0674ccbc75f458055166e3e4664734f07508a2 +#+zsh.1e5d7adeb0231a6acf1e5ba0ead76084c96ddbe0cb0c060aefe58c07129a453b +#+pthbs-banginstall.27dde5262c02bd5d3674d61c4418e2965fa77d78363fd2c5f0d8f7354ad9df96 #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset diff --git a/variants/root-x86_64/kernel.environment b/variants/root-x86_64/kernel.environment @@ -1,3 +1,3 @@ #!/usr/bin/env pthbs-build -#+linux.18ba2b8d7db1cbaf44e01b676acc2b537986376c023e0f0890e0bb7f5544a5f4 -#+busybox.3e24c0cb393bfd6fee63c7bccf79f231aa8bf27fff313b9f2f23a353cda0d0c4- \ No newline at end of file +#+linux.d9bb271bb913c09bf78fcc1a2cdf84219cc2e00ba0d0976728bd6e87dde0a104 +#+busybox.a1cf9ef548e55d719aa653fdbb7e268549cf694a3039cca858cb95b9c78b38c9+ \ No newline at end of file diff --git a/variants/root-x86_64/libcap b/variants/root-x86_64/libcap @@ -5,7 +5,7 @@ #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 #+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc -#+pkgconf-pkg-config.4362e2da94de8985f68a5598e669ded394917cd956553b08983d3095c535bc32 +#+pkgconf-pkg-config.4e0907690130fe80a9012048db13879e65e8f0529d86358440a1e7f0e144bf2e #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:. diff --git a/variants/root-x86_64/libseccomp b/variants/root-x86_64/libseccomp @@ -6,7 +6,7 @@ #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 #+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 #+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 -#+pkgconf-pkg-config.4362e2da94de8985f68a5598e669ded394917cd956553b08983d3095c535bc32 +#+pkgconf-pkg-config.4e0907690130fe80a9012048db13879e65e8f0529d86358440a1e7f0e144bf2e #+gperf.9bfec911edec77c04d4078d64a50bcdf53ad748bea18e87a593d34514f54995f #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:. diff --git a/variants/root-x86_64/linux b/variants/root-x86_64/linux @@ -11,7 +11,7 @@ #+rsync.a3914e6a58e85cc838ef8c8cda9ec4ba6e49cdd7376d09a2d0c6b072c656c3e7 #+zstd.38b14331a2c89a3fc5d568ddddc14918031315ba2a24b6ffa8bd874c6f54bbc1 #+libelf.e0061547c78397275ebd62dfe0e0b0640c7b7c1efdb341dc7763ac5c926b5106 -#+pkgconf-pkg-config.4362e2da94de8985f68a5598e669ded394917cd956553b08983d3095c535bc32 +#+pkgconf-pkg-config.4e0907690130fe80a9012048db13879e65e8f0529d86358440a1e7f0e144bf2e #+nawk.8521bf13f53618b7897b7f2e070a506a0101c985f6b9bb527d5eb15d8e8d4858 #@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:. #@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz diff --git a/variants/root-x86_64/linux-qemu-guest b/variants/root-x86_64/linux-qemu-guest @@ -11,7 +11,7 @@ #+rsync.a3914e6a58e85cc838ef8c8cda9ec4ba6e49cdd7376d09a2d0c6b072c656c3e7 #+zstd.38b14331a2c89a3fc5d568ddddc14918031315ba2a24b6ffa8bd874c6f54bbc1 #+libelf.e0061547c78397275ebd62dfe0e0b0640c7b7c1efdb341dc7763ac5c926b5106 -#+pkgconf-pkg-config.4362e2da94de8985f68a5598e669ded394917cd956553b08983d3095c535bc32 +#+pkgconf-pkg-config.4e0907690130fe80a9012048db13879e65e8f0529d86358440a1e7f0e144bf2e #+nawk.8521bf13f53618b7897b7f2e070a506a0101c985f6b9bb527d5eb15d8e8d4858 #@untar:-J:sha256:7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764:. #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config diff --git a/variants/root-x86_64/logincaps b/variants/root-x86_64/logincaps @@ -2,8 +2,8 @@ #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b -#+zsh.c314c3a6ed8bef958d5a03eeded90b911ffc78de0403204340dae24c640be6ee -#+pthbs-banginstall.b6f065725dbe483bf89c60c23b0674ccbc75f458055166e3e4664734f07508a2 +#+zsh.1e5d7adeb0231a6acf1e5ba0ead76084c96ddbe0cb0c060aefe58c07129a453b +#+pthbs-banginstall.27dde5262c02bd5d3674d61c4418e2965fa77d78363fd2c5f0d8f7354ad9df96 #+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284 #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 #+ccx-utils.769c165236aa3bc0564901e48e65c035ab3d342564dd1a440a512347d62d4ce9 diff --git a/variants/root-x86_64/mdev-scripts b/variants/root-x86_64/mdev-scripts @@ -1,6 +1,6 @@ #!/usr/bin/env pthbs-build -#+zsh.c314c3a6ed8bef958d5a03eeded90b911ffc78de0403204340dae24c640be6ee -#+pthbs-banginstall.b6f065725dbe483bf89c60c23b0674ccbc75f458055166e3e4664734f07508a2 +#+zsh.1e5d7adeb0231a6acf1e5ba0ead76084c96ddbe0cb0c060aefe58c07129a453b +#+pthbs-banginstall.27dde5262c02bd5d3674d61c4418e2965fa77d78363fd2c5f0d8f7354ad9df96 #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts diff --git a/variants/root-x86_64/mdevd.environment b/variants/root-x86_64/mdevd.environment @@ -2,6 +2,6 @@ #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284 #+s6.344af4b89dee417e72484532005f0a223e20675a15daac49d498a554812bac61 -#+mdev-scripts.b479f76641c75492c867bdb1f9d56b9a176b7b5221aee61154ac63011900ed1d +#+mdev-scripts.06be2bd59c8c8c6034b3ec7b95b2da951e7dfd0fa25173ae332e6e9b5065decb #+mdevd.0502ff0a0d6e4f3b58469d0d3aef8816631718d5375ec0d41913dfa9121590fb -#+busybox.3e24c0cb393bfd6fee63c7bccf79f231aa8bf27fff313b9f2f23a353cda0d0c4- \ No newline at end of file +#+busybox.a1cf9ef548e55d719aa653fdbb7e268549cf694a3039cca858cb95b9c78b38c9+ \ No newline at end of file diff --git a/variants/root-x86_64/ocaml b/variants/root-x86_64/ocaml @@ -72,14 +72,10 @@ make DESTDIR="$pthbs_destdir" install check_static command/ocamlopt - mkdir -p "$dest/.env-template" - printf '%s' >"$dest/.env-template"/'OCAMLPARAM' 'I=@ENVROOT@/library.ocaml,_' - printf '%s' >"$dest/.env-template"/'OCAMLPATH' '@ENVROOT@/library.ocaml' - cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/ocaml-base b/variants/root-x86_64/ocaml-base @@ -4,9 +4,9 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.39aee0f50cdbe3680c2a6e92531454b56eb03ec7d245394f8086b29fcec3a50d -#+dune.2d021fc2442f2fdbef0dafd17fe960fddce2081f12f8a93ec066b7c7dc614d3d -#+ocaml_intrinsics_kernel.b68f95f50c22eb58e4d6f528f1b7916c7259cbd154d87e6f4be35785451212f8 +#+ocaml.216504d39c27c787ed0182fab857700af35d56d800e8e90fcabba6434d7a37fe +#+dune.3736ad15957f8c2d6c3d1369b2e10f8c7095a2a96810f35c4264b13bba8f390b +#+ocaml_intrinsics_kernel.de1d8626c1798befb5758abe2272eaa4a9d255f353ea8061a4c52218354bcbd5 #@untar:-z:sha256:3f3f64789ab25bb5cb7f5f907dd651dec9cc9440981822fe75df6b94344b7208:. diff --git a/variants/root-x86_64/ocaml-findlib b/variants/root-x86_64/ocaml-findlib @@ -6,7 +6,7 @@ #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 #+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 #+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 -#+ocaml.39aee0f50cdbe3680c2a6e92531454b56eb03ec7d245394f8086b29fcec3a50d +#+ocaml.216504d39c27c787ed0182fab857700af35d56d800e8e90fcabba6434d7a37fe #@untar:-z:sha256:d6899935ccabf67f067a9af3f3f88d94e310075d13c648fa03ff498769ce039d:. diff --git a/variants/root-x86_64/ocaml_intrinsics_kernel b/variants/root-x86_64/ocaml_intrinsics_kernel @@ -4,8 +4,8 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.39aee0f50cdbe3680c2a6e92531454b56eb03ec7d245394f8086b29fcec3a50d -#+dune.2d021fc2442f2fdbef0dafd17fe960fddce2081f12f8a93ec066b7c7dc614d3d +#+ocaml.216504d39c27c787ed0182fab857700af35d56d800e8e90fcabba6434d7a37fe +#+dune.3736ad15957f8c2d6c3d1369b2e10f8c7095a2a96810f35c4264b13bba8f390b #@untar:-z:sha256:c988b7769a59749631c3c98ba5edd1d2fe91f5dc380b5e0593c073c92f4bee01:. diff --git a/variants/root-x86_64/ocamlbuild b/variants/root-x86_64/ocamlbuild @@ -6,7 +6,7 @@ #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 #+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 #+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 -#+ocaml.39aee0f50cdbe3680c2a6e92531454b56eb03ec7d245394f8086b29fcec3a50d +#+ocaml.216504d39c27c787ed0182fab857700af35d56d800e8e90fcabba6434d7a37fe #@untar:-z:sha256:2ba6857f2991b7f69368e8db818b163d31cf5a367f15f5953bf8f01a77b3d4fc:. diff --git a/variants/root-x86_64/opam b/variants/root-x86_64/opam @@ -4,8 +4,8 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+ocaml.39aee0f50cdbe3680c2a6e92531454b56eb03ec7d245394f8086b29fcec3a50d -#+dune.2d021fc2442f2fdbef0dafd17fe960fddce2081f12f8a93ec066b7c7dc614d3d +#+ocaml.216504d39c27c787ed0182fab857700af35d56d800e8e90fcabba6434d7a37fe +#+dune.3736ad15957f8c2d6c3d1369b2e10f8c7095a2a96810f35c4264b13bba8f390b #@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:. @@ -42,7 +42,7 @@ cd 'opam-full-2.4.1' --infodir="$prefix/info" \ --localedir="$prefix/locale" \ --localstatedir='/var/pthbs' \ - --with-dune='/versions/dune.2d021fc2442f2fdbef0dafd17fe960fddce2081f12f8a93ec066b7c7dc614d3d/command/dune' \ + --with-dune='/versions/dune.3736ad15957f8c2d6c3d1369b2e10f8c7095a2a96810f35c4264b13bba8f390b/command/dune' \ --with-mccs \ --with-vendored-deps diff --git a/variants/root-x86_64/pkgconf b/variants/root-x86_64/pkgconf @@ -73,12 +73,9 @@ make DESTDIR="$pthbs_destdir" install check_static command/pkgconf - mkdir -p "$dest/.env-template" - printf '%s' >"$dest/.env-template"/'PKG_CONFIG_LIBDIR' '@ENVROOT@/library/pkgconfig' - cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN { diff --git a/variants/root-x86_64/pkgconf-pkg-config b/variants/root-x86_64/pkgconf-pkg-config @@ -1,12 +1,13 @@ #!/usr/bin/env pthbs-build #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 -#+pkgconf.2be69ddee3505cd652f881bf5140ffbe0b9aa36d4920deffa1f26a2b49d1d2d6 +#+pkgconf.768ade23acacb350d9dd83e191e094be9411874b0d48085ed9b352deeba7a263 mkdir -p "$pthbs_destdir/versions/$pthbs_package" cd "$pthbs_destdir/versions/$pthbs_package" exe=$(realpath "$(which pkgconf)") mkdir command ln -sf "$exe" command/pkg-config +mkdir -p ".env-template" printf '%s' >".env-template/PKG_CONFIG_LIBDIR" "@ENVROOT@/library/pkgconfig" printf '%s\t%s\n' "./command/pkg-config" "./command/pkg-config" >>.install-links.new mv .install-links.new .install-links diff --git a/variants/root-x86_64/pthbs-banginstall b/variants/root-x86_64/pthbs-banginstall @@ -2,7 +2,7 @@ #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b -#+zsh.c314c3a6ed8bef958d5a03eeded90b911ffc78de0403204340dae24c640be6ee +#+zsh.1e5d7adeb0231a6acf1e5ba0ead76084c96ddbe0cb0c060aefe58c07129a453b #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall diff --git a/variants/root-x86_64/snaprep b/variants/root-x86_64/snaprep @@ -2,8 +2,8 @@ #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b -#+zsh.c314c3a6ed8bef958d5a03eeded90b911ffc78de0403204340dae24c640be6ee -#+pthbs-banginstall.b6f065725dbe483bf89c60c23b0674ccbc75f458055166e3e4664734f07508a2 +#+zsh.1e5d7adeb0231a6acf1e5ba0ead76084c96ddbe0cb0c060aefe58c07129a453b +#+pthbs-banginstall.27dde5262c02bd5d3674d61c4418e2965fa77d78363fd2c5f0d8f7354ad9df96 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config @@ -4,8 +4,8 @@ #+nawk.8521bf13f53618b7897b7f2e070a506a0101c985f6b9bb527d5eb15d8e8d4858 #+diffutils.dbe0e2258153174e9bde5107bab7a436d8c4d8b88e9d74f35eb72b67cfc73148 #+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+aat.13a9895e0bae8d3653d847a595f4e4cafd0fcc7c96e71b18dd0021d2fa034646 -#+fileset.b3f6c456223edd6beb7b4492e851f3f9c05d5ebbf1ff36f2d6a07603e8a5c37a +#+aat.76cf0cf351a0b6933594dca30b3f1cd494d85168fe1c79cbb7027ec52add090e +#+fileset.81ce80171feac7d136ca42835a6fb161d9183fc2e3aaf1d60541b6e5c6965a50 #+rsync.a3914e6a58e85cc838ef8c8cda9ec4ba6e49cdd7376d09a2d0c6b072c656c3e7 #+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284 #+kbd.6c8d2c7d8367fa6fe1ec7df2aa44c09f120f7ba886fc69cd39e336f8cd99121c @@ -13,10 +13,10 @@ #+s6-linux-utils.2e5ac9209104c458e8935a4b4e9ce3ed6e9aa3e6c4d85675a1e945d1fe77530f #+s6-rc.9416ba0fe405fc2a019beeee1b35a666324184886c12b89deb929c515ca06183 #+s6.344af4b89dee417e72484532005f0a223e20675a15daac49d498a554812bac61 -#+zsh.c314c3a6ed8bef958d5a03eeded90b911ffc78de0403204340dae24c640be6ee -#+system-config-scripts.6c3b2eb373b9768ac4d1ad2a919e8f514ef81d028db8dd4a27e7472cc7d97258 -#+logincaps.9521f2ed324c343657aa56e7483577509f567566b97b84bac012a869096a4fff -#+busybox.3e24c0cb393bfd6fee63c7bccf79f231aa8bf27fff313b9f2f23a353cda0d0c4 +#+zsh.1e5d7adeb0231a6acf1e5ba0ead76084c96ddbe0cb0c060aefe58c07129a453b +#+system-config-scripts.eb0793597e00029d02c25440f576a52b522b472e9a2f259e96b22a5bfb6497bd +#+logincaps.f50e34ad4a2eac15dfbad518129c9f5e829501d88821716b5aad6e9a5ad7c3cb +#+busybox.a1cf9ef548e55d719aa653fdbb7e268549cf694a3039cca858cb95b9c78b38c9 #@git:ddb20e067ab184cd18ee8b88d74044dfeeaaad4c:system-config @@ -53,8 +53,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.f7acc4ceff4f552c1460ab30c7ee0d9a669d1cce703f0551ec1ecbfe82d56a6f' \ - 'pthbs_path_mdevd=/versions/env.d1d1c766361b53bcb99bc0a04c32a2ed4047bc05c8a6ad0660687e1a7d19bddc' \ + 'pthbs_path_containers=/versions/env.871b6cb91be69b8f65e911c95850b19744b6a20f848d1e64de5cc2481458daa1' \ + 'pthbs_path_mdevd=/versions/env.5b7207b9d27add44e0563d7df35cd2a4dc8384fdb89127d2c751cf27278ef03a' \ 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 @@ -7,7 +7,7 @@ #+s6-portable-utils.07e8ff4d2d45a743ec810d3e27268460d201bafbb0a765756da09179758d4b0d #+s6-linux-init.e17bf07f726729c579bb12c1d25dad4bb263f96509f7ea852bb44d50737d0b4d #+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284 -#+system-config-rc.48e88f05896a1a062cf612fe98cd87f07540fbf80179ee6536850c9fb4945d25 +#+system-config-rc.73d64e871796c24344bfa7567a58528d8b879d04744db988c2fae58c4e96a67d # - build script start - @@ -32,7 +32,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/versions/system-config-rc.48e88f05896a1a062cf612fe98cd87f07540fbf80179ee6536850c9fb4945d25/config/s6-rc-db +s6rcdb=/versions/system-config-rc.73d64e871796c24344bfa7567a58528d8b879d04744db988c2fae58c4e96a67d/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 @@ -4,8 +4,8 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+s6-rc.9416ba0fe405fc2a019beeee1b35a666324184886c12b89deb929c515ca06183 -#+fileset.b3f6c456223edd6beb7b4492e851f3f9c05d5ebbf1ff36f2d6a07603e8a5c37a -#+system-config.d7f5d21257eb60da8df3dc4bc8b3ad0dc34538297072ee45bca2363e76dd1aeb +#+fileset.81ce80171feac7d136ca42835a6fb161d9183fc2e3aaf1d60541b6e5c6965a50 +#+system-config.d7e10f0a6c886d98581fb8db1d004c62ce344b30e67368ac2a32e3664cb0b196 # - build script start - @@ -15,7 +15,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/versions/system-config.d7f5d21257eb60da8df3dc4bc8b3ad0dc34538297072ee45bca2363e76dd1aeb/config/s6-rc-source +src=/versions/system-config.d7e10f0a6c886d98581fb8db1d004c62ce344b30e67368ac2a32e3664cb0b196/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/system-config-scripts b/variants/root-x86_64/system-config-scripts @@ -2,8 +2,8 @@ #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b -#+zsh.c314c3a6ed8bef958d5a03eeded90b911ffc78de0403204340dae24c640be6ee -#+pthbs-banginstall.b6f065725dbe483bf89c60c23b0674ccbc75f458055166e3e4664734f07508a2 +#+zsh.1e5d7adeb0231a6acf1e5ba0ead76084c96ddbe0cb0c060aefe58c07129a453b +#+pthbs-banginstall.27dde5262c02bd5d3674d61c4418e2965fa77d78363fd2c5f0d8f7354ad9df96 #@git:dc793695cc0632a808af9d4415f3b0cf0f4dfba2:system-config-scripts diff --git a/variants/root-x86_64/system-config-zsh b/variants/root-x86_64/system-config-zsh @@ -2,7 +2,7 @@ #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b -#+zsh.c314c3a6ed8bef958d5a03eeded90b911ffc78de0403204340dae24c640be6ee +#+zsh.1e5d7adeb0231a6acf1e5ba0ead76084c96ddbe0cb0c060aefe58c07129a453b #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh diff --git a/variants/root-x86_64/user-env b/variants/root-x86_64/user-env @@ -3,7 +3,7 @@ #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284 -#+pthbs-banginstall.b6f065725dbe483bf89c60c23b0674ccbc75f458055166e3e4664734f07508a2 +#+pthbs-banginstall.27dde5262c02bd5d3674d61c4418e2965fa77d78363fd2c5f0d8f7354ad9df96 #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment @@ -17,25 +17,25 @@ #+s6-dns.66def5b5ecaa018779d26f6f341b8477f6e2ef8e6aee5e4f30e2f4ee36d59299 #+libressl.86f9dd5a8a3bb042d9561ef187d7fb64f9cc2be3bb707b9e171208bae5c684ef #+s6-networking.2e3a2b62476afed6b35e208fda1dfb764dc27b8319ec876411dcdb0c8e3bdc3e -#+zsh.c314c3a6ed8bef958d5a03eeded90b911ffc78de0403204340dae24c640be6ee -#+pthbs-banginstall.b6f065725dbe483bf89c60c23b0674ccbc75f458055166e3e4664734f07508a2 -#+aat.13a9895e0bae8d3653d847a595f4e4cafd0fcc7c96e71b18dd0021d2fa034646 -#+confz.b97475076615ecc6da4d79b348861a469c76564de60be552a257a11815203bda -#+containers.ed133713390de0824820c5462099ad661b1d35f3686c317f1e6431a8e0f9de1f -#+fileset.b3f6c456223edd6beb7b4492e851f3f9c05d5ebbf1ff36f2d6a07603e8a5c37a -#+logincaps.9521f2ed324c343657aa56e7483577509f567566b97b84bac012a869096a4fff -#+snaprep.995dc0361dc0ae81c7e079a2f785b716ee88490680be562cd751a2808328632c +#+zsh.1e5d7adeb0231a6acf1e5ba0ead76084c96ddbe0cb0c060aefe58c07129a453b +#+pthbs-banginstall.27dde5262c02bd5d3674d61c4418e2965fa77d78363fd2c5f0d8f7354ad9df96 +#+aat.76cf0cf351a0b6933594dca30b3f1cd494d85168fe1c79cbb7027ec52add090e +#+confz.494e7da0820e49fc080473d285433648c8d7b7e2f3edac0dd1f80e368cdcde03 +#+containers.bd974b36ae1b09c73ecf8c366672384e19724d7d7c9236e791dd77e095d8c97f +#+fileset.81ce80171feac7d136ca42835a6fb161d9183fc2e3aaf1d60541b6e5c6965a50 +#+logincaps.f50e34ad4a2eac15dfbad518129c9f5e829501d88821716b5aad6e9a5ad7c3cb +#+snaprep.352af7e6195c84c6ade6f25fc5f451ca9ec9ca92d086fa08e21b8185bba78f82 #+curl.718c045c064f1e9fd5a7c71f50384345e35e1fc80e3ae7fdacadce73454dd3e7 #+git.96c05646b93e3a672c5591f704106d3f6fea912d796cd0df6abd655b243d86eb -#+xbps.bd25ff9ede8402b5add7b98eff8f7a82eaef01bbdd77abadd10fbacc1b3634e8 -#+apk-tools.96cd8b3b3dab479ecd78c79c97df0d247a815b17d4c4cebcc474e08cb4c5c47d +#+xbps.6eed71df6447b6118e7ffa05013a213ad13b768423ffaf3d8dbfc1b6f040f60c +#+apk-tools.1e9a695ca86141b00b149ed05058a2189dd863633181b7f871d8a0b3774952e0 #+getent.219406db8d31c860d8fb9052a1158f072c8b77ef4d1b71ef24e5fcc649201521 #+getconf.a13baa310359caefe186a823f0386190b6286fccf30aaf8301e115f3dc973d44 #+iconv.7afe835f0a03884e71f41bd2a96a88e9e1e73233137cb94da9f73a6721ed3001 -#+libcap.2e1454476c6b914797e000e8820842c0fcd62e998f80dfd3abb51ed3457ca05e -#+applyuidgid-caps.4dda6d0ddc60e8cbfee67b4099eedc0daecbaeede25f83bd80e6bfc1d5ee5d95 +#+libcap.274e01d3aa696328f42127db9000d4ac9ede051e78479e5abbe830e2c6ada098 +#+applyuidgid-caps.0fb7e638b9066415474fefe0b92796ba48c88c80cf523aa9d55b8d951f3faa7c #+ccx-utils.769c165236aa3bc0564901e48e65c035ab3d342564dd1a440a512347d62d4ce9 -#+user-env.78b039be2e0732709774f80dd3455f3785f2b5febb591a956303c2aeed468547 +#+user-env.f2f4b3ce00d174692fd29ce6bcfebe05c0b54d5d99677350b6dd93af20e1a998 #+strace.f67bc48859477eb362b356c2f4fd4d3a6a38fb3d32969338ec7f87dd48634904 #+mlog.f9e7afa9325b4affd4298e6de0a07d22a074799f0ea7bda1e3fb58a37b98e398 #+findutils.1edbb84f016e9dc61540b8396e85a2163570b9281a408f8787f17e404f685ce0 diff --git a/variants/root-x86_64/vm.environment b/variants/root-x86_64/vm.environment @@ -1,2 +1,2 @@ #!/usr/bin/env pthbs-build -#+linux-qemu-guest.faa88b09142e4c6c8763f0ec2222f9365858ac29fdbefaa9916977e129134a8c- \ No newline at end of file +#+linux-qemu-guest.7cbcea446246e55b7e06f84c4a832a3415c14a5f96dfb061ce7f24eacc67ee65+ \ No newline at end of file diff --git a/variants/root-x86_64/wip.environment b/variants/root-x86_64/wip.environment @@ -1,6 +1,6 @@ #!/usr/bin/env pthbs-build -#+ocaml.39aee0f50cdbe3680c2a6e92531454b56eb03ec7d245394f8086b29fcec3a50d -#+dune.2d021fc2442f2fdbef0dafd17fe960fddce2081f12f8a93ec066b7c7dc614d3d -#+ocamlbuild.65555cf2cc4e4839710acb3571d420bde0296130a8fd9924114b3c78d4f18f09 -#+ocaml-base.a8cf89813f768525a62f817375cbc5de249d984071074990f63f5b62deb54f9a -#+opam.9e3190c3e3b84779ab13ed2b79a88ef9c58418dabd41b464145e21fe950d8108- \ No newline at end of file +#+ocaml.216504d39c27c787ed0182fab857700af35d56d800e8e90fcabba6434d7a37fe +#+dune.3736ad15957f8c2d6c3d1369b2e10f8c7095a2a96810f35c4264b13bba8f390b +#+ocamlbuild.97e177a0b488df4288c65373556f8f91be3433ab3b1185d7f74592fe90cd619c +#+ocaml-base.a71e536a9e6e5da8c105de8563fb26ec7447b232820dbb72e183fac4a20256a6 +#+opam.8aece9001926b2f680c0cc2c0a7dba2769777c6b6516e90df43287c2dcc9fe89+ \ No newline at end of file diff --git a/variants/root-x86_64/xbps b/variants/root-x86_64/xbps @@ -6,7 +6,7 @@ #+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 #+libarchive.5aff27330d5fcb7f41de35cd02349baee7d80da706457bbb7dbb9c235f2c51e7 #+libressl.86f9dd5a8a3bb042d9561ef187d7fb64f9cc2be3bb707b9e171208bae5c684ef -#+pkgconf-pkg-config.4362e2da94de8985f68a5598e669ded394917cd956553b08983d3095c535bc32 +#+pkgconf-pkg-config.4e0907690130fe80a9012048db13879e65e8f0529d86358440a1e7f0e144bf2e #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:. diff --git a/variants/root-x86_64/zsh b/variants/root-x86_64/zsh @@ -94,12 +94,9 @@ mv -v ../zsh_config/zsh-functions/* "${dest}/zsh/site-functions/" check_static command/zsh - mkdir -p "$dest/.env-template" - printf '%s' >"$dest/.env-template"/'FPATH' '@ENVROOT@/zsh/site-functions:@ENVROOT@/zsh/functions' - cd "$pthbs_destdir/versions/$pthbs_package" find -type d -o -print | awk -F/ ' BEGIN {