commit 977f73d920e401be17182e7321b9419fee227145 parent cd226c80d431826bfda77db7becfcb585fd94512 Author: Jan Pobrislo <ccx@te2000.cz> Date: Sun, 26 Oct 2025 21:38:43 +0000 set PKG_CONFIG_LIBDIR from pkgconf-pkg-config Diffstat:
48 files changed, 115 insertions(+), 109 deletions(-)
diff --git a/templates/pkg/ocaml-base b/templates/pkg/ocaml-base @@ -14,7 +14,8 @@ sed -i 's/(bash /(run sh -c /' src/dune {% endblock prepare %} {%- block build %} - dune build --release --verbose +env +dune build --release --verbose {% endblock build %} {%- block install %} 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 +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 {% endblock %} 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.ac73cd9f6a453fe3aa762c0cd34fceafc5b6428ef287264fa146dc44172b622a +#+pkgconf-pkg-config.0d42ae507ed08b49639dfc49dced38f5e847c762f01f3ee8c464db7870762890 #@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.9c58cd7c9da6ab293aa28db486aefae6aab97164d28712453a5cda564f3857f2 +#+libcap.fc48cbe8970c897119bdea61f9aca96aa83466deec6f73b892fef626c50c81c6 #@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.1166cbe1144777d9f9117113e111e614c49ace58d9717256227ecb5d41dcd559 +#+linux.e53fd689466a1a06f4d2309492d46c599b6da489346cd26a779e7beac08905b8 #+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.1166cbe1144777d9f9117113e111e614c49ace58d9717256227ecb5d41dcd559" +CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux.e53fd689466a1a06f4d2309492d46c599b6da489346cd26a779e7beac08905b8" EOF make oldconfig cat .config 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.897eb85f81c58d23a98b6fa3de75e800b4360d43ae0335798507f56658f68b8a -#+easyseccomp.d503e16683dd10a813bc3c5d73190bd4383cbcd47f0d2e509f0d98f5f3c6e104 +#+applyuidgid-caps.0d9f2a5244a3e94c44300b14c70315442da7c0fba70e7c2af6152402b65894d2 +#+easyseccomp.20df320b86e103ee0a73a184f93bd3c692fe75f98e336a25e3b7f43c0dbd86fc #+mlog.d3f90010a808d81d0e4e26efefd0b2325b395fd1b011f1d94cdc0be1cb017339 #+abduco.e426fc1d139e8bfcfd6ebd986ac28b8d62bff115bdc379ad9c84b4bc97024065 #+nawk.24907cbb8100b37ab37723f0335e79103b0135b8ae6175e179b145bbdbe500e0 diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers @@ -6,9 +6,9 @@ #+pthbs-banginstall.dd343e2ad14074d84f1327791b391255fceeff5752f9d9639c0f032abb3b75cf #+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a #+alpine-keys.58180943d1e4712df08cb1eae2454fafcf543d90ac169c524e84eef81df9af01 -#+apk-tools.956d9f1d5552d3c8dc4f10169e7885166a91b30ef01e6398d6eb1aff11d908ac -#+xbps.bc708acbda3339de6f694e1974d96aecd0d5cab4e37f4184965a5817fef07a91 -#+container-bin-image.359d02956a2982dc0a1254820bf1d26cd80fa4e7d02d0209de7dd95f9cc3d95b +#+apk-tools.176bec07196d0ccba9d37db88adc2c3161a6786385b6cec22627f51bc3a67207 +#+xbps.9442e6ef041812989dc692d87029b55b31f89c929545613db8bbbe5f60330441 +#+container-bin-image.6ef224032d2f4dfc2aa1ffeb50f3d10649b955d5da0b283588f6ad735ed53de7 #@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.956d9f1d5552d3c8dc4f10169e7885166a91b30ef01e6398d6eb1aff11d908ac/command/apk.static' "${dest}/deps/command/" -ln -sf '/home/ccx/versions/xbps.bc708acbda3339de6f694e1974d96aecd0d5cab4e37f4184965a5817fef07a91/command/xbps-install.static' "${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/" 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.bc708acbda3339de6f694e1974d96aecd0d5cab4e37f4184965a5817fef07a91'/keys/void/*; do +for f in '/home/ccx/versions/xbps.9442e6ef041812989dc692d87029b55b31f89c929545613db8bbbe5f60330441'/keys/void/*; do ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/home/ccx/versions/container-bin-image.359d02956a2982dc0a1254820bf1d26cd80fa4e7d02d0209de7dd95f9cc3d95b/container-bin-image' -test -f '/home/ccx/versions/container-bin-image.359d02956a2982dc0a1254820bf1d26cd80fa4e7d02d0209de7dd95f9cc3d95b/container-bin-image/if' -ln -sf '/home/ccx/versions/container-bin-image.359d02956a2982dc0a1254820bf1d26cd80fa4e7d02d0209de7dd95f9cc3d95b/container-bin-image' "${dest}/deps/" +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/" diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment @@ -7,14 +7,14 @@ #+s6-linux-utils.664dc33ed8e500126bfb4e74c565990e8632879b9e165b09f7f48ac054c89a22 #+zsh.2648e0a529efe55a570fd4623464c4177772c05e176b0f12294119dfa6604da7 #+confz.b67a7630d1faeda6e06d979b1a0c36163f279849108177f02658a35d7152ae45 -#+containers.ed839f88ca46f10803bc8c7536c7f6723972189931913c71afaf3093168e8723 -#+xbps.bc708acbda3339de6f694e1974d96aecd0d5cab4e37f4184965a5817fef07a91 +#+containers.5a2d5f35f4856166e2f3bacde111a64a24156197c79d3a7662117615fb8b170e +#+xbps.9442e6ef041812989dc692d87029b55b31f89c929545613db8bbbe5f60330441 #+zstd.3aa7a31b787480effc16a34130b5199a5160b690d71ef0912b080d71e6031e88 -#+apk-tools.956d9f1d5552d3c8dc4f10169e7885166a91b30ef01e6398d6eb1aff11d908ac +#+apk-tools.176bec07196d0ccba9d37db88adc2c3161a6786385b6cec22627f51bc3a67207 #+alpine-keys.58180943d1e4712df08cb1eae2454fafcf543d90ac169c524e84eef81df9af01 #+getent.2608d23855b8d871fc65438dcc9889a93095bf0131f55045e517e037243898f1 #+fileset.afc9e2d86825d2423202dfb40dcaf0ae374005c8c70c39182b9eebcec07be152 #+ccx-utils.ff0ba3fc3db06a0bbee9cfc410b7894b7d06c158e35b01162f46f6ece9e2dbdf -#+easyseccomp.d503e16683dd10a813bc3c5d73190bd4383cbcd47f0d2e509f0d98f5f3c6e104 +#+easyseccomp.20df320b86e103ee0a73a184f93bd3c692fe75f98e336a25e3b7f43c0dbd86fc #+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 @@ -21,27 +21,27 @@ #+pthbs-banginstall.dd343e2ad14074d84f1327791b391255fceeff5752f9d9639c0f032abb3b75cf #+aat.bed1cceeeaf99718e61a89a54d526460202c2de1e3a5052ed9f85cec7269ea30 #+confz.b67a7630d1faeda6e06d979b1a0c36163f279849108177f02658a35d7152ae45 -#+containers.ed839f88ca46f10803bc8c7536c7f6723972189931913c71afaf3093168e8723 +#+containers.5a2d5f35f4856166e2f3bacde111a64a24156197c79d3a7662117615fb8b170e #+fileset.afc9e2d86825d2423202dfb40dcaf0ae374005c8c70c39182b9eebcec07be152 #+logincaps.128ce50c29de922317b0efaafaf79708fd0ab685ef39df6e7267c05d578eaa8f #+snaprep.092a6f35542a956ef6f9990177cbe209d48d4eb64be1f20368a87cac7903921d #+curl.10fc879ea14256ab6e511319c63f19da974300ecbf2fadf3e3ccc2c6e77c9994 #+git.e9d3f4c1010863e3b73ab7d33d013793a4839e989361dda16178e2b118595292 -#+xbps.bc708acbda3339de6f694e1974d96aecd0d5cab4e37f4184965a5817fef07a91 -#+apk-tools.956d9f1d5552d3c8dc4f10169e7885166a91b30ef01e6398d6eb1aff11d908ac +#+xbps.9442e6ef041812989dc692d87029b55b31f89c929545613db8bbbe5f60330441 +#+apk-tools.176bec07196d0ccba9d37db88adc2c3161a6786385b6cec22627f51bc3a67207 #+getent.2608d23855b8d871fc65438dcc9889a93095bf0131f55045e517e037243898f1 #+getconf.3f6e9e56867c13fc1f1bc3a95e692c675500944f94bd0726e34ee010d8213697 #+iconv.0618baa01d98a1805b5ff362de984adfca782727cfe5335327341c376a8c3602 -#+libcap.9c58cd7c9da6ab293aa28db486aefae6aab97164d28712453a5cda564f3857f2 -#+applyuidgid-caps.897eb85f81c58d23a98b6fa3de75e800b4360d43ae0335798507f56658f68b8a +#+libcap.fc48cbe8970c897119bdea61f9aca96aa83466deec6f73b892fef626c50c81c6 +#+applyuidgid-caps.0d9f2a5244a3e94c44300b14c70315442da7c0fba70e7c2af6152402b65894d2 #+ccx-utils.ff0ba3fc3db06a0bbee9cfc410b7894b7d06c158e35b01162f46f6ece9e2dbdf #+user-env.cc0683d9ca6986c3642304613640e0c096ca5fa18bfef1acd1d72cbdba119f78 #+strace.24f817d87229531d5a2218f804224619ed7635b8f847c96ccb8f8926478b144a #+mlog.d3f90010a808d81d0e4e26efefd0b2325b395fd1b011f1d94cdc0be1cb017339 #+findutils.c80b9056e275f82f7d371a44035a3c11dd43faae948a696f9cea0cd681b76aef #+nawk.24907cbb8100b37ab37723f0335e79103b0135b8ae6175e179b145bbdbe500e0 -#+system-config.8894fd484b55dd297655417f5e0d25a383912a07a264a73299ad34882d294dcc -#+system-config-rc.b15bc13fb99ecdd1ff76cbc2423b0b2887ec26dc80456e9762a9837ec0c7fcf5 +#+system-config.cdc72c1309b4160da5adfad3bbbb1a5fb6048204397d0f9673ac3cc50fd377c9 +#+system-config-rc.40006d90309372d553ff5766ffbb290ef4c3e01cc5e2474ca676125202988b2c #+system-config-scripts.d01b8ef0ad1be29f1bb6fc41a34cbad9c4deedb1280934f542c27fda98613932 -#+system-config-init.e60ccc1543dbdb60c6e6dc31f97d0cd1307c3db1ed3d01460240f6536d0aeaf5 +#+system-config-init.62bcca0c52145acee0f5a300547f6ac0c78a0b81ccd3473046facca93dfe3ce1 #+system-config-zsh.4e8afd597caaa75555d975b16b77c1dc37f975e723ee9602c2dab690a5387a36 \ No newline at end of file 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.62dac8e6d0c1f7f1c41a01333ebe158b985b0f88731c32516d497c42ee4fa070 +#+libseccomp.e95c5389aa8ae16e130813277f8089f006fa422d30c6b0a1f48d6ad6cfabc14b #+error-standalone.c5bed16451398238f10e83182031c3f5a22949b6b98c723567214828b9053c37 #+argp-standalone.12091fe79283b890260cdf7d47a9aa9f7a57b63f1a9f4127dd537e2f897c4399 #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp 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.1166cbe1144777d9f9117113e111e614c49ace58d9717256227ecb5d41dcd559 -#+busybox.75e406b7ac0c8cc3f94f4f09dcf8e250415744e6d69b76d88089299cc5137458- \ No newline at end of file +#+linux.e53fd689466a1a06f4d2309492d46c599b6da489346cd26a779e7beac08905b8 +#+busybox.7a32f0b3c3175153d6c85ba40e3de363964ec212b8f803cb259fa3f131a4413a+ \ 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.ac73cd9f6a453fe3aa762c0cd34fceafc5b6428ef287264fa146dc44172b622a +#+pkgconf-pkg-config.0d42ae507ed08b49639dfc49dced38f5e847c762f01f3ee8c464db7870762890 #@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.ac73cd9f6a453fe3aa762c0cd34fceafc5b6428ef287264fa146dc44172b622a +#+pkgconf-pkg-config.0d42ae507ed08b49639dfc49dced38f5e847c762f01f3ee8c464db7870762890 #+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.ac73cd9f6a453fe3aa762c0cd34fceafc5b6428ef287264fa146dc44172b622a +#+pkgconf-pkg-config.0d42ae507ed08b49639dfc49dced38f5e847c762f01f3ee8c464db7870762890 #+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.ac73cd9f6a453fe3aa762c0cd34fceafc5b6428ef287264fa146dc44172b622a +#+pkgconf-pkg-config.0d42ae507ed08b49639dfc49dced38f5e847c762f01f3ee8c464db7870762890 #+nawk.24907cbb8100b37ab37723f0335e79103b0135b8ae6175e179b145bbdbe500e0 #@untar:-J:sha256:7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764:. #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config diff --git a/variants/ccx-x86_64/mdevd.environment b/variants/ccx-x86_64/mdevd.environment @@ -4,4 +4,4 @@ #+s6.aba44e80074ee5ae8921a773c04c3f2433945ad5566cb986e3edc5fe5c5600cf #+mdev-scripts.1d4cba8f6d152ac91f93838b4915c025931b4382deb359826bcde055acb7239c #+mdevd.f93eb2eff2928fd4618a959255b19e6a01e056a6a9287ce5d1a3bce89eca1a15 -#+busybox.75e406b7ac0c8cc3f94f4f09dcf8e250415744e6d69b76d88089299cc5137458- \ No newline at end of file +#+busybox.7a32f0b3c3175153d6c85ba40e3de363964ec212b8f803cb259fa3f131a4413a+ \ No newline at end of file diff --git a/variants/ccx-x86_64/ocaml-base b/variants/ccx-x86_64/ocaml-base @@ -21,7 +21,8 @@ sed -i 's/(bash /(run sh -c /' src/dune - dune build --release --verbose +env +dune build --release --verbose dune install \ diff --git a/variants/ccx-x86_64/pkgconf-pkg-config b/variants/ccx-x86_64/pkgconf-pkg-config @@ -7,5 +7,6 @@ cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" exe=$(realpath "$(which pkgconf)") mkdir command ln -sf "$exe" command/pkg-config +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/system-config b/variants/ccx-x86_64/system-config @@ -16,7 +16,7 @@ #+zsh.2648e0a529efe55a570fd4623464c4177772c05e176b0f12294119dfa6604da7 #+system-config-scripts.d01b8ef0ad1be29f1bb6fc41a34cbad9c4deedb1280934f542c27fda98613932 #+logincaps.128ce50c29de922317b0efaafaf79708fd0ab685ef39df6e7267c05d578eaa8f -#+busybox.75e406b7ac0c8cc3f94f4f09dcf8e250415744e6d69b76d88089299cc5137458 +#+busybox.7a32f0b3c3175153d6c85ba40e3de363964ec212b8f803cb259fa3f131a4413a #@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.34c3ee822631722d90cb9fbdc032cd97e2a881a937b4f652921be345d9a9704d' \ - 'pthbs_path_mdevd=/home/ccx/versions/env.7ae24ceddc8443fb7cd7c4a54dd069772007d84cd6a7df121ea6d2a67b643e1a' \ + 'pthbs_path_containers=/home/ccx/versions/env.dd61f8b0d9fe1815b7b720801fc1c91ffbca7e2835853ddfef496ad389e786d8' \ + 'pthbs_path_mdevd=/home/ccx/versions/env.ed5735e0a289b4fe7788d2fe43e4c1da646ccc6444357fa6036d4d9cf6ebb101' \ 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.b15bc13fb99ecdd1ff76cbc2423b0b2887ec26dc80456e9762a9837ec0c7fcf5 +#+system-config-rc.40006d90309372d553ff5766ffbb290ef4c3e01cc5e2474ca676125202988b2c # - build script start - @@ -32,7 +32,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/home/ccx/versions/system-config-rc.b15bc13fb99ecdd1ff76cbc2423b0b2887ec26dc80456e9762a9837ec0c7fcf5/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.40006d90309372d553ff5766ffbb290ef4c3e01cc5e2474ca676125202988b2c/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 @@ -5,7 +5,7 @@ #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+s6-rc.77ee4f3326027d4463fb531273c8b42b4d8f6fabba2d075e15e18eb2cb2a8c50 #+fileset.afc9e2d86825d2423202dfb40dcaf0ae374005c8c70c39182b9eebcec07be152 -#+system-config.8894fd484b55dd297655417f5e0d25a383912a07a264a73299ad34882d294dcc +#+system-config.cdc72c1309b4160da5adfad3bbbb1a5fb6048204397d0f9673ac3cc50fd377c9 # - build script start - @@ -15,7 +15,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/home/ccx/versions/system-config.8894fd484b55dd297655417f5e0d25a383912a07a264a73299ad34882d294dcc/config/s6-rc-source +src=/home/ccx/versions/system-config.cdc72c1309b4160da5adfad3bbbb1a5fb6048204397d0f9673ac3cc50fd377c9/config/s6-rc-source s6-rc-compile ./s6-rc-db "$src" mkdir -p "$dest/config" mv -v s6-rc-db "$dest/config/" diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment @@ -21,19 +21,19 @@ #+pthbs-banginstall.dd343e2ad14074d84f1327791b391255fceeff5752f9d9639c0f032abb3b75cf #+aat.bed1cceeeaf99718e61a89a54d526460202c2de1e3a5052ed9f85cec7269ea30 #+confz.b67a7630d1faeda6e06d979b1a0c36163f279849108177f02658a35d7152ae45 -#+containers.ed839f88ca46f10803bc8c7536c7f6723972189931913c71afaf3093168e8723 +#+containers.5a2d5f35f4856166e2f3bacde111a64a24156197c79d3a7662117615fb8b170e #+fileset.afc9e2d86825d2423202dfb40dcaf0ae374005c8c70c39182b9eebcec07be152 #+logincaps.128ce50c29de922317b0efaafaf79708fd0ab685ef39df6e7267c05d578eaa8f #+snaprep.092a6f35542a956ef6f9990177cbe209d48d4eb64be1f20368a87cac7903921d #+curl.10fc879ea14256ab6e511319c63f19da974300ecbf2fadf3e3ccc2c6e77c9994 #+git.e9d3f4c1010863e3b73ab7d33d013793a4839e989361dda16178e2b118595292 -#+xbps.bc708acbda3339de6f694e1974d96aecd0d5cab4e37f4184965a5817fef07a91 -#+apk-tools.956d9f1d5552d3c8dc4f10169e7885166a91b30ef01e6398d6eb1aff11d908ac +#+xbps.9442e6ef041812989dc692d87029b55b31f89c929545613db8bbbe5f60330441 +#+apk-tools.176bec07196d0ccba9d37db88adc2c3161a6786385b6cec22627f51bc3a67207 #+getent.2608d23855b8d871fc65438dcc9889a93095bf0131f55045e517e037243898f1 #+getconf.3f6e9e56867c13fc1f1bc3a95e692c675500944f94bd0726e34ee010d8213697 #+iconv.0618baa01d98a1805b5ff362de984adfca782727cfe5335327341c376a8c3602 -#+libcap.9c58cd7c9da6ab293aa28db486aefae6aab97164d28712453a5cda564f3857f2 -#+applyuidgid-caps.897eb85f81c58d23a98b6fa3de75e800b4360d43ae0335798507f56658f68b8a +#+libcap.fc48cbe8970c897119bdea61f9aca96aa83466deec6f73b892fef626c50c81c6 +#+applyuidgid-caps.0d9f2a5244a3e94c44300b14c70315442da7c0fba70e7c2af6152402b65894d2 #+ccx-utils.ff0ba3fc3db06a0bbee9cfc410b7894b7d06c158e35b01162f46f6ece9e2dbdf #+user-env.cc0683d9ca6986c3642304613640e0c096ca5fa18bfef1acd1d72cbdba119f78 #+strace.24f817d87229531d5a2218f804224619ed7635b8f847c96ccb8f8926478b144a 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.e524f1ea8b59dc16df25551ebf7483a6e0182a4fb26a82cc21d6c407efb8de72- \ No newline at end of file +#+linux-qemu-guest.0db6ce4d4301ecb2f1f211321bd7baef5bcbc502178d86fc65e45dfc95811cad+ \ No newline at end of file diff --git a/variants/ccx-x86_64/wip.environment b/variants/ccx-x86_64/wip.environment @@ -2,5 +2,5 @@ #+ocaml.c505cec20d99ea947c08fe70bb226650ef884f3bc0b505cef922e550caa217e1 #+dune.686975ff583761e2ad730de0d76c9e1a64024750e43fdbbdfd3e420900caa0a3 #+ocamlbuild.2124c357a9766798e604200695ea67824031468bb2fb4a685d4f5e69823859eb -#+ocaml-base.a77cc179159ba49a2a2e75aee0cb79f25ff1587b84b92dec23090ef650b235fd +#+ocaml-base.05f6bc61cfa38f09c274b5e73218bdb7e294826c6ab144370c845359e558920c #+opam.6e1e1a50624ea19bc7dc380c8c3006f6e5b2673db926eb3d308162fef281561b \ 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.ac73cd9f6a453fe3aa762c0cd34fceafc5b6428ef287264fa146dc44172b622a +#+pkgconf-pkg-config.0d42ae507ed08b49639dfc49dced38f5e847c762f01f3ee8c464db7870762890 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:. 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.a995904b89618eb027fc8e263bb25c635a63aa30c1e758baf29ef2798bb39185 +#+pkgconf-pkg-config.4362e2da94de8985f68a5598e669ded394917cd956553b08983d3095c535bc32 #@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.738fe1a044a48d3b316e0a5196bd27987e0d0a656471aa475139c1f3ba3d511e +#+libcap.2e1454476c6b914797e000e8820842c0fcd62e998f80dfd3abb51ed3457ca05e #@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.f14f35504d4337abe3aaa46fa7cc51ae3d29e253500c1532541a746264965def +#+linux.18ba2b8d7db1cbaf44e01b676acc2b537986376c023e0f0890e0bb7f5544a5f4 #+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.f14f35504d4337abe3aaa46fa7cc51ae3d29e253500c1532541a746264965def" +CONFIG_DEFAULT_MODULES_DIR="/versions/linux.18ba2b8d7db1cbaf44e01b676acc2b537986376c023e0f0890e0bb7f5544a5f4" EOF make oldconfig cat .config 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.7e7a19a986e85e5e678eb5359e801ed0a621283b9a61427a62e8e2fd44d99e2e -#+easyseccomp.39495b5524bd6bef37a8357adc5abf40729e6fdeefad87122e914fc760cd992e +#+applyuidgid-caps.4dda6d0ddc60e8cbfee67b4099eedc0daecbaeede25f83bd80e6bfc1d5ee5d95 +#+easyseccomp.d909049a6ef20a6ea9a63e4ddc53a4409d576d8162e2451b40ac50cca2f1b9d4 #+mlog.f9e7afa9325b4affd4298e6de0a07d22a074799f0ea7bda1e3fb58a37b98e398 #+abduco.089653d0849acda0e1723469ed2913556b6b86a32056932b8f4069c5ceec76ae #+nawk.8521bf13f53618b7897b7f2e070a506a0101c985f6b9bb527d5eb15d8e8d4858 diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers @@ -6,9 +6,9 @@ #+pthbs-banginstall.b6f065725dbe483bf89c60c23b0674ccbc75f458055166e3e4664734f07508a2 #+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284 #+alpine-keys.9903799b52320b5d6618a3e3c87cef9da76e3b5291abfe1fd563fddfd04f35ae -#+apk-tools.15367b4f5dd92474eac1f48f8a6f20f7e59524eb86d4494530353badb3b73378 -#+xbps.842e6ebb5f6730c6aef95d07e8e2773cc1927c7be00a6541e057a0857f06801f -#+container-bin-image.73faf582a32014e54478d5a27b724e1f5ada9537aed5477379d354e55a27d143 +#+apk-tools.96cd8b3b3dab479ecd78c79c97df0d247a815b17d4c4cebcc474e08cb4c5c47d +#+xbps.bd25ff9ede8402b5add7b98eff8f7a82eaef01bbdd77abadd10fbacc1b3634e8 +#+container-bin-image.9b82298a3f2a585d7fcdd3158eefdf0e1d3b85e4ce2dcf4088b36affa0e13ae4 #@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.15367b4f5dd92474eac1f48f8a6f20f7e59524eb86d4494530353badb3b73378/command/apk.static' "${dest}/deps/command/" -ln -sf '/versions/xbps.842e6ebb5f6730c6aef95d07e8e2773cc1927c7be00a6541e057a0857f06801f/command/xbps-install.static' "${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/" 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.842e6ebb5f6730c6aef95d07e8e2773cc1927c7be00a6541e057a0857f06801f'/keys/void/*; do +for f in '/versions/xbps.bd25ff9ede8402b5add7b98eff8f7a82eaef01bbdd77abadd10fbacc1b3634e8'/keys/void/*; do ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/versions/container-bin-image.73faf582a32014e54478d5a27b724e1f5ada9537aed5477379d354e55a27d143/container-bin-image' -test -f '/versions/container-bin-image.73faf582a32014e54478d5a27b724e1f5ada9537aed5477379d354e55a27d143/container-bin-image/if' -ln -sf '/versions/container-bin-image.73faf582a32014e54478d5a27b724e1f5ada9537aed5477379d354e55a27d143/container-bin-image' "${dest}/deps/" +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/" diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment @@ -7,14 +7,14 @@ #+s6-linux-utils.2e5ac9209104c458e8935a4b4e9ce3ed6e9aa3e6c4d85675a1e945d1fe77530f #+zsh.c314c3a6ed8bef958d5a03eeded90b911ffc78de0403204340dae24c640be6ee #+confz.b97475076615ecc6da4d79b348861a469c76564de60be552a257a11815203bda -#+containers.74c51512a8e0f9c617967f64fa1cb3fb19b507384e407dc9886df798712b968c -#+xbps.842e6ebb5f6730c6aef95d07e8e2773cc1927c7be00a6541e057a0857f06801f +#+containers.ed133713390de0824820c5462099ad661b1d35f3686c317f1e6431a8e0f9de1f +#+xbps.bd25ff9ede8402b5add7b98eff8f7a82eaef01bbdd77abadd10fbacc1b3634e8 #+zstd.38b14331a2c89a3fc5d568ddddc14918031315ba2a24b6ffa8bd874c6f54bbc1 -#+apk-tools.15367b4f5dd92474eac1f48f8a6f20f7e59524eb86d4494530353badb3b73378 +#+apk-tools.96cd8b3b3dab479ecd78c79c97df0d247a815b17d4c4cebcc474e08cb4c5c47d #+alpine-keys.9903799b52320b5d6618a3e3c87cef9da76e3b5291abfe1fd563fddfd04f35ae #+getent.219406db8d31c860d8fb9052a1158f072c8b77ef4d1b71ef24e5fcc649201521 #+fileset.b3f6c456223edd6beb7b4492e851f3f9c05d5ebbf1ff36f2d6a07603e8a5c37a #+ccx-utils.769c165236aa3bc0564901e48e65c035ab3d342564dd1a440a512347d62d4ce9 -#+easyseccomp.39495b5524bd6bef37a8357adc5abf40729e6fdeefad87122e914fc760cd992e +#+easyseccomp.d909049a6ef20a6ea9a63e4ddc53a4409d576d8162e2451b40ac50cca2f1b9d4 #+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 @@ -21,27 +21,27 @@ #+pthbs-banginstall.b6f065725dbe483bf89c60c23b0674ccbc75f458055166e3e4664734f07508a2 #+aat.13a9895e0bae8d3653d847a595f4e4cafd0fcc7c96e71b18dd0021d2fa034646 #+confz.b97475076615ecc6da4d79b348861a469c76564de60be552a257a11815203bda -#+containers.74c51512a8e0f9c617967f64fa1cb3fb19b507384e407dc9886df798712b968c +#+containers.ed133713390de0824820c5462099ad661b1d35f3686c317f1e6431a8e0f9de1f #+fileset.b3f6c456223edd6beb7b4492e851f3f9c05d5ebbf1ff36f2d6a07603e8a5c37a #+logincaps.9521f2ed324c343657aa56e7483577509f567566b97b84bac012a869096a4fff #+snaprep.995dc0361dc0ae81c7e079a2f785b716ee88490680be562cd751a2808328632c #+curl.718c045c064f1e9fd5a7c71f50384345e35e1fc80e3ae7fdacadce73454dd3e7 #+git.96c05646b93e3a672c5591f704106d3f6fea912d796cd0df6abd655b243d86eb -#+xbps.842e6ebb5f6730c6aef95d07e8e2773cc1927c7be00a6541e057a0857f06801f -#+apk-tools.15367b4f5dd92474eac1f48f8a6f20f7e59524eb86d4494530353badb3b73378 +#+xbps.bd25ff9ede8402b5add7b98eff8f7a82eaef01bbdd77abadd10fbacc1b3634e8 +#+apk-tools.96cd8b3b3dab479ecd78c79c97df0d247a815b17d4c4cebcc474e08cb4c5c47d #+getent.219406db8d31c860d8fb9052a1158f072c8b77ef4d1b71ef24e5fcc649201521 #+getconf.a13baa310359caefe186a823f0386190b6286fccf30aaf8301e115f3dc973d44 #+iconv.7afe835f0a03884e71f41bd2a96a88e9e1e73233137cb94da9f73a6721ed3001 -#+libcap.738fe1a044a48d3b316e0a5196bd27987e0d0a656471aa475139c1f3ba3d511e -#+applyuidgid-caps.7e7a19a986e85e5e678eb5359e801ed0a621283b9a61427a62e8e2fd44d99e2e +#+libcap.2e1454476c6b914797e000e8820842c0fcd62e998f80dfd3abb51ed3457ca05e +#+applyuidgid-caps.4dda6d0ddc60e8cbfee67b4099eedc0daecbaeede25f83bd80e6bfc1d5ee5d95 #+ccx-utils.769c165236aa3bc0564901e48e65c035ab3d342564dd1a440a512347d62d4ce9 #+user-env.78b039be2e0732709774f80dd3455f3785f2b5febb591a956303c2aeed468547 #+strace.f67bc48859477eb362b356c2f4fd4d3a6a38fb3d32969338ec7f87dd48634904 #+mlog.f9e7afa9325b4affd4298e6de0a07d22a074799f0ea7bda1e3fb58a37b98e398 #+findutils.1edbb84f016e9dc61540b8396e85a2163570b9281a408f8787f17e404f685ce0 #+nawk.8521bf13f53618b7897b7f2e070a506a0101c985f6b9bb527d5eb15d8e8d4858 -#+system-config.44a3c05b506aaaf54ea75378fdb57ddd72c68b5b4e6144b010190f5964f0322c -#+system-config-rc.b12d4fe70b02e5d8e95ef628c85b4247b886d4aa9bbf17722d8ced0b4d7dc82f +#+system-config.d7f5d21257eb60da8df3dc4bc8b3ad0dc34538297072ee45bca2363e76dd1aeb +#+system-config-rc.48e88f05896a1a062cf612fe98cd87f07540fbf80179ee6536850c9fb4945d25 #+system-config-scripts.6c3b2eb373b9768ac4d1ad2a919e8f514ef81d028db8dd4a27e7472cc7d97258 -#+system-config-init.d9f480e134b1c3bc455d4904b743fd25b16d000892dcecc43931e826b4adedf7 +#+system-config-init.439b0d68164b2f990989141c8e2951c5e6bf51bc4545d8f36ddfcaf47dca884d #+system-config-zsh.b20e8d491536b4a2107fba55e995f077668ab62f6a239ea1a2c7a492688b8d52 \ No newline at end of file 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.cb7dcd3c270f25f5beb0b1a1bffe6d94d332960c043d493da55f9c6f0db2f4c7 +#+libseccomp.18f27e2c812e97027388dc00a83c0dc5d11109d5d685582e20cffc32b32c9b60 #+error-standalone.83fe263a36f70674cf9285b3acc3ded8716d9f7ad735642160d203c3516d0b81 #+argp-standalone.ce895c27959569e1e8043165ffc45a83f91bbab063876272eabd4870766f3721 #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp 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.f14f35504d4337abe3aaa46fa7cc51ae3d29e253500c1532541a746264965def -#+busybox.76e164a3f374450080eb486a2c94ea5bb07bc030d6212014a91c4d2949cbbea3- \ No newline at end of file +#+linux.18ba2b8d7db1cbaf44e01b676acc2b537986376c023e0f0890e0bb7f5544a5f4 +#+busybox.3e24c0cb393bfd6fee63c7bccf79f231aa8bf27fff313b9f2f23a353cda0d0c4+ \ 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.a995904b89618eb027fc8e263bb25c635a63aa30c1e758baf29ef2798bb39185 +#+pkgconf-pkg-config.4362e2da94de8985f68a5598e669ded394917cd956553b08983d3095c535bc32 #@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.a995904b89618eb027fc8e263bb25c635a63aa30c1e758baf29ef2798bb39185 +#+pkgconf-pkg-config.4362e2da94de8985f68a5598e669ded394917cd956553b08983d3095c535bc32 #+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.a995904b89618eb027fc8e263bb25c635a63aa30c1e758baf29ef2798bb39185 +#+pkgconf-pkg-config.4362e2da94de8985f68a5598e669ded394917cd956553b08983d3095c535bc32 #+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.a995904b89618eb027fc8e263bb25c635a63aa30c1e758baf29ef2798bb39185 +#+pkgconf-pkg-config.4362e2da94de8985f68a5598e669ded394917cd956553b08983d3095c535bc32 #+nawk.8521bf13f53618b7897b7f2e070a506a0101c985f6b9bb527d5eb15d8e8d4858 #@untar:-J:sha256:7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764:. #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config diff --git a/variants/root-x86_64/mdevd.environment b/variants/root-x86_64/mdevd.environment @@ -4,4 +4,4 @@ #+s6.344af4b89dee417e72484532005f0a223e20675a15daac49d498a554812bac61 #+mdev-scripts.b479f76641c75492c867bdb1f9d56b9a176b7b5221aee61154ac63011900ed1d #+mdevd.0502ff0a0d6e4f3b58469d0d3aef8816631718d5375ec0d41913dfa9121590fb -#+busybox.76e164a3f374450080eb486a2c94ea5bb07bc030d6212014a91c4d2949cbbea3- \ No newline at end of file +#+busybox.3e24c0cb393bfd6fee63c7bccf79f231aa8bf27fff313b9f2f23a353cda0d0c4+ \ No newline at end of file diff --git a/variants/root-x86_64/ocaml-base b/variants/root-x86_64/ocaml-base @@ -21,7 +21,8 @@ sed -i 's/(bash /(run sh -c /' src/dune - dune build --release --verbose +env +dune build --release --verbose dune install \ diff --git a/variants/root-x86_64/pkgconf-pkg-config b/variants/root-x86_64/pkgconf-pkg-config @@ -7,5 +7,6 @@ cd "$pthbs_destdir/versions/$pthbs_package" exe=$(realpath "$(which pkgconf)") mkdir command ln -sf "$exe" command/pkg-config +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/system-config b/variants/root-x86_64/system-config @@ -16,7 +16,7 @@ #+zsh.c314c3a6ed8bef958d5a03eeded90b911ffc78de0403204340dae24c640be6ee #+system-config-scripts.6c3b2eb373b9768ac4d1ad2a919e8f514ef81d028db8dd4a27e7472cc7d97258 #+logincaps.9521f2ed324c343657aa56e7483577509f567566b97b84bac012a869096a4fff -#+busybox.76e164a3f374450080eb486a2c94ea5bb07bc030d6212014a91c4d2949cbbea3 +#+busybox.3e24c0cb393bfd6fee63c7bccf79f231aa8bf27fff313b9f2f23a353cda0d0c4 #@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.cf16190658b01a6dd0035eebc552e10f328762e8b345d5d662761d54a30ebf5f' \ - 'pthbs_path_mdevd=/versions/env.87e23dac6545777a3fd9b3921f151c7ef93b01d955730fb312ccff26b3f4957a' \ + 'pthbs_path_containers=/versions/env.f7acc4ceff4f552c1460ab30c7ee0d9a669d1cce703f0551ec1ecbfe82d56a6f' \ + 'pthbs_path_mdevd=/versions/env.d1d1c766361b53bcb99bc0a04c32a2ed4047bc05c8a6ad0660687e1a7d19bddc' \ 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.b12d4fe70b02e5d8e95ef628c85b4247b886d4aa9bbf17722d8ced0b4d7dc82f +#+system-config-rc.48e88f05896a1a062cf612fe98cd87f07540fbf80179ee6536850c9fb4945d25 # - build script start - @@ -32,7 +32,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/versions/system-config-rc.b12d4fe70b02e5d8e95ef628c85b4247b886d4aa9bbf17722d8ced0b4d7dc82f/config/s6-rc-db +s6rcdb=/versions/system-config-rc.48e88f05896a1a062cf612fe98cd87f07540fbf80179ee6536850c9fb4945d25/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 @@ -5,7 +5,7 @@ #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+s6-rc.9416ba0fe405fc2a019beeee1b35a666324184886c12b89deb929c515ca06183 #+fileset.b3f6c456223edd6beb7b4492e851f3f9c05d5ebbf1ff36f2d6a07603e8a5c37a -#+system-config.44a3c05b506aaaf54ea75378fdb57ddd72c68b5b4e6144b010190f5964f0322c +#+system-config.d7f5d21257eb60da8df3dc4bc8b3ad0dc34538297072ee45bca2363e76dd1aeb # - build script start - @@ -15,7 +15,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/versions/system-config.44a3c05b506aaaf54ea75378fdb57ddd72c68b5b4e6144b010190f5964f0322c/config/s6-rc-source +src=/versions/system-config.d7f5d21257eb60da8df3dc4bc8b3ad0dc34538297072ee45bca2363e76dd1aeb/config/s6-rc-source s6-rc-compile ./s6-rc-db "$src" mkdir -p "$dest/config" mv -v s6-rc-db "$dest/config/" diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment @@ -21,19 +21,19 @@ #+pthbs-banginstall.b6f065725dbe483bf89c60c23b0674ccbc75f458055166e3e4664734f07508a2 #+aat.13a9895e0bae8d3653d847a595f4e4cafd0fcc7c96e71b18dd0021d2fa034646 #+confz.b97475076615ecc6da4d79b348861a469c76564de60be552a257a11815203bda -#+containers.74c51512a8e0f9c617967f64fa1cb3fb19b507384e407dc9886df798712b968c +#+containers.ed133713390de0824820c5462099ad661b1d35f3686c317f1e6431a8e0f9de1f #+fileset.b3f6c456223edd6beb7b4492e851f3f9c05d5ebbf1ff36f2d6a07603e8a5c37a #+logincaps.9521f2ed324c343657aa56e7483577509f567566b97b84bac012a869096a4fff #+snaprep.995dc0361dc0ae81c7e079a2f785b716ee88490680be562cd751a2808328632c #+curl.718c045c064f1e9fd5a7c71f50384345e35e1fc80e3ae7fdacadce73454dd3e7 #+git.96c05646b93e3a672c5591f704106d3f6fea912d796cd0df6abd655b243d86eb -#+xbps.842e6ebb5f6730c6aef95d07e8e2773cc1927c7be00a6541e057a0857f06801f -#+apk-tools.15367b4f5dd92474eac1f48f8a6f20f7e59524eb86d4494530353badb3b73378 +#+xbps.bd25ff9ede8402b5add7b98eff8f7a82eaef01bbdd77abadd10fbacc1b3634e8 +#+apk-tools.96cd8b3b3dab479ecd78c79c97df0d247a815b17d4c4cebcc474e08cb4c5c47d #+getent.219406db8d31c860d8fb9052a1158f072c8b77ef4d1b71ef24e5fcc649201521 #+getconf.a13baa310359caefe186a823f0386190b6286fccf30aaf8301e115f3dc973d44 #+iconv.7afe835f0a03884e71f41bd2a96a88e9e1e73233137cb94da9f73a6721ed3001 -#+libcap.738fe1a044a48d3b316e0a5196bd27987e0d0a656471aa475139c1f3ba3d511e -#+applyuidgid-caps.7e7a19a986e85e5e678eb5359e801ed0a621283b9a61427a62e8e2fd44d99e2e +#+libcap.2e1454476c6b914797e000e8820842c0fcd62e998f80dfd3abb51ed3457ca05e +#+applyuidgid-caps.4dda6d0ddc60e8cbfee67b4099eedc0daecbaeede25f83bd80e6bfc1d5ee5d95 #+ccx-utils.769c165236aa3bc0564901e48e65c035ab3d342564dd1a440a512347d62d4ce9 #+user-env.78b039be2e0732709774f80dd3455f3785f2b5febb591a956303c2aeed468547 #+strace.f67bc48859477eb362b356c2f4fd4d3a6a38fb3d32969338ec7f87dd48634904 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.b9fa53338a5b6d5092d55dc1cc3ce5adfb2b5876b3465a1010b92d5a1da39946- \ No newline at end of file +#+linux-qemu-guest.faa88b09142e4c6c8763f0ec2222f9365858ac29fdbefaa9916977e129134a8c+ \ No newline at end of file diff --git a/variants/root-x86_64/wip.environment b/variants/root-x86_64/wip.environment @@ -2,5 +2,5 @@ #+ocaml.39aee0f50cdbe3680c2a6e92531454b56eb03ec7d245394f8086b29fcec3a50d #+dune.2d021fc2442f2fdbef0dafd17fe960fddce2081f12f8a93ec066b7c7dc614d3d #+ocamlbuild.65555cf2cc4e4839710acb3571d420bde0296130a8fd9924114b3c78d4f18f09 -#+ocaml-base.d15aad4826d3807091f36a888477eedf442461da18ff779cd5fa59d7a1eafc35 +#+ocaml-base.a8cf89813f768525a62f817375cbc5de249d984071074990f63f5b62deb54f9a #+opam.9e3190c3e3b84779ab13ed2b79a88ef9c58418dabd41b464145e21fe950d8108 \ 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.a995904b89618eb027fc8e263bb25c635a63aa30c1e758baf29ef2798bb39185 +#+pkgconf-pkg-config.4362e2da94de8985f68a5598e669ded394917cd956553b08983d3095c535bc32 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:.