commit 56a86c5e8479ed85c8a616d555a4d5bbfb4620a2 parent 9c2f8f05ed4ad3a39b68e401b6c0af202a5629e1 Author: Jan Pobrislo <ccx@te2000.cz> Date: Sun, 26 Oct 2025 23:00:52 +0000 fix pkgconf-pkg-config Diffstat:
54 files changed, 168 insertions(+), 167 deletions(-)
diff --git a/templates/pkg/dune b/templates/pkg/dune @@ -16,26 +16,27 @@ sed -i 's/stdune.csexp/dune-configurator.csexp/' vendor/csexp/src/dune {% endblock prepare %} {%- block configure %} - ./configure \ - --prefix="$prefix" \ - --libdir="$prefix/library.ocaml" \ - --bindir="$prefix/command" \ - --sbindir="$prefix/command" \ - --etcdir="$prefix/config/etc" \ - --mandir="$prefix/man" \ - --docdir="$prefix/doc/{{shortname}}" \ - --datadir="$prefix/data" +export DUNE_CACHE=disabled +./configure \ + --prefix="$prefix" \ + --libdir="$prefix/library.ocaml" \ + --bindir="$prefix/command" \ + --sbindir="$prefix/command" \ + --etcdir="$prefix/config/etc" \ + --mandir="$prefix/man" \ + --docdir="$prefix/doc/{{shortname}}" \ + --datadir="$prefix/data" {% endblock configure %} {%- block build %} - ocaml boot/bootstrap.ml --verbose - ./dune.exe build \ - -p dune,dune-configurator \ - --profile dune-bootstrap --verbose +ocaml boot/bootstrap.ml --verbose +./dune.exe build \ + -p dune,dune-configurator \ + --profile dune-bootstrap --verbose {% endblock build %} {% block install -%} -./dune.exe runtest --verbose --root=. || true +{# ./dune.exe runtest --verbose --root=. || true -#} ./dune.exe install --root=. \ --destdir="$pthbs_destdir" \ dune dune-configurator diff --git a/templates/pkg/pkgconf-pkg-config b/templates/pkg/pkgconf-pkg-config @@ -11,6 +11,6 @@ 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 -printf '%s\t%s\n' "./env-template/PKG_CONFIG_LIBDIR" "./env-template/PKG_CONFIG_LIBDIR" >>.install-links.new +printf '%s\t%s\n' "./.env-template/PKG_CONFIG_LIBDIR" "./.env-template/PKG_CONFIG_LIBDIR" >>.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.758390c2f395ff284034e499c642ef1f1545f15a349b7fc72158749b90a4253b +#+pkgconf-pkg-config.24aef2bf062e9dcad4159c34e3c2bb58ca9b4c1021a7a5a2189fa5193c81b2a8 #@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.29299787af00568f61fabbb020c8928df001a7f330048f77a391e6089a9e8a7d +#+libcap.31173ce395c6aaf52fe0529e5eb660ab4b9d0866aba37ed507c5ba01a0ead294 #@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.1fc9edec157cef0daa34bcd5292aa9ace59e910d76e8222a89feffb46d4a6f6e +#+linux.a99f4a82caf2d952998b472102d007bbe3ff6bc879629b9e20d0f8d045490a14 #+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.1fc9edec157cef0daa34bcd5292aa9ace59e910d76e8222a89feffb46d4a6f6e" +CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux.a99f4a82caf2d952998b472102d007bbe3ff6bc879629b9e20d0f8d045490a14" 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.875e46ec9a0906d7ebdb9103993c096f3e584178cd9eaa1c03d9f5e8e5b9967e -#+easyseccomp.c6caf92abbfa8cb8c9e2adac9b57298abcb049df3c9109ac0d2e89fe4df5c316 +#+applyuidgid-caps.ae436eaf36cdf15c774a65852d52d59a7d6dae39814d75af2fb488ca6f2a98f6 +#+easyseccomp.7dee370789a91260dda4d92a1fb85c8e71126b902ca57baea6a2350ea8ab5a4d #+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.47e87f044eea270225da61ee7d709e01b2e6385fee494566c647cddac19e0592 #+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a #+alpine-keys.58180943d1e4712df08cb1eae2454fafcf543d90ac169c524e84eef81df9af01 -#+apk-tools.bde9d3a644f7546f84be0710fd5875707cdf502b78cc104bd75b2df7c1133195 -#+xbps.b3cd3e382c172113f70e904e4514d56f643ff54682bebc9ce8cb6e48b948c9c1 -#+container-bin-image.dd81093e3f6c328b7818a494edcfdc86435c74c38901e38511a6bfd0b89d8705 +#+apk-tools.45eb1e70cdc4977e1c9c965f392b2a54e7b1b77485fdaf695d381dd062842d18 +#+xbps.c27da8d06944b4584d922e84f3587e0507b59fb9b0bfd799d883551514b2ca24 +#+container-bin-image.9716d81e790c600fc3fcebccb848e9f1d53040f24becdf2480c3f301a6d027d3 #@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.bde9d3a644f7546f84be0710fd5875707cdf502b78cc104bd75b2df7c1133195/command/apk.static' "${dest}/deps/command/" -ln -sf '/home/ccx/versions/xbps.b3cd3e382c172113f70e904e4514d56f643ff54682bebc9ce8cb6e48b948c9c1/command/xbps-install.static' "${dest}/deps/command/" +ln -sf '/home/ccx/versions/apk-tools.45eb1e70cdc4977e1c9c965f392b2a54e7b1b77485fdaf695d381dd062842d18/command/apk.static' "${dest}/deps/command/" +ln -sf '/home/ccx/versions/xbps.c27da8d06944b4584d922e84f3587e0507b59fb9b0bfd799d883551514b2ca24/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.b3cd3e382c172113f70e904e4514d56f643ff54682bebc9ce8cb6e48b948c9c1'/keys/void/*; do +for f in '/home/ccx/versions/xbps.c27da8d06944b4584d922e84f3587e0507b59fb9b0bfd799d883551514b2ca24'/keys/void/*; do ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/home/ccx/versions/container-bin-image.dd81093e3f6c328b7818a494edcfdc86435c74c38901e38511a6bfd0b89d8705/container-bin-image' -test -f '/home/ccx/versions/container-bin-image.dd81093e3f6c328b7818a494edcfdc86435c74c38901e38511a6bfd0b89d8705/container-bin-image/if' -ln -sf '/home/ccx/versions/container-bin-image.dd81093e3f6c328b7818a494edcfdc86435c74c38901e38511a6bfd0b89d8705/container-bin-image' "${dest}/deps/" +test -d '/home/ccx/versions/container-bin-image.9716d81e790c600fc3fcebccb848e9f1d53040f24becdf2480c3f301a6d027d3/container-bin-image' +test -f '/home/ccx/versions/container-bin-image.9716d81e790c600fc3fcebccb848e9f1d53040f24becdf2480c3f301a6d027d3/container-bin-image/if' +ln -sf '/home/ccx/versions/container-bin-image.9716d81e790c600fc3fcebccb848e9f1d53040f24becdf2480c3f301a6d027d3/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.7a73a1599d87b3e354a0e58e4119f89b71fb053e261e36802af49d80ce8d9ba1 #+confz.f5eca9ab19f09818cfcd46267b61b488344983b0931114b597ad1238173fafcf -#+containers.5082a4c277369b7fbe3dc47207bf6ecbf03630b835ceb0df84cf32f7f10e7756 -#+xbps.b3cd3e382c172113f70e904e4514d56f643ff54682bebc9ce8cb6e48b948c9c1 +#+containers.b86bfdad640b9b38784b005b66964cae12470c83a9d31f29ab8322607b92d7f5 +#+xbps.c27da8d06944b4584d922e84f3587e0507b59fb9b0bfd799d883551514b2ca24 #+zstd.3aa7a31b787480effc16a34130b5199a5160b690d71ef0912b080d71e6031e88 -#+apk-tools.bde9d3a644f7546f84be0710fd5875707cdf502b78cc104bd75b2df7c1133195 +#+apk-tools.45eb1e70cdc4977e1c9c965f392b2a54e7b1b77485fdaf695d381dd062842d18 #+alpine-keys.58180943d1e4712df08cb1eae2454fafcf543d90ac169c524e84eef81df9af01 #+getent.2608d23855b8d871fc65438dcc9889a93095bf0131f55045e517e037243898f1 #+fileset.c9ce28ff816e023243d76d1bcb4d2b732f6b1f89c0cb9df15c1fd73880896a07 #+ccx-utils.ff0ba3fc3db06a0bbee9cfc410b7894b7d06c158e35b01162f46f6ece9e2dbdf -#+easyseccomp.c6caf92abbfa8cb8c9e2adac9b57298abcb049df3c9109ac0d2e89fe4df5c316 +#+easyseccomp.7dee370789a91260dda4d92a1fb85c8e71126b902ca57baea6a2350ea8ab5a4d #+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.47e87f044eea270225da61ee7d709e01b2e6385fee494566c647cddac19e0592 #+aat.ce323557b768bcc986fbb1557fda1309637474ccd8b9b5e4c4a56ba56634d75a #+confz.f5eca9ab19f09818cfcd46267b61b488344983b0931114b597ad1238173fafcf -#+containers.5082a4c277369b7fbe3dc47207bf6ecbf03630b835ceb0df84cf32f7f10e7756 +#+containers.b86bfdad640b9b38784b005b66964cae12470c83a9d31f29ab8322607b92d7f5 #+fileset.c9ce28ff816e023243d76d1bcb4d2b732f6b1f89c0cb9df15c1fd73880896a07 #+logincaps.de7defec936b2f4498a2010578eb507abfa6f48d6c51d0b64a9ada67cce50335 #+snaprep.c16cd20ecb28f90d83b6963a32a6f01f964fe5b99e75d7f3d9f0d2258899c26a #+curl.10fc879ea14256ab6e511319c63f19da974300ecbf2fadf3e3ccc2c6e77c9994 #+git.e9d3f4c1010863e3b73ab7d33d013793a4839e989361dda16178e2b118595292 -#+xbps.b3cd3e382c172113f70e904e4514d56f643ff54682bebc9ce8cb6e48b948c9c1 -#+apk-tools.bde9d3a644f7546f84be0710fd5875707cdf502b78cc104bd75b2df7c1133195 +#+xbps.c27da8d06944b4584d922e84f3587e0507b59fb9b0bfd799d883551514b2ca24 +#+apk-tools.45eb1e70cdc4977e1c9c965f392b2a54e7b1b77485fdaf695d381dd062842d18 #+getent.2608d23855b8d871fc65438dcc9889a93095bf0131f55045e517e037243898f1 #+getconf.3f6e9e56867c13fc1f1bc3a95e692c675500944f94bd0726e34ee010d8213697 #+iconv.0618baa01d98a1805b5ff362de984adfca782727cfe5335327341c376a8c3602 -#+libcap.29299787af00568f61fabbb020c8928df001a7f330048f77a391e6089a9e8a7d -#+applyuidgid-caps.875e46ec9a0906d7ebdb9103993c096f3e584178cd9eaa1c03d9f5e8e5b9967e +#+libcap.31173ce395c6aaf52fe0529e5eb660ab4b9d0866aba37ed507c5ba01a0ead294 +#+applyuidgid-caps.ae436eaf36cdf15c774a65852d52d59a7d6dae39814d75af2fb488ca6f2a98f6 #+ccx-utils.ff0ba3fc3db06a0bbee9cfc410b7894b7d06c158e35b01162f46f6ece9e2dbdf #+user-env.9b736d39c3f3ad6e2d5d7e1d3fb52d8c5667c48474062ce09c784c59edacacc6 #+strace.24f817d87229531d5a2218f804224619ed7635b8f847c96ccb8f8926478b144a #+mlog.d3f90010a808d81d0e4e26efefd0b2325b395fd1b011f1d94cdc0be1cb017339 #+findutils.c80b9056e275f82f7d371a44035a3c11dd43faae948a696f9cea0cd681b76aef #+nawk.24907cbb8100b37ab37723f0335e79103b0135b8ae6175e179b145bbdbe500e0 -#+system-config.2030ce7315192a47af725e97117194c58e81143847ceb22349bf7fc6249662dd -#+system-config-rc.7fcec9384e0c3c70a8fc7637e9d6147d181c9bfe19c1df1100744e4ef0aeb9a0 +#+system-config.666a6136a0079e4123e3743ebfe1ece94f13c75cc921d0e88959d930fd3cd647 +#+system-config-rc.57d98587650319f6fa5a37572bd6f827808f2290fc8d9133b9c0efbe6d7ec2b9 #+system-config-scripts.6080239044e6d330a6ea9e01625ca9d04971775d95bfc60a336235e0a4b1d743 -#+system-config-init.52674a299dc45e82c0eb0f280f008ae528dfef70f550bae6f0cf34e98eae9da7 +#+system-config-init.64603fa7f99ae2f484a3d512eb04ef03fbac7845b793d5d8fbf6b2de00d7b57e #+system-config-zsh.44342c96638209b72ed90af329e3f90445dd1c5f6ca837b3d735833a48d8dd34 \ No newline at end of file diff --git a/variants/ccx-x86_64/dune b/variants/ccx-x86_64/dune @@ -36,24 +36,24 @@ sed -i 's/stdune.csexp/dune-configurator.csexp/' vendor/csexp/src/dune - ./configure \ - --prefix="$prefix" \ - --libdir="$prefix/library.ocaml" \ - --bindir="$prefix/command" \ - --sbindir="$prefix/command" \ - --etcdir="$prefix/config/etc" \ - --mandir="$prefix/man" \ - --docdir="$prefix/doc/dune" \ - --datadir="$prefix/data" +export DUNE_CACHE=disabled +./configure \ + --prefix="$prefix" \ + --libdir="$prefix/library.ocaml" \ + --bindir="$prefix/command" \ + --sbindir="$prefix/command" \ + --etcdir="$prefix/config/etc" \ + --mandir="$prefix/man" \ + --docdir="$prefix/doc/dune" \ + --datadir="$prefix/data" - ocaml boot/bootstrap.ml --verbose - ./dune.exe build \ - -p dune,dune-configurator \ - --profile dune-bootstrap --verbose +ocaml boot/bootstrap.ml --verbose +./dune.exe build \ + -p dune,dune-configurator \ + --profile dune-bootstrap --verbose -./dune.exe runtest --verbose --root=. || true ./dune.exe install --root=. \ --destdir="$pthbs_destdir" \ dune dune-configurator 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.dd746289adb047ea7ea86daf633553778ede277043f7c661a5a9359aeac8e2fb +#+libseccomp.4acb4d19627ea775e263125457cfa77c295f4a4bffdfab56560495dde8e31474 #+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.1fc9edec157cef0daa34bcd5292aa9ace59e910d76e8222a89feffb46d4a6f6e -#+busybox.cd00ea300567b191df44c82fc67c88b98453210e2270de50487d2bdf7545ed1b- \ No newline at end of file +#+linux.a99f4a82caf2d952998b472102d007bbe3ff6bc879629b9e20d0f8d045490a14 +#+busybox.9231d8d9390327e0f99ebfdc49efdab27d0797f0c20f7349981add284eae635c+ \ 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.758390c2f395ff284034e499c642ef1f1545f15a349b7fc72158749b90a4253b +#+pkgconf-pkg-config.24aef2bf062e9dcad4159c34e3c2bb58ca9b4c1021a7a5a2189fa5193c81b2a8 #@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.758390c2f395ff284034e499c642ef1f1545f15a349b7fc72158749b90a4253b +#+pkgconf-pkg-config.24aef2bf062e9dcad4159c34e3c2bb58ca9b4c1021a7a5a2189fa5193c81b2a8 #+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.758390c2f395ff284034e499c642ef1f1545f15a349b7fc72158749b90a4253b +#+pkgconf-pkg-config.24aef2bf062e9dcad4159c34e3c2bb58ca9b4c1021a7a5a2189fa5193c81b2a8 #+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.758390c2f395ff284034e499c642ef1f1545f15a349b7fc72158749b90a4253b +#+pkgconf-pkg-config.24aef2bf062e9dcad4159c34e3c2bb58ca9b4c1021a7a5a2189fa5193c81b2a8 #+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.2a17936191cf67175a1088959a2ea685567cf604fae71e9909010323a7a5482e #+mdevd.f93eb2eff2928fd4618a959255b19e6a01e056a6a9287ce5d1a3bce89eca1a15 -#+busybox.cd00ea300567b191df44c82fc67c88b98453210e2270de50487d2bdf7545ed1b- \ No newline at end of file +#+busybox.9231d8d9390327e0f99ebfdc49efdab27d0797f0c20f7349981add284eae635c+ \ No newline at end of file diff --git a/variants/ccx-x86_64/ocaml-base b/variants/ccx-x86_64/ocaml-base @@ -5,8 +5,8 @@ #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f #+ocaml.ef754772d8f7327d0be86b448ecdefacca57060d3e358a9d917b40e9e323d763 -#+dune.a2b2a39546ceb880158c0448b00b8cd0800c5cfd0b900b99b511f2fb3af6d7b7 -#+ocaml_intrinsics_kernel.18f0cc29d16adf5c359c0e92f39a25d79025f53d1179b7cffcd34735f073d523 +#+dune.0bf1fa603f0e8ae0f1b4fd7e28d8be34f035e643e5594e0a380ce13485b06a6c +#+ocaml_intrinsics_kernel.16ed146b02bc9156f3992e8a5e86bf84358aedbbe209a79cdcae96f1a42b296b #@untar:-z:sha256:3f3f64789ab25bb5cb7f5f907dd651dec9cc9440981822fe75df6b94344b7208:. diff --git a/variants/ccx-x86_64/ocaml_intrinsics_kernel b/variants/ccx-x86_64/ocaml_intrinsics_kernel @@ -5,7 +5,7 @@ #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f #+ocaml.ef754772d8f7327d0be86b448ecdefacca57060d3e358a9d917b40e9e323d763 -#+dune.a2b2a39546ceb880158c0448b00b8cd0800c5cfd0b900b99b511f2fb3af6d7b7 +#+dune.0bf1fa603f0e8ae0f1b4fd7e28d8be34f035e643e5594e0a380ce13485b06a6c #@untar:-z:sha256:c988b7769a59749631c3c98ba5edd1d2fe91f5dc380b5e0593c073c92f4bee01:. diff --git a/variants/ccx-x86_64/opam b/variants/ccx-x86_64/opam @@ -5,7 +5,7 @@ #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 #+ocaml.ef754772d8f7327d0be86b448ecdefacca57060d3e358a9d917b40e9e323d763 -#+dune.a2b2a39546ceb880158c0448b00b8cd0800c5cfd0b900b99b511f2fb3af6d7b7 +#+dune.0bf1fa603f0e8ae0f1b4fd7e28d8be34f035e643e5594e0a380ce13485b06a6c #@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.a2b2a39546ceb880158c0448b00b8cd0800c5cfd0b900b99b511f2fb3af6d7b7/command/dune' \ + --with-dune='/home/ccx/versions/dune.0bf1fa603f0e8ae0f1b4fd7e28d8be34f035e643e5594e0a380ce13485b06a6c/command/dune' \ --with-mccs \ --with-vendored-deps diff --git a/variants/ccx-x86_64/pkgconf-pkg-config b/variants/ccx-x86_64/pkgconf-pkg-config @@ -10,5 +10,5 @@ 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 -printf '%s\t%s\n' "./env-template/PKG_CONFIG_LIBDIR" "./env-template/PKG_CONFIG_LIBDIR" >>.install-links.new +printf '%s\t%s\n' "./.env-template/PKG_CONFIG_LIBDIR" "./.env-template/PKG_CONFIG_LIBDIR" >>.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.7a73a1599d87b3e354a0e58e4119f89b71fb053e261e36802af49d80ce8d9ba1 #+system-config-scripts.6080239044e6d330a6ea9e01625ca9d04971775d95bfc60a336235e0a4b1d743 #+logincaps.de7defec936b2f4498a2010578eb507abfa6f48d6c51d0b64a9ada67cce50335 -#+busybox.cd00ea300567b191df44c82fc67c88b98453210e2270de50487d2bdf7545ed1b +#+busybox.9231d8d9390327e0f99ebfdc49efdab27d0797f0c20f7349981add284eae635c #@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.77cb0fa9456606dc7e6f55391f53e1fdd41be3520c5938a2df1dd311b61247e2' \ - 'pthbs_path_mdevd=/home/ccx/versions/env.e7db369d692c51b271c73d551bd7aa391058282647c2875e0bd2f44bb9c4059a' \ + 'pthbs_path_containers=/home/ccx/versions/env.315a8090036d31fb8c4636efc89d3f108144fe7c5d6fbee8c3cf196c7a7d3459' \ + 'pthbs_path_mdevd=/home/ccx/versions/env.1cc481f43e7f936fa0527b29008b34ca4c82cb10a81ffb2b908d52b23e9bedf4' \ 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.7fcec9384e0c3c70a8fc7637e9d6147d181c9bfe19c1df1100744e4ef0aeb9a0 +#+system-config-rc.57d98587650319f6fa5a37572bd6f827808f2290fc8d9133b9c0efbe6d7ec2b9 # - build script start - @@ -32,7 +32,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/home/ccx/versions/system-config-rc.7fcec9384e0c3c70a8fc7637e9d6147d181c9bfe19c1df1100744e4ef0aeb9a0/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.57d98587650319f6fa5a37572bd6f827808f2290fc8d9133b9c0efbe6d7ec2b9/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.c9ce28ff816e023243d76d1bcb4d2b732f6b1f89c0cb9df15c1fd73880896a07 -#+system-config.2030ce7315192a47af725e97117194c58e81143847ceb22349bf7fc6249662dd +#+system-config.666a6136a0079e4123e3743ebfe1ece94f13c75cc921d0e88959d930fd3cd647 # - build script start - @@ -15,7 +15,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/home/ccx/versions/system-config.2030ce7315192a47af725e97117194c58e81143847ceb22349bf7fc6249662dd/config/s6-rc-source +src=/home/ccx/versions/system-config.666a6136a0079e4123e3743ebfe1ece94f13c75cc921d0e88959d930fd3cd647/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.47e87f044eea270225da61ee7d709e01b2e6385fee494566c647cddac19e0592 #+aat.ce323557b768bcc986fbb1557fda1309637474ccd8b9b5e4c4a56ba56634d75a #+confz.f5eca9ab19f09818cfcd46267b61b488344983b0931114b597ad1238173fafcf -#+containers.5082a4c277369b7fbe3dc47207bf6ecbf03630b835ceb0df84cf32f7f10e7756 +#+containers.b86bfdad640b9b38784b005b66964cae12470c83a9d31f29ab8322607b92d7f5 #+fileset.c9ce28ff816e023243d76d1bcb4d2b732f6b1f89c0cb9df15c1fd73880896a07 #+logincaps.de7defec936b2f4498a2010578eb507abfa6f48d6c51d0b64a9ada67cce50335 #+snaprep.c16cd20ecb28f90d83b6963a32a6f01f964fe5b99e75d7f3d9f0d2258899c26a #+curl.10fc879ea14256ab6e511319c63f19da974300ecbf2fadf3e3ccc2c6e77c9994 #+git.e9d3f4c1010863e3b73ab7d33d013793a4839e989361dda16178e2b118595292 -#+xbps.b3cd3e382c172113f70e904e4514d56f643ff54682bebc9ce8cb6e48b948c9c1 -#+apk-tools.bde9d3a644f7546f84be0710fd5875707cdf502b78cc104bd75b2df7c1133195 +#+xbps.c27da8d06944b4584d922e84f3587e0507b59fb9b0bfd799d883551514b2ca24 +#+apk-tools.45eb1e70cdc4977e1c9c965f392b2a54e7b1b77485fdaf695d381dd062842d18 #+getent.2608d23855b8d871fc65438dcc9889a93095bf0131f55045e517e037243898f1 #+getconf.3f6e9e56867c13fc1f1bc3a95e692c675500944f94bd0726e34ee010d8213697 #+iconv.0618baa01d98a1805b5ff362de984adfca782727cfe5335327341c376a8c3602 -#+libcap.29299787af00568f61fabbb020c8928df001a7f330048f77a391e6089a9e8a7d -#+applyuidgid-caps.875e46ec9a0906d7ebdb9103993c096f3e584178cd9eaa1c03d9f5e8e5b9967e +#+libcap.31173ce395c6aaf52fe0529e5eb660ab4b9d0866aba37ed507c5ba01a0ead294 +#+applyuidgid-caps.ae436eaf36cdf15c774a65852d52d59a7d6dae39814d75af2fb488ca6f2a98f6 #+ccx-utils.ff0ba3fc3db06a0bbee9cfc410b7894b7d06c158e35b01162f46f6ece9e2dbdf #+user-env.9b736d39c3f3ad6e2d5d7e1d3fb52d8c5667c48474062ce09c784c59edacacc6 #+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.a36ae134a5dde329b2b856768e380d3c97fab4260990f123a9e7a335e132e745- \ No newline at end of file +#+linux-qemu-guest.58dd6f6db9c32506ed2a9d4e13e50e6292e0f28948c32dbbf739f570b753e544+ \ 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.ef754772d8f7327d0be86b448ecdefacca57060d3e358a9d917b40e9e323d763 -#+dune.a2b2a39546ceb880158c0448b00b8cd0800c5cfd0b900b99b511f2fb3af6d7b7 +#+dune.0bf1fa603f0e8ae0f1b4fd7e28d8be34f035e643e5594e0a380ce13485b06a6c #+ocamlbuild.1f92ef06cb109487b573ecdd2059d0b0ab559ec12ac113d9fa88a4372103d884 -#+ocaml-base.48bc0308a6b20c38262cedaf668ccad220afa64e2d3a173d2daf479dba4c4dda -#+opam.c5063abbe2360e002ccbdde1d8aa4ca4b24315e11e2a11aa9de62fe6489d1721- \ No newline at end of file +#+ocaml-base.5c20b0cc9f927c498ae3ff65c4e99eebf885178e14024a7a36c4f8e5c79fe714 +#+opam.f141b6d40419926cd7592b4750565eca71de8fe11bb9803b2f04f5560cfd08b5+ \ 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.758390c2f395ff284034e499c642ef1f1545f15a349b7fc72158749b90a4253b +#+pkgconf-pkg-config.24aef2bf062e9dcad4159c34e3c2bb58ca9b4c1021a7a5a2189fa5193c81b2a8 #@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.be68ff851981f275892e96735d7dae711f956d998f49102035ae52c86a69779b +#+pkgconf-pkg-config.035ed72618fdde9058d87fb11cd6374080eef9927f78b0cd97cfc5afdfc21388 #@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.11f0a306142f5806d96e07e541c31357cebcc4a2308178f9bba717e6b95b89ec +#+libcap.419c8e85f45214e55b56b1d6e2468fb8af36538bb94518007a155ab4fe746fb0 #@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.a214a6ae5b486eef658eb1fd0fb570d9f025e2ad5c9b0605db12c423983913a6 +#+linux.386e6e56b5ea98ccc349ca95e462261faec3c211aa25775f83eab57222e6e95b #+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.a214a6ae5b486eef658eb1fd0fb570d9f025e2ad5c9b0605db12c423983913a6" +CONFIG_DEFAULT_MODULES_DIR="/versions/linux.386e6e56b5ea98ccc349ca95e462261faec3c211aa25775f83eab57222e6e95b" 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.774c22c5edc754eccbc7d4dd45ab40c3156d3da2f4f0c40f1c20d05cf7cbfbb8 -#+easyseccomp.a0bf4a2ce11ba05ee5a0ad2c854ccf5b09f95d8a91f98f6b856e4ab63134eb23 +#+applyuidgid-caps.ce9b5c150cdcec21a23e0bbf838915b1e2b2244eec1d06f9dd17e90a7dfc067e +#+easyseccomp.e435513c7e6178450228944c131854969d922426b8f771675aaece6867e8625a #+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.0442e58611ea2fc27a0a57a4c1b9b8696d799e9ebb737f3548553a61f845e34b #+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284 #+alpine-keys.9903799b52320b5d6618a3e3c87cef9da76e3b5291abfe1fd563fddfd04f35ae -#+apk-tools.744e69a67b95f9b2fe81b87508981467cef5b684ba5aa3863a747ae0a228a44a -#+xbps.01b773d86be4bb89e1921514e07418e05a93615b412f2c2510ca32a5b9ed1874 -#+container-bin-image.0ba59438b58b983017bd9e94a553ceb8bc037f13efd2a4a3434128c4c7356de1 +#+apk-tools.714e1cb8bc861dec1710a25476f209f7b0602d954f74194d58c16747c5a3ad38 +#+xbps.e7b102cdf29fa99c56eeacce8ade331896a379fad11189131b0d1efb4160a454 +#+container-bin-image.4d91f1e7fff7ee915f135f919bf1f32c9c4c07a12b6e55e45cfdd8ad5e108b7c #@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.744e69a67b95f9b2fe81b87508981467cef5b684ba5aa3863a747ae0a228a44a/command/apk.static' "${dest}/deps/command/" -ln -sf '/versions/xbps.01b773d86be4bb89e1921514e07418e05a93615b412f2c2510ca32a5b9ed1874/command/xbps-install.static' "${dest}/deps/command/" +ln -sf '/versions/apk-tools.714e1cb8bc861dec1710a25476f209f7b0602d954f74194d58c16747c5a3ad38/command/apk.static' "${dest}/deps/command/" +ln -sf '/versions/xbps.e7b102cdf29fa99c56eeacce8ade331896a379fad11189131b0d1efb4160a454/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.01b773d86be4bb89e1921514e07418e05a93615b412f2c2510ca32a5b9ed1874'/keys/void/*; do +for f in '/versions/xbps.e7b102cdf29fa99c56eeacce8ade331896a379fad11189131b0d1efb4160a454'/keys/void/*; do ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/versions/container-bin-image.0ba59438b58b983017bd9e94a553ceb8bc037f13efd2a4a3434128c4c7356de1/container-bin-image' -test -f '/versions/container-bin-image.0ba59438b58b983017bd9e94a553ceb8bc037f13efd2a4a3434128c4c7356de1/container-bin-image/if' -ln -sf '/versions/container-bin-image.0ba59438b58b983017bd9e94a553ceb8bc037f13efd2a4a3434128c4c7356de1/container-bin-image' "${dest}/deps/" +test -d '/versions/container-bin-image.4d91f1e7fff7ee915f135f919bf1f32c9c4c07a12b6e55e45cfdd8ad5e108b7c/container-bin-image' +test -f '/versions/container-bin-image.4d91f1e7fff7ee915f135f919bf1f32c9c4c07a12b6e55e45cfdd8ad5e108b7c/container-bin-image/if' +ln -sf '/versions/container-bin-image.4d91f1e7fff7ee915f135f919bf1f32c9c4c07a12b6e55e45cfdd8ad5e108b7c/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.86584889aa0a3af405974c69ab43869f82e00acdba5340528e5dd20757f7dfc8 #+confz.953faaabf2a7a6ab4aa9b374f83addbcc1ba98bfa195cf8cc9cb2fcb2595ffdb -#+containers.626f49fb0162722c3be828d537719b76fbaac95e619488333f6a904cce00b656 -#+xbps.01b773d86be4bb89e1921514e07418e05a93615b412f2c2510ca32a5b9ed1874 +#+containers.30d5d46311deafb408983099bbf8e1a41965837ff6586d464f1693e7aefa0042 +#+xbps.e7b102cdf29fa99c56eeacce8ade331896a379fad11189131b0d1efb4160a454 #+zstd.38b14331a2c89a3fc5d568ddddc14918031315ba2a24b6ffa8bd874c6f54bbc1 -#+apk-tools.744e69a67b95f9b2fe81b87508981467cef5b684ba5aa3863a747ae0a228a44a +#+apk-tools.714e1cb8bc861dec1710a25476f209f7b0602d954f74194d58c16747c5a3ad38 #+alpine-keys.9903799b52320b5d6618a3e3c87cef9da76e3b5291abfe1fd563fddfd04f35ae #+getent.219406db8d31c860d8fb9052a1158f072c8b77ef4d1b71ef24e5fcc649201521 #+fileset.8d3627d93e7b4c33483589e8602b462d3fcd31d6f38adde5ee53c024197c7286 #+ccx-utils.769c165236aa3bc0564901e48e65c035ab3d342564dd1a440a512347d62d4ce9 -#+easyseccomp.a0bf4a2ce11ba05ee5a0ad2c854ccf5b09f95d8a91f98f6b856e4ab63134eb23 +#+easyseccomp.e435513c7e6178450228944c131854969d922426b8f771675aaece6867e8625a #+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.0442e58611ea2fc27a0a57a4c1b9b8696d799e9ebb737f3548553a61f845e34b #+aat.1a24f86810721d21e38b938be940549908121eb386821cded1a27ac973c8d47e #+confz.953faaabf2a7a6ab4aa9b374f83addbcc1ba98bfa195cf8cc9cb2fcb2595ffdb -#+containers.626f49fb0162722c3be828d537719b76fbaac95e619488333f6a904cce00b656 +#+containers.30d5d46311deafb408983099bbf8e1a41965837ff6586d464f1693e7aefa0042 #+fileset.8d3627d93e7b4c33483589e8602b462d3fcd31d6f38adde5ee53c024197c7286 #+logincaps.507ec1380a0988547542ae0ad146daffd92e08ab8faf964323c28f430edcc406 #+snaprep.756763e7b0d2cc247a6b4a517b1d1eca3cb04cbfbfef374541079c63f0c896c8 #+curl.718c045c064f1e9fd5a7c71f50384345e35e1fc80e3ae7fdacadce73454dd3e7 #+git.96c05646b93e3a672c5591f704106d3f6fea912d796cd0df6abd655b243d86eb -#+xbps.01b773d86be4bb89e1921514e07418e05a93615b412f2c2510ca32a5b9ed1874 -#+apk-tools.744e69a67b95f9b2fe81b87508981467cef5b684ba5aa3863a747ae0a228a44a +#+xbps.e7b102cdf29fa99c56eeacce8ade331896a379fad11189131b0d1efb4160a454 +#+apk-tools.714e1cb8bc861dec1710a25476f209f7b0602d954f74194d58c16747c5a3ad38 #+getent.219406db8d31c860d8fb9052a1158f072c8b77ef4d1b71ef24e5fcc649201521 #+getconf.a13baa310359caefe186a823f0386190b6286fccf30aaf8301e115f3dc973d44 #+iconv.7afe835f0a03884e71f41bd2a96a88e9e1e73233137cb94da9f73a6721ed3001 -#+libcap.11f0a306142f5806d96e07e541c31357cebcc4a2308178f9bba717e6b95b89ec -#+applyuidgid-caps.774c22c5edc754eccbc7d4dd45ab40c3156d3da2f4f0c40f1c20d05cf7cbfbb8 +#+libcap.419c8e85f45214e55b56b1d6e2468fb8af36538bb94518007a155ab4fe746fb0 +#+applyuidgid-caps.ce9b5c150cdcec21a23e0bbf838915b1e2b2244eec1d06f9dd17e90a7dfc067e #+ccx-utils.769c165236aa3bc0564901e48e65c035ab3d342564dd1a440a512347d62d4ce9 #+user-env.f9ab8060b8c6970d3b785694ef1f839f47c9eb31a0c13c0529f365583552db01 #+strace.f67bc48859477eb362b356c2f4fd4d3a6a38fb3d32969338ec7f87dd48634904 #+mlog.f9e7afa9325b4affd4298e6de0a07d22a074799f0ea7bda1e3fb58a37b98e398 #+findutils.1edbb84f016e9dc61540b8396e85a2163570b9281a408f8787f17e404f685ce0 #+nawk.8521bf13f53618b7897b7f2e070a506a0101c985f6b9bb527d5eb15d8e8d4858 -#+system-config.82cb1faa7901500f5418b5fc21d728f1b586eeb3433da0c74fe744b23bb00ce1 -#+system-config-rc.6f342696dda5debd5051298b5199b47e30755c6b907567ec7980e321d5c6e20b +#+system-config.f880126b7e88c86536238c60fdb90348f91c62ab3f82c7f29c1bb593f949dfcb +#+system-config-rc.9aa1ec5ccdeb41ecd935e14775724aa8c58ecbe45458f159597212d27f57c91a #+system-config-scripts.c533391a1fcb035cbc2e4bad71f1dc5c40ed8b2c37d0dcd2cc7929c1dea80b5f -#+system-config-init.116a21f929b6a75ef41cc9fbb29658375b6ae7896f36a5c8cd92ca8162270e0e +#+system-config-init.49c2d0423f2f56e9fd2d92a7a3c7b61cb5189964d4f727aaa6b84932d97f6223 #+system-config-zsh.62c3518c0b26bb74a5913e7c6a89e60e0ac9ac138cddde75a74828713d3b7b37 \ No newline at end of file diff --git a/variants/root-x86_64/dune b/variants/root-x86_64/dune @@ -36,24 +36,24 @@ sed -i 's/stdune.csexp/dune-configurator.csexp/' vendor/csexp/src/dune - ./configure \ - --prefix="$prefix" \ - --libdir="$prefix/library.ocaml" \ - --bindir="$prefix/command" \ - --sbindir="$prefix/command" \ - --etcdir="$prefix/config/etc" \ - --mandir="$prefix/man" \ - --docdir="$prefix/doc/dune" \ - --datadir="$prefix/data" +export DUNE_CACHE=disabled +./configure \ + --prefix="$prefix" \ + --libdir="$prefix/library.ocaml" \ + --bindir="$prefix/command" \ + --sbindir="$prefix/command" \ + --etcdir="$prefix/config/etc" \ + --mandir="$prefix/man" \ + --docdir="$prefix/doc/dune" \ + --datadir="$prefix/data" - ocaml boot/bootstrap.ml --verbose - ./dune.exe build \ - -p dune,dune-configurator \ - --profile dune-bootstrap --verbose +ocaml boot/bootstrap.ml --verbose +./dune.exe build \ + -p dune,dune-configurator \ + --profile dune-bootstrap --verbose -./dune.exe runtest --verbose --root=. || true ./dune.exe install --root=. \ --destdir="$pthbs_destdir" \ dune dune-configurator 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.c0a5ac9c0b59bde95d8d1ceb19250260c96a38819865a6407ee34a745ac51e83 +#+libseccomp.1ab05f3964cdba55c6fc59dd7e1785f36e12ecf23b5d9acbb164b8271ea48bab #+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.a214a6ae5b486eef658eb1fd0fb570d9f025e2ad5c9b0605db12c423983913a6 -#+busybox.619cd1c4ff6402fb310db306c8c201adc6863d2ff800972fe64392c54e6b7c17- \ No newline at end of file +#+linux.386e6e56b5ea98ccc349ca95e462261faec3c211aa25775f83eab57222e6e95b +#+busybox.660c27fd0ce7b80248bee14d25b8f2115c408f87721d4f07a5ac9d5d360b3a56+ \ 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.be68ff851981f275892e96735d7dae711f956d998f49102035ae52c86a69779b +#+pkgconf-pkg-config.035ed72618fdde9058d87fb11cd6374080eef9927f78b0cd97cfc5afdfc21388 #@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.be68ff851981f275892e96735d7dae711f956d998f49102035ae52c86a69779b +#+pkgconf-pkg-config.035ed72618fdde9058d87fb11cd6374080eef9927f78b0cd97cfc5afdfc21388 #+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.be68ff851981f275892e96735d7dae711f956d998f49102035ae52c86a69779b +#+pkgconf-pkg-config.035ed72618fdde9058d87fb11cd6374080eef9927f78b0cd97cfc5afdfc21388 #+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.be68ff851981f275892e96735d7dae711f956d998f49102035ae52c86a69779b +#+pkgconf-pkg-config.035ed72618fdde9058d87fb11cd6374080eef9927f78b0cd97cfc5afdfc21388 #+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.e1a3a292f994e2cc9910aaa764fd4f8b3f86c2cb26a4bc1e426f88a286db5078 #+mdevd.0502ff0a0d6e4f3b58469d0d3aef8816631718d5375ec0d41913dfa9121590fb -#+busybox.619cd1c4ff6402fb310db306c8c201adc6863d2ff800972fe64392c54e6b7c17- \ No newline at end of file +#+busybox.660c27fd0ce7b80248bee14d25b8f2115c408f87721d4f07a5ac9d5d360b3a56+ \ No newline at end of file diff --git a/variants/root-x86_64/ocaml-base b/variants/root-x86_64/ocaml-base @@ -5,8 +5,8 @@ #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 #+ocaml.5f284ca479cb1311e030bce243d0075ef6bdbc702f514ca5a836b4638b203691 -#+dune.4f2fed8b522751031cb2ea054ffdeca476c898f13730c5fbbf5120b0b70241c3 -#+ocaml_intrinsics_kernel.8c71e65070a503794d0230d68d2fbf37fa50d6dd48b1e39ddc3225df03e2faae +#+dune.d71d865a1e049f9cb3345d4588f36c028ef41ae48915a57ce510bfe02d623bf8 +#+ocaml_intrinsics_kernel.9bc274eaa63c8f8bd585747fbfbb7ec0651449fa5d43713726de7e72abfb5307 #@untar:-z:sha256:3f3f64789ab25bb5cb7f5f907dd651dec9cc9440981822fe75df6b94344b7208:. diff --git a/variants/root-x86_64/ocaml_intrinsics_kernel b/variants/root-x86_64/ocaml_intrinsics_kernel @@ -5,7 +5,7 @@ #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 #+ocaml.5f284ca479cb1311e030bce243d0075ef6bdbc702f514ca5a836b4638b203691 -#+dune.4f2fed8b522751031cb2ea054ffdeca476c898f13730c5fbbf5120b0b70241c3 +#+dune.d71d865a1e049f9cb3345d4588f36c028ef41ae48915a57ce510bfe02d623bf8 #@untar:-z:sha256:c988b7769a59749631c3c98ba5edd1d2fe91f5dc380b5e0593c073c92f4bee01:. diff --git a/variants/root-x86_64/opam b/variants/root-x86_64/opam @@ -5,7 +5,7 @@ #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 #+ocaml.5f284ca479cb1311e030bce243d0075ef6bdbc702f514ca5a836b4638b203691 -#+dune.4f2fed8b522751031cb2ea054ffdeca476c898f13730c5fbbf5120b0b70241c3 +#+dune.d71d865a1e049f9cb3345d4588f36c028ef41ae48915a57ce510bfe02d623bf8 #@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.4f2fed8b522751031cb2ea054ffdeca476c898f13730c5fbbf5120b0b70241c3/command/dune' \ + --with-dune='/versions/dune.d71d865a1e049f9cb3345d4588f36c028ef41ae48915a57ce510bfe02d623bf8/command/dune' \ --with-mccs \ --with-vendored-deps diff --git a/variants/root-x86_64/pkgconf-pkg-config b/variants/root-x86_64/pkgconf-pkg-config @@ -10,5 +10,5 @@ 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 -printf '%s\t%s\n' "./env-template/PKG_CONFIG_LIBDIR" "./env-template/PKG_CONFIG_LIBDIR" >>.install-links.new +printf '%s\t%s\n' "./.env-template/PKG_CONFIG_LIBDIR" "./.env-template/PKG_CONFIG_LIBDIR" >>.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.86584889aa0a3af405974c69ab43869f82e00acdba5340528e5dd20757f7dfc8 #+system-config-scripts.c533391a1fcb035cbc2e4bad71f1dc5c40ed8b2c37d0dcd2cc7929c1dea80b5f #+logincaps.507ec1380a0988547542ae0ad146daffd92e08ab8faf964323c28f430edcc406 -#+busybox.619cd1c4ff6402fb310db306c8c201adc6863d2ff800972fe64392c54e6b7c17 +#+busybox.660c27fd0ce7b80248bee14d25b8f2115c408f87721d4f07a5ac9d5d360b3a56 #@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.b75248e6c840ac83c96d7f06e381a6599544c4003906fc0c2c2afb6960c307cd' \ - 'pthbs_path_mdevd=/versions/env.824bfd9012d3bb7634005e04ee1fb76ea3f6c3663b7e15d54d058d97cb6553be' \ + 'pthbs_path_containers=/versions/env.8b3d8b731e8d9b161dc4f9a26e8b82ff65debed4d3a9ecf106d0d912bcb43ab3' \ + 'pthbs_path_mdevd=/versions/env.587734c2fde5b7dd48f968c39290c2fd2ed92780d5d4bab0b2292429a4729eea' \ 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.6f342696dda5debd5051298b5199b47e30755c6b907567ec7980e321d5c6e20b +#+system-config-rc.9aa1ec5ccdeb41ecd935e14775724aa8c58ecbe45458f159597212d27f57c91a # - build script start - @@ -32,7 +32,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/versions/system-config-rc.6f342696dda5debd5051298b5199b47e30755c6b907567ec7980e321d5c6e20b/config/s6-rc-db +s6rcdb=/versions/system-config-rc.9aa1ec5ccdeb41ecd935e14775724aa8c58ecbe45458f159597212d27f57c91a/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.8d3627d93e7b4c33483589e8602b462d3fcd31d6f38adde5ee53c024197c7286 -#+system-config.82cb1faa7901500f5418b5fc21d728f1b586eeb3433da0c74fe744b23bb00ce1 +#+system-config.f880126b7e88c86536238c60fdb90348f91c62ab3f82c7f29c1bb593f949dfcb # - build script start - @@ -15,7 +15,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/versions/system-config.82cb1faa7901500f5418b5fc21d728f1b586eeb3433da0c74fe744b23bb00ce1/config/s6-rc-source +src=/versions/system-config.f880126b7e88c86536238c60fdb90348f91c62ab3f82c7f29c1bb593f949dfcb/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.0442e58611ea2fc27a0a57a4c1b9b8696d799e9ebb737f3548553a61f845e34b #+aat.1a24f86810721d21e38b938be940549908121eb386821cded1a27ac973c8d47e #+confz.953faaabf2a7a6ab4aa9b374f83addbcc1ba98bfa195cf8cc9cb2fcb2595ffdb -#+containers.626f49fb0162722c3be828d537719b76fbaac95e619488333f6a904cce00b656 +#+containers.30d5d46311deafb408983099bbf8e1a41965837ff6586d464f1693e7aefa0042 #+fileset.8d3627d93e7b4c33483589e8602b462d3fcd31d6f38adde5ee53c024197c7286 #+logincaps.507ec1380a0988547542ae0ad146daffd92e08ab8faf964323c28f430edcc406 #+snaprep.756763e7b0d2cc247a6b4a517b1d1eca3cb04cbfbfef374541079c63f0c896c8 #+curl.718c045c064f1e9fd5a7c71f50384345e35e1fc80e3ae7fdacadce73454dd3e7 #+git.96c05646b93e3a672c5591f704106d3f6fea912d796cd0df6abd655b243d86eb -#+xbps.01b773d86be4bb89e1921514e07418e05a93615b412f2c2510ca32a5b9ed1874 -#+apk-tools.744e69a67b95f9b2fe81b87508981467cef5b684ba5aa3863a747ae0a228a44a +#+xbps.e7b102cdf29fa99c56eeacce8ade331896a379fad11189131b0d1efb4160a454 +#+apk-tools.714e1cb8bc861dec1710a25476f209f7b0602d954f74194d58c16747c5a3ad38 #+getent.219406db8d31c860d8fb9052a1158f072c8b77ef4d1b71ef24e5fcc649201521 #+getconf.a13baa310359caefe186a823f0386190b6286fccf30aaf8301e115f3dc973d44 #+iconv.7afe835f0a03884e71f41bd2a96a88e9e1e73233137cb94da9f73a6721ed3001 -#+libcap.11f0a306142f5806d96e07e541c31357cebcc4a2308178f9bba717e6b95b89ec -#+applyuidgid-caps.774c22c5edc754eccbc7d4dd45ab40c3156d3da2f4f0c40f1c20d05cf7cbfbb8 +#+libcap.419c8e85f45214e55b56b1d6e2468fb8af36538bb94518007a155ab4fe746fb0 +#+applyuidgid-caps.ce9b5c150cdcec21a23e0bbf838915b1e2b2244eec1d06f9dd17e90a7dfc067e #+ccx-utils.769c165236aa3bc0564901e48e65c035ab3d342564dd1a440a512347d62d4ce9 #+user-env.f9ab8060b8c6970d3b785694ef1f839f47c9eb31a0c13c0529f365583552db01 #+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.646169e7bd2f2c64b70f9bce7361d2726c420797ce72fdc729cf630beb761fdc- \ No newline at end of file +#+linux-qemu-guest.4171d86d0225bb940ba400a7a0c7406abfdd168efe92d1f393abb62b3c5c168a+ \ 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.5f284ca479cb1311e030bce243d0075ef6bdbc702f514ca5a836b4638b203691 -#+dune.4f2fed8b522751031cb2ea054ffdeca476c898f13730c5fbbf5120b0b70241c3 +#+dune.d71d865a1e049f9cb3345d4588f36c028ef41ae48915a57ce510bfe02d623bf8 #+ocamlbuild.c3517ef4f01ee9188faf3fc292460b4865e24fed652e1079d153e4bc1345bdfc -#+ocaml-base.5e023424cc59c60dad5ae5d294c1ec25d6cacb755e021b4ac6bb0e1b60d8da73 -#+opam.fe3121ff9bfb5acceb87a3ee6d3b7124cd28c03f705e918dc6b940fb6e28a496- \ No newline at end of file +#+ocaml-base.252564aa8012b610c37cce1e79773e1877e60d6d9161fd000ffde23d3bcd4a23 +#+opam.44486356d5bffe311486abc4601e0f1e3e3af01d20c58849a9f1669ad07200f4+ \ 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.be68ff851981f275892e96735d7dae711f956d998f49102035ae52c86a69779b +#+pkgconf-pkg-config.035ed72618fdde9058d87fb11cd6374080eef9927f78b0cd97cfc5afdfc21388 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:.