commit 77a97ce5c223aea8ebd30bf155a81feb12f43b66 parent fcb761e8f1b69b0d442f4a58c5190cf4c04be536 Author: Jan Pobrislo <ccx@te2000.cz> Date: Thu, 18 Dec 2025 20:13:06 +0000 Handle build env variables better Diffstat:
74 files changed, 233 insertions(+), 211 deletions(-)
diff --git a/templates/pkg/applyuidgid-caps b/templates/pkg/applyuidgid-caps @@ -5,6 +5,6 @@ #+{{pkg_install_name("libcap")}} {% endblock %} {% block configure -%} -CFLAGS="-D_GNU_SOURCE" -LDFLAGS="-lskarnet -lcap" +CFLAGS="-D_GNU_SOURCE $CFLAGS" +LDLIBS="-lskarnet -lcap" {% endblock %} diff --git a/templates/single_static_c b/templates/single_static_c @@ -14,7 +14,9 @@ name='{{ shortname }}' {% endblock %} {% block build -%} build_env_static -gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS +${CC:-gcc} ${CPPFLAGS} ${CFLAGS} \ + -o "$name" "$name.c" \ + ${LDFLAGS} ${LOADLIBES} ${LDLIBS} {% endblock %} {% block install -%} diff --git a/variants/ccx-x86_64/apk-tools b/variants/ccx-x86_64/apk-tools @@ -31,7 +31,7 @@ #+gnu-make.fb4cff1c46827d02016d0f94d5256a263e7710025f7480fffb7580dc922a6069 #+busybox-diffutils.eed6ca067c994ab56e63b8b97a60f6e9f3625d3f9aeda53306e23bb42186ce78 #+patch.a77c8e315f380834752e2d22243a6276d4779f7f49c0a1ed7a01bd661a431898 -#+libressl.75261ebda8211192bb6b31195a4563e4f5b8a6c9f514746be2c75b8be6a0f184 +#+libressl.bd2415b58d27095d76c9f1670856d7b44f23eb8ecca135c729538f452208d96e #+zstd.1569c43f77b4031079e930f7eb6107e77b72dd641fac5228c4d2c784a6f15361 #+pkgconf-pkg-config.e727e04fa14db15c16a52d4d389e55602d35b463dfe80b75d5120e383ec17ffb #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch diff --git a/variants/ccx-x86_64/applyuidgid-caps b/variants/ccx-x86_64/applyuidgid-caps @@ -61,11 +61,13 @@ dest=${pthbs_destdir%/}${prefix} cd '.' name='applyuidgid-caps' -CFLAGS="-D_GNU_SOURCE" -LDFLAGS="-lskarnet -lcap" +CFLAGS="-D_GNU_SOURCE $CFLAGS" +LDLIBS="-lskarnet -lcap" build_env_static -gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS +${CC:-gcc} ${CPPFLAGS} ${CFLAGS} \ + -o "$name" "$name.c" \ + ${LDFLAGS} ${LOADLIBES} ${LDLIBS} install -d "$pthbs_destdir/$prefix/command" install -m 755 "$name" "$pthbs_destdir/$prefix/command" 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-qemu-guest.eae5c15c0d13a8047d6fc64c65e61d902195c4487ad848a50cd9f58d7020ab66 +#+linux-qemu-guest.8815d78c8b0fc32feca9bc0942e8aea8d0faed8c263a8907481d36692b330a59 #+musl-cross-make.4bca2cd43f4a72eaaeefc4befc0b0ce736a5906ec0245552a8db7dc56fa9e5ec #+gnu-make.fb4cff1c46827d02016d0f94d5256a263e7710025f7480fffb7580dc922a6069 #+busybox.504428034e649f598212c8994966e36667178683ec90987355f495ad3ca4abac @@ -60,7 +60,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-qemu-guest.eae5c15c0d13a8047d6fc64c65e61d902195c4487ad848a50cd9f58d7020ab66" +CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux-qemu-guest.8815d78c8b0fc32feca9bc0942e8aea8d0faed8c263a8907481d36692b330a59" EOF make oldconfig cat .config diff --git a/variants/ccx-x86_64/ca-certificates-wip-donotuse b/variants/ccx-x86_64/ca-certificates-wip-donotuse @@ -27,7 +27,7 @@ #+busybox-util-linux-unpriv.95b792cd49d1f00d5488b15d93809166916ef3b8a63a69ea11f3bf6e92a74f24 #+busybox-findutils.db22f512240124b15d61cf8d0ceafebc98649f6f137608a2d1bd66f18e81ad8c #+nawk.ec8a7f9ea4618a151470a1c1a0026f688a5032eb06b8e459510fe82316c17a60 -#+certdata2pem.e9543d17cfa735e42d8173d4e11d0e24e9f2b5f00ff44e762f3491b5fc1df556 +#+certdata2pem.ddc4a50a68eec066e6e67888c106a11919febf71eb29ce7b690d7b507ffddf6c #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:. diff --git a/variants/ccx-x86_64/certdata2pem b/variants/ccx-x86_64/certdata2pem @@ -62,7 +62,9 @@ name='certdata2pem' CFLAGS="-D_GNU_SOURCE" build_env_static -gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS +${CC:-gcc} ${CPPFLAGS} ${CFLAGS} \ + -o "$name" "$name.c" \ + ${LDFLAGS} ${LOADLIBES} ${LDLIBS} install -d "$pthbs_destdir/$prefix/command" install -m 755 "$name" "$pthbs_destdir/$prefix/command" diff --git a/variants/ccx-x86_64/container-bin-image b/variants/ccx-x86_64/container-bin-image @@ -49,7 +49,7 @@ #+execline.403a4e1645c681e8c2ca9a75704a27658b788db460265916951d1d7a1e59ce8a #+s6.8995e7d6191578e627f1a57d90c25a0e52d9afa701bbbe951f12494e5880351c #+ccx-utils.a0dd0b66ee77bbde1c20e981ba4ddf14995cacb0b99789c0bf50eb40286a63c6 -#+applyuidgid-caps.be47ec66d7811ebb9ec5aa7383b6a4a76decca3f82d1d1180fd7c59b979173c0 +#+applyuidgid-caps.5686455a4eb04ec1a2bddbefe5fbc02b1c2ee926d76cb5c80f49615ae8fd2d46 #+easyseccomp.a7a8ac63b6862efbc9e3b92f971f30c1529e11e5b02b073b8f6f6187e1d8cdc7 #+mlog.ccaa6829cadd2cad0613a94d52a7dc45051407d0467f53e0d5e1fed3b73bc8d1 #+abduco.dfb142f878a5c0d868054abf7a13289458b2b828f3b10f4f6be5cc3f9ef1f968 diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers @@ -31,9 +31,9 @@ #+pthbs-banginstall.944f9b6485bfdb1329fd9fbc78c7996dec0c63f617ccc49ba97ec77d145eedd7 #+execline.403a4e1645c681e8c2ca9a75704a27658b788db460265916951d1d7a1e59ce8a #+alpine-keys.f38e5db6c6e34040a43a472f8a38e9080a626bfb8b3c6ff055c91f20ce866f6a -#+apk-tools.8155ce27acbce82a7eec29d41aaa6a561136359a2b6ab5f3958ae615bf7edabc -#+xbps.1e2fce2eaace515309960e0f0e4a6586fe12cd32ab8e8ec172a666d2e45a7f1d -#+container-bin-image.bbe0ecbaa4a37cddb77f9e925714f539049bd61acafe6bd544f50fdd4fae0375 +#+apk-tools.391099a02718b7da787c88ffca94989b6cab19f9f96fba339180bd593caeb63c +#+xbps.78c26b386597df65c868c0999e9f1eefa56b3614a5759626e8d2fb6d32f93362 +#+container-bin-image.80652c3347d4545b8283be52053630bf0f2a18cd976f43613e8f0d2692ffc780 #@git:68a211c657547b3f5c9d3dfecb2f6d51872bb8d2:containers @@ -76,8 +76,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.8155ce27acbce82a7eec29d41aaa6a561136359a2b6ab5f3958ae615bf7edabc/command/apk.static' "${dest}/deps/command/" -ln -sf '/home/ccx/versions/xbps.1e2fce2eaace515309960e0f0e4a6586fe12cd32ab8e8ec172a666d2e45a7f1d/command/xbps-install.static' "${dest}/deps/command/" +ln -sf '/home/ccx/versions/apk-tools.391099a02718b7da787c88ffca94989b6cab19f9f96fba339180bd593caeb63c/command/apk.static' "${dest}/deps/command/" +ln -sf '/home/ccx/versions/xbps.78c26b386597df65c868c0999e9f1eefa56b3614a5759626e8d2fb6d32f93362/command/xbps-install.static' "${dest}/deps/command/" for f in '/home/ccx/versions/alpine-keys.f38e5db6c6e34040a43a472f8a38e9080a626bfb8b3c6ff055c91f20ce866f6a'/keys/alpine/*/*; do test -f "$f" @@ -87,13 +87,13 @@ for f in '/home/ccx/versions/alpine-keys.f38e5db6c6e34040a43a472f8a38e9080a626bf done mkdir -p "${dest}/deps/keys/void" -for f in '/home/ccx/versions/xbps.1e2fce2eaace515309960e0f0e4a6586fe12cd32ab8e8ec172a666d2e45a7f1d'/keys/void/*; do +for f in '/home/ccx/versions/xbps.78c26b386597df65c868c0999e9f1eefa56b3614a5759626e8d2fb6d32f93362'/keys/void/*; do ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/home/ccx/versions/container-bin-image.bbe0ecbaa4a37cddb77f9e925714f539049bd61acafe6bd544f50fdd4fae0375/container-bin-image' -test -f '/home/ccx/versions/container-bin-image.bbe0ecbaa4a37cddb77f9e925714f539049bd61acafe6bd544f50fdd4fae0375/container-bin-image/if' -ln -sf '/home/ccx/versions/container-bin-image.bbe0ecbaa4a37cddb77f9e925714f539049bd61acafe6bd544f50fdd4fae0375/container-bin-image' "${dest}/deps/" +test -d '/home/ccx/versions/container-bin-image.80652c3347d4545b8283be52053630bf0f2a18cd976f43613e8f0d2692ffc780/container-bin-image' +test -f '/home/ccx/versions/container-bin-image.80652c3347d4545b8283be52053630bf0f2a18cd976f43613e8f0d2692ffc780/container-bin-image/if' +ln -sf '/home/ccx/versions/container-bin-image.80652c3347d4545b8283be52053630bf0f2a18cd976f43613e8f0d2692ffc780/container-bin-image' "${dest}/deps/" diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment @@ -50,12 +50,12 @@ #+s6-linux-utils.e02e2527a80df5d5fe98615c278f0d9db7451b7a7002c1c817d47ca469d0d03f #+zsh.bcee316426fa08a87a1cdbd36d4192206516d31160995f7cb40171cedd8cfa2f #+confz.54cffc17e24f59492eb78f8fb861148dd737735dc81663f8c3cf31c37ee802c1 -#+containers.0598e1266b9ef43e7debabcb7c8ad5fee8215577d622691f32a1a0d7bae516cb -#+xbps.1e2fce2eaace515309960e0f0e4a6586fe12cd32ab8e8ec172a666d2e45a7f1d +#+containers.2bf28cb069a7e0867bc05e163a3a3175a5afc0ee84b98fec719e8b9ca11ea5a2 +#+xbps.78c26b386597df65c868c0999e9f1eefa56b3614a5759626e8d2fb6d32f93362 #+zstd.1569c43f77b4031079e930f7eb6107e77b72dd641fac5228c4d2c784a6f15361 -#+apk-tools.8155ce27acbce82a7eec29d41aaa6a561136359a2b6ab5f3958ae615bf7edabc +#+apk-tools.391099a02718b7da787c88ffca94989b6cab19f9f96fba339180bd593caeb63c #+alpine-keys.f38e5db6c6e34040a43a472f8a38e9080a626bfb8b3c6ff055c91f20ce866f6a -#+getent.fe6cff02ca3d49cd8fdc4dcaa6ab60f50745e25befb3b290c9fd1dec84991f12 +#+getent.72975138dd291666bbc3d0a0b60f3072f0b925f66ca3ff8fb0e0b8481848827b #+fileset.a3b5845ff158d4a14da356583bcbbc7de921ea437f40d47d1f91d28549b384c0 #+ccx-utils.a0dd0b66ee77bbde1c20e981ba4ddf14995cacb0b99789c0bf50eb40286a63c6 #+easyseccomp.a7a8ac63b6862efbc9e3b92f971f30c1529e11e5b02b073b8f6f6187e1d8cdc7 diff --git a/variants/ccx-x86_64/curl b/variants/ccx-x86_64/curl @@ -31,7 +31,7 @@ #+musl-cross-make.4bca2cd43f4a72eaaeefc4befc0b0ce736a5906ec0245552a8db7dc56fa9e5ec #+gnu-make.fb4cff1c46827d02016d0f94d5256a263e7710025f7480fffb7580dc922a6069 #+m4.3b766e732e3c57dd6ec18a8fa68d43ad094fca807d43cdcb68f8829a0c8f6905 -#+libressl.75261ebda8211192bb6b31195a4563e4f5b8a6c9f514746be2c75b8be6a0f184 +#+libressl.bd2415b58d27095d76c9f1670856d7b44f23eb8ecca135c729538f452208d96e #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:. diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -50,7 +50,7 @@ #+patch.a77c8e315f380834752e2d22243a6276d4779f7f49c0a1ed7a01bd661a431898 #+flex.8a5aecde13d2d283b5914eaebaa5386638c0c7e8f81df17f90e7a693e75b8bcd #+bison.101f9166d34a37221f88a74b20d14d9a10138f88e4b8195996de66d7fba93e2c -#+rsync.e67ea6a0e8778f84d4b9baf88b4a3a8f44d9cf180b7b37f11a5d9ed0594dc8a9 +#+rsync.3060eb88668700798b531a6f6d3647352e1a572ad8f5b55a75fd22a3326de06a #+execline.403a4e1645c681e8c2ca9a75704a27658b788db460265916951d1d7a1e59ce8a #+s6.8995e7d6191578e627f1a57d90c25a0e52d9afa701bbbe951f12494e5880351c #+s6-rc.9aac5b15b54c183366ab03f193a967d0fc66134b1623410032766e062e77bc5d @@ -59,25 +59,25 @@ #+s6-linux-init.7af048a1da88cb89e227afc4ce78f722cfde5a4bbe2f8fef1b1c4c37b1a12b8d #+mdevd.9e13a4a3ebe4ab99da1dc591d9646ec1287bfa575ee0845a154c8df885cdb17b #+s6-dns.27c207c15a964d8939bf32c0e79e0dec48d03968d1d89790e683298c7aff89f8 -#+libressl.75261ebda8211192bb6b31195a4563e4f5b8a6c9f514746be2c75b8be6a0f184 -#+s6-networking.4a4d7cf50ccb510f48177126b30042b1633d20a8dd5562b5761e78f63d4690db +#+libressl.bd2415b58d27095d76c9f1670856d7b44f23eb8ecca135c729538f452208d96e +#+s6-networking.e5417f43b673408dfe2984366d3b66639896a8c744a9a46cb4bbb5c6bda9a2bb #+zsh.bcee316426fa08a87a1cdbd36d4192206516d31160995f7cb40171cedd8cfa2f #+pthbs-banginstall.944f9b6485bfdb1329fd9fbc78c7996dec0c63f617ccc49ba97ec77d145eedd7 #+aat.9166428aa8236b03999fcbe9e2f6da9adefa8c4675ddd36f4b7995d6c7bb87f4 #+confz.54cffc17e24f59492eb78f8fb861148dd737735dc81663f8c3cf31c37ee802c1 -#+containers.0598e1266b9ef43e7debabcb7c8ad5fee8215577d622691f32a1a0d7bae516cb +#+containers.2bf28cb069a7e0867bc05e163a3a3175a5afc0ee84b98fec719e8b9ca11ea5a2 #+fileset.a3b5845ff158d4a14da356583bcbbc7de921ea437f40d47d1f91d28549b384c0 #+logincaps.536680c06902322ead7c7241797739c630cb11fb4c62d45c991e9b5fa03666ce #+snaprep.77c41271f852de542d321eb387e5807f47a1c96f4289daaad7866be9721d4a76 -#+curl.5c276fe4d4fab33e3919e64e72f77f497b6f091f3a2fcd3551530b1c85ff7642 -#+git.16860e4191850edbfac3bb52aa30a2a5adac5544394f99c524453a33ea4ed02d -#+xbps.1e2fce2eaace515309960e0f0e4a6586fe12cd32ab8e8ec172a666d2e45a7f1d -#+apk-tools.8155ce27acbce82a7eec29d41aaa6a561136359a2b6ab5f3958ae615bf7edabc -#+getent.fe6cff02ca3d49cd8fdc4dcaa6ab60f50745e25befb3b290c9fd1dec84991f12 -#+getconf.e2bd556d3fcfe6c55c9564bf11196a3b4b493310af402b173da67e26788c1e72 -#+iconv.0d67e9456d04a04ee273169db2e2802f27a9d1d0b582a44bbf24c38f74a2c2e9 +#+curl.f818d3aa11b4e891116df541cd3d47cf92a9042a125c1c4901a8a18e680f4cfa +#+git.9990d1b6a2e0c8af3edbf1de71eb58ac4170eaef1c7a8b26921c06b54a37ac1e +#+xbps.78c26b386597df65c868c0999e9f1eefa56b3614a5759626e8d2fb6d32f93362 +#+apk-tools.391099a02718b7da787c88ffca94989b6cab19f9f96fba339180bd593caeb63c +#+getent.72975138dd291666bbc3d0a0b60f3072f0b925f66ca3ff8fb0e0b8481848827b +#+getconf.103c3820b143fe1b3ba9ef35e6cd8161da49123f4bcc7430ef1fcf8292748dcb +#+iconv.a6e8b2095dfdb66c699638f0365a840ff5dc7abd22e1c0bd184b0c534dafd42e #+libcap.ecad0ebabe3cad4c99717b80b60a24e91970f05a6ed9e37e96f147377522bee3 -#+applyuidgid-caps.be47ec66d7811ebb9ec5aa7383b6a4a76decca3f82d1d1180fd7c59b979173c0 +#+applyuidgid-caps.5686455a4eb04ec1a2bddbefe5fbc02b1c2ee926d76cb5c80f49615ae8fd2d46 #+ccx-utils.a0dd0b66ee77bbde1c20e981ba4ddf14995cacb0b99789c0bf50eb40286a63c6 #+user-env.46ffb119f20a713e192e63c63a0bcc7420343381d756ee6fb5a39d3bbc395414 #+strace.16677554a13d04e241d4be4e16e2d477ebeb3ce6e38be7bde69f6fbeaf09ad79 @@ -88,9 +88,9 @@ #+squashfs-tools.e58b08a6012ee3dc4429378aaaf55f620da924cf444b3556520fc4e6efb10946 #+mandoc.f9203b401ae6346801b1e100da2e79879b24b86f7f31c457fb4add63cf1ed170 #+tinyssh.9940616c43114ecd7767fc10062ce00eb76a738453248a490f64cd79854343d7 -#+system-config.6b08858a986ca8dd9b6972ad4053e17326c8055de1d1b97e45485dbf47105d82 -#+system-config-rc.8dea0ea821b1f6e82ec913085cdf2ae288004d2b860d7b34abb115c95da78dac +#+system-config.e1e6decd74fe2e6c2e1acb7cfbe8eb1d92c4d9f4f5795f4de013a46771b1d16a +#+system-config-rc.30055510e484dd4a29a35f0fb2b92ea97a96c0619c6d11bfb2f31635fedf610d #+system-config-scripts.35c642cad58c3945c2c3caa525fce3946ba87d0710adaf13efec1db79da75729 -#+system-config-init.0f36bdec401afa58530df96c7710a478ff422141e7eefe5d22e3e3c5818be8b3 +#+system-config-init.f155333bee7682c84b527019c80f13d4971beb1489b3704dcb7fb6eb790bbb0c #+system-config-zsh.a8d29ac3c60ef9b666edf51a0bfd60aee2be60f3aa898ed8285afd8c2955baab -#+busybox.e2eb491435a192a50d7e8291bbdacb3bb5c42a960036a2bc251e622b2c7b723a- \ No newline at end of file +#+busybox.fbc9e803b04255dbb1331b834390250bc68a686d02ae51a5537b781cac049cf5+ \ No newline at end of file diff --git a/variants/ccx-x86_64/getconf b/variants/ccx-x86_64/getconf @@ -61,7 +61,9 @@ name='getconf' build_env_static -gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS +${CC:-gcc} ${CPPFLAGS} ${CFLAGS} \ + -o "$name" "$name.c" \ + ${LDFLAGS} ${LOADLIBES} ${LDLIBS} install -d "$pthbs_destdir/$prefix/command" install -m 755 "$name" "$pthbs_destdir/$prefix/command" diff --git a/variants/ccx-x86_64/getent b/variants/ccx-x86_64/getent @@ -61,7 +61,9 @@ name='getent' build_env_static -gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS +${CC:-gcc} ${CPPFLAGS} ${CFLAGS} \ + -o "$name" "$name.c" \ + ${LDFLAGS} ${LOADLIBES} ${LDLIBS} install -d "$pthbs_destdir/$prefix/command" install -m 755 "$name" "$pthbs_destdir/$prefix/command" diff --git a/variants/ccx-x86_64/git b/variants/ccx-x86_64/git @@ -31,8 +31,8 @@ #+gnu-make.fb4cff1c46827d02016d0f94d5256a263e7710025f7480fffb7580dc922a6069 #+busybox-diffutils.eed6ca067c994ab56e63b8b97a60f6e9f3625d3f9aeda53306e23bb42186ce78 #+m4.3b766e732e3c57dd6ec18a8fa68d43ad094fca807d43cdcb68f8829a0c8f6905 -#+libressl.75261ebda8211192bb6b31195a4563e4f5b8a6c9f514746be2c75b8be6a0f184 -#+curl.5c276fe4d4fab33e3919e64e72f77f497b6f091f3a2fcd3551530b1c85ff7642 +#+libressl.bd2415b58d27095d76c9f1670856d7b44f23eb8ecca135c729538f452208d96e +#+curl.f818d3aa11b4e891116df541cd3d47cf92a9042a125c1c4901a8a18e680f4cfa #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:. diff --git a/variants/ccx-x86_64/iconv b/variants/ccx-x86_64/iconv @@ -61,7 +61,9 @@ name='iconv' build_env_static -gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS +${CC:-gcc} ${CPPFLAGS} ${CFLAGS} \ + -o "$name" "$name.c" \ + ${LDFLAGS} ${LOADLIBES} ${LDLIBS} install -d "$pthbs_destdir/$prefix/command" install -m 755 "$name" "$pthbs_destdir/$prefix/command" 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-qemu-guest.eae5c15c0d13a8047d6fc64c65e61d902195c4487ad848a50cd9f58d7020ab66 -#+busybox.e2eb491435a192a50d7e8291bbdacb3bb5c42a960036a2bc251e622b2c7b723a- \ No newline at end of file +#+linux-qemu-guest.8815d78c8b0fc32feca9bc0942e8aea8d0faed8c263a8907481d36692b330a59 +#+busybox.fbc9e803b04255dbb1331b834390250bc68a686d02ae51a5537b781cac049cf5+ \ No newline at end of file diff --git a/variants/ccx-x86_64/libressl b/variants/ccx-x86_64/libressl @@ -31,7 +31,7 @@ #+musl-cross-make.4bca2cd43f4a72eaaeefc4befc0b0ce736a5906ec0245552a8db7dc56fa9e5ec #+gnu-make.fb4cff1c46827d02016d0f94d5256a263e7710025f7480fffb7580dc922a6069 #+m4.3b766e732e3c57dd6ec18a8fa68d43ad094fca807d43cdcb68f8829a0c8f6905 -#+ca-certificates-wip-donotuse.49febed14874e278e5eadaf555c2d10b411b8e4cf026fd444c59b723428ada64 +#+ca-certificates-wip-donotuse.442922c2f93c1fd3596ab6f296cdbe8e9f7b17b922b18b3e0a172051659f0445 #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:. @@ -99,7 +99,7 @@ make DESTDIR="$pthbs_destdir" install cd .. gcc ./c_rehash.c -o c_rehash --static -static -I"$pthbs_destdir/$prefix/include" -L"$pthbs_destdir/$prefix/library" -lssl -lcrypto -cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.49febed14874e278e5eadaf555c2d10b411b8e4cf026fd444c59b723428ada64/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/" +cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.442922c2f93c1fd3596ab6f296cdbe8e9f7b17b922b18b3e0a172051659f0445/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/" ./c_rehash "$pthbs_destdir/$prefix/config/ssl/certs/" cd "$pthbs_destdir/$prefix/config/ssl/" mv cert.pem libressl-cert.pem diff --git a/variants/ccx-x86_64/linux b/variants/ccx-x86_64/linux @@ -34,7 +34,7 @@ #+patch.a77c8e315f380834752e2d22243a6276d4779f7f49c0a1ed7a01bd661a431898 #+flex.8a5aecde13d2d283b5914eaebaa5386638c0c7e8f81df17f90e7a693e75b8bcd #+bison.101f9166d34a37221f88a74b20d14d9a10138f88e4b8195996de66d7fba93e2c -#+rsync.e67ea6a0e8778f84d4b9baf88b4a3a8f44d9cf180b7b37f11a5d9ed0594dc8a9 +#+rsync.3060eb88668700798b531a6f6d3647352e1a572ad8f5b55a75fd22a3326de06a #+zstd.1569c43f77b4031079e930f7eb6107e77b72dd641fac5228c4d2c784a6f15361 #+libelf.224e9c567f7dcbae76ce03c2455b367874a4d5e34f64ee899cebb2375f126588 #+pkgconf-pkg-config.e727e04fa14db15c16a52d4d389e55602d35b463dfe80b75d5120e383ec17ffb diff --git a/variants/ccx-x86_64/linux-qemu-guest b/variants/ccx-x86_64/linux-qemu-guest @@ -34,7 +34,7 @@ #+patch.a77c8e315f380834752e2d22243a6276d4779f7f49c0a1ed7a01bd661a431898 #+flex.8a5aecde13d2d283b5914eaebaa5386638c0c7e8f81df17f90e7a693e75b8bcd #+bison.101f9166d34a37221f88a74b20d14d9a10138f88e4b8195996de66d7fba93e2c -#+rsync.e67ea6a0e8778f84d4b9baf88b4a3a8f44d9cf180b7b37f11a5d9ed0594dc8a9 +#+rsync.3060eb88668700798b531a6f6d3647352e1a572ad8f5b55a75fd22a3326de06a #+zstd.1569c43f77b4031079e930f7eb6107e77b72dd641fac5228c4d2c784a6f15361 #+libelf.224e9c567f7dcbae76ce03c2455b367874a4d5e34f64ee899cebb2375f126588 #+pkgconf-pkg-config.e727e04fa14db15c16a52d4d389e55602d35b463dfe80b75d5120e383ec17ffb diff --git a/variants/ccx-x86_64/mdevd.environment b/variants/ccx-x86_64/mdevd.environment @@ -47,4 +47,4 @@ #+s6.8995e7d6191578e627f1a57d90c25a0e52d9afa701bbbe951f12494e5880351c #+mdev-scripts.747ade0f721790e1ddbe4b7fae9578bba479d84303649a2e6cb1bb7a78d10836 #+mdevd.9e13a4a3ebe4ab99da1dc591d9646ec1287bfa575ee0845a154c8df885cdb17b -#+busybox.e2eb491435a192a50d7e8291bbdacb3bb5c42a960036a2bc251e622b2c7b723a- \ No newline at end of file +#+busybox.fbc9e803b04255dbb1331b834390250bc68a686d02ae51a5537b781cac049cf5+ \ No newline at end of file diff --git a/variants/ccx-x86_64/ocaml-astring b/variants/ccx-x86_64/ocaml-astring @@ -32,8 +32,8 @@ #+ocaml.bf89d3eeb0ba38f132986852f19631df96f531aa1e4f8c037f9cbcd8930f741f #+ocaml-findlib.cc5a305145b276bb86f8ade6987cafa26a869bf62b6d4295fb04722599fab33c #+ocamlbuild.3d77d9ce346e814e7a9bf6f5f95c5e43ca543d537b9491cb9c51553bd1800050 -#+opam.9eb6141129a4471d80676471c65d5ca56ba959e8fb6552abdb7f2054b1078943 -#+ocaml-topkg.5436ed545e63dd25a35b54bf02226f8c261750e9967ef230acfd52716c2b69ae +#+opam.c52476977040d2263d528767c6edba87d8b084e49cb32768d8db3f3fe28c52a6 +#+ocaml-topkg.be6d28d2c4a8cf748eb9f5b824fcc7c60846152019abce11da74917549222584 #@untar:-j:sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa:. diff --git a/variants/ccx-x86_64/ocaml-bos b/variants/ccx-x86_64/ocaml-bos @@ -32,14 +32,14 @@ #+ocaml.bf89d3eeb0ba38f132986852f19631df96f531aa1e4f8c037f9cbcd8930f741f #+ocaml-findlib.cc5a305145b276bb86f8ade6987cafa26a869bf62b6d4295fb04722599fab33c #+ocamlbuild.3d77d9ce346e814e7a9bf6f5f95c5e43ca543d537b9491cb9c51553bd1800050 -#+opam.9eb6141129a4471d80676471c65d5ca56ba959e8fb6552abdb7f2054b1078943 -#+ocaml-topkg.5436ed545e63dd25a35b54bf02226f8c261750e9967ef230acfd52716c2b69ae -#+ocaml-astring.9585b83859279826c5a54d5c651864efd8937089dd208a49b1cbd1719dbb0544 -#+ocaml-fpath.51d49545899d5f8e37bf912f7de3dcef24dacf9c280949937e49862e68cf16fc -#+ocaml-rresult.87de1195ee42fdd153229b5c11af96979273714dc7cbbda6516b15109ee862ff -#+ocaml-fmt.40391f802d902ba70bbcc6282a3d333318935fc263b749e74ba1548d004a053c -#+ocaml-logs.354dbb7a4179ae6a4377ffd6ee7cb70d9be4230118eb6a516e104eb1023dcd36 -#+ocaml-mtime.1bafc52f8921d12d421bee7edb5b3f9b52b096aeb332dd8567e7371089b8f89c +#+opam.c52476977040d2263d528767c6edba87d8b084e49cb32768d8db3f3fe28c52a6 +#+ocaml-topkg.be6d28d2c4a8cf748eb9f5b824fcc7c60846152019abce11da74917549222584 +#+ocaml-astring.a6f935013e153747b94497433585492b12a5fe01226eac467e00a3d9659be6ab +#+ocaml-fpath.036a68fb22ebee59267e1594a5f61a1aff82a4e23749ab7cf6f3507c15e9c347 +#+ocaml-rresult.0e45c4e2b5daba6433baaa4e436236135420194bf3943841c6fce7b79f818258 +#+ocaml-fmt.5f07ce2166fadd89c82ceb5d30a12644dd975d60301f0f01bf6d7ac0c3812dc2 +#+ocaml-logs.e5d2b002dfdff4f57656bb93e587e3f3150405d87ad170043313d7ff652b7d05 +#+ocaml-mtime.73134a67edf218ba3b7115d54091bc9468f840f799f68c124c29c116ea665f44 #@untar:-j:sha256:d8d62e786b10d697e0457205a8eedeaa27ebcc90f1855f18df190cac2e3d8f37:. diff --git a/variants/ccx-x86_64/ocaml-cmdliner b/variants/ccx-x86_64/ocaml-cmdliner @@ -32,8 +32,8 @@ #+ocaml.bf89d3eeb0ba38f132986852f19631df96f531aa1e4f8c037f9cbcd8930f741f #+ocaml-findlib.cc5a305145b276bb86f8ade6987cafa26a869bf62b6d4295fb04722599fab33c #+ocamlbuild.3d77d9ce346e814e7a9bf6f5f95c5e43ca543d537b9491cb9c51553bd1800050 -#+opam.9eb6141129a4471d80676471c65d5ca56ba959e8fb6552abdb7f2054b1078943 -#+ocaml-topkg.5436ed545e63dd25a35b54bf02226f8c261750e9967ef230acfd52716c2b69ae +#+opam.c52476977040d2263d528767c6edba87d8b084e49cb32768d8db3f3fe28c52a6 +#+ocaml-topkg.be6d28d2c4a8cf748eb9f5b824fcc7c60846152019abce11da74917549222584 #@untar:-j:sha256:4e547a631c36fbaadff60d3bd7724eb3f83ba274e92fb725950bae7868378582:. diff --git a/variants/ccx-x86_64/ocaml-fmt b/variants/ccx-x86_64/ocaml-fmt @@ -32,9 +32,9 @@ #+ocaml.bf89d3eeb0ba38f132986852f19631df96f531aa1e4f8c037f9cbcd8930f741f #+ocaml-findlib.cc5a305145b276bb86f8ade6987cafa26a869bf62b6d4295fb04722599fab33c #+ocamlbuild.3d77d9ce346e814e7a9bf6f5f95c5e43ca543d537b9491cb9c51553bd1800050 -#+opam.9eb6141129a4471d80676471c65d5ca56ba959e8fb6552abdb7f2054b1078943 -#+ocaml-topkg.5436ed545e63dd25a35b54bf02226f8c261750e9967ef230acfd52716c2b69ae -#+ocaml-cmdliner.8467e32e9806b9e134d099f290082fc878a4e8311ed3fa5281c3ef7e3698034a +#+opam.c52476977040d2263d528767c6edba87d8b084e49cb32768d8db3f3fe28c52a6 +#+ocaml-topkg.be6d28d2c4a8cf748eb9f5b824fcc7c60846152019abce11da74917549222584 +#+ocaml-cmdliner.7b865caec294f1eee682c79ef8f24b03fbd39d1b181dcdd09305f386017eedf4 #@untar:-j:sha256:857cfd47a54b52429cd9b3e2665e44173cd1bd3b435bece7172f984ad5376a1b:. diff --git a/variants/ccx-x86_64/ocaml-fpath b/variants/ccx-x86_64/ocaml-fpath @@ -32,9 +32,9 @@ #+ocaml.bf89d3eeb0ba38f132986852f19631df96f531aa1e4f8c037f9cbcd8930f741f #+ocaml-findlib.cc5a305145b276bb86f8ade6987cafa26a869bf62b6d4295fb04722599fab33c #+ocamlbuild.3d77d9ce346e814e7a9bf6f5f95c5e43ca543d537b9491cb9c51553bd1800050 -#+opam.9eb6141129a4471d80676471c65d5ca56ba959e8fb6552abdb7f2054b1078943 -#+ocaml-topkg.5436ed545e63dd25a35b54bf02226f8c261750e9967ef230acfd52716c2b69ae -#+ocaml-astring.9585b83859279826c5a54d5c651864efd8937089dd208a49b1cbd1719dbb0544 +#+opam.c52476977040d2263d528767c6edba87d8b084e49cb32768d8db3f3fe28c52a6 +#+ocaml-topkg.be6d28d2c4a8cf748eb9f5b824fcc7c60846152019abce11da74917549222584 +#+ocaml-astring.a6f935013e153747b94497433585492b12a5fe01226eac467e00a3d9659be6ab #@untar:-j:sha256:12b08ff192d037d9b6d69e9ca19d1d385184f20b3237c27231e437ac81ace70f:. diff --git a/variants/ccx-x86_64/ocaml-logs b/variants/ccx-x86_64/ocaml-logs @@ -32,11 +32,11 @@ #+ocaml.bf89d3eeb0ba38f132986852f19631df96f531aa1e4f8c037f9cbcd8930f741f #+ocaml-findlib.cc5a305145b276bb86f8ade6987cafa26a869bf62b6d4295fb04722599fab33c #+ocamlbuild.3d77d9ce346e814e7a9bf6f5f95c5e43ca543d537b9491cb9c51553bd1800050 -#+opam.9eb6141129a4471d80676471c65d5ca56ba959e8fb6552abdb7f2054b1078943 -#+ocaml-topkg.5436ed545e63dd25a35b54bf02226f8c261750e9967ef230acfd52716c2b69ae -#+ocaml-mtime.1bafc52f8921d12d421bee7edb5b3f9b52b096aeb332dd8567e7371089b8f89c -#+ocaml-cmdliner.8467e32e9806b9e134d099f290082fc878a4e8311ed3fa5281c3ef7e3698034a -#+ocaml-fmt.40391f802d902ba70bbcc6282a3d333318935fc263b749e74ba1548d004a053c +#+opam.c52476977040d2263d528767c6edba87d8b084e49cb32768d8db3f3fe28c52a6 +#+ocaml-topkg.be6d28d2c4a8cf748eb9f5b824fcc7c60846152019abce11da74917549222584 +#+ocaml-mtime.73134a67edf218ba3b7115d54091bc9468f840f799f68c124c29c116ea665f44 +#+ocaml-cmdliner.7b865caec294f1eee682c79ef8f24b03fbd39d1b181dcdd09305f386017eedf4 +#+ocaml-fmt.5f07ce2166fadd89c82ceb5d30a12644dd975d60301f0f01bf6d7ac0c3812dc2 #@untar:-j:sha256:ee97065ba41ce28f19dea9453c6bec4e0ef26165ad7394c4131ea0c65c0f06d5:. diff --git a/variants/ccx-x86_64/ocaml-mtime b/variants/ccx-x86_64/ocaml-mtime @@ -32,8 +32,8 @@ #+ocaml.bf89d3eeb0ba38f132986852f19631df96f531aa1e4f8c037f9cbcd8930f741f #+ocaml-findlib.cc5a305145b276bb86f8ade6987cafa26a869bf62b6d4295fb04722599fab33c #+ocamlbuild.3d77d9ce346e814e7a9bf6f5f95c5e43ca543d537b9491cb9c51553bd1800050 -#+opam.9eb6141129a4471d80676471c65d5ca56ba959e8fb6552abdb7f2054b1078943 -#+ocaml-topkg.5436ed545e63dd25a35b54bf02226f8c261750e9967ef230acfd52716c2b69ae +#+opam.c52476977040d2263d528767c6edba87d8b084e49cb32768d8db3f3fe28c52a6 +#+ocaml-topkg.be6d28d2c4a8cf748eb9f5b824fcc7c60846152019abce11da74917549222584 #@untar:-j:sha256:097cb2802e3701ead9572e1b483d5a28c6e2f0a39449faaf9b44ad8a89834d88:. diff --git a/variants/ccx-x86_64/ocaml-rresult b/variants/ccx-x86_64/ocaml-rresult @@ -32,8 +32,8 @@ #+ocaml.bf89d3eeb0ba38f132986852f19631df96f531aa1e4f8c037f9cbcd8930f741f #+ocaml-findlib.cc5a305145b276bb86f8ade6987cafa26a869bf62b6d4295fb04722599fab33c #+ocamlbuild.3d77d9ce346e814e7a9bf6f5f95c5e43ca543d537b9491cb9c51553bd1800050 -#+opam.9eb6141129a4471d80676471c65d5ca56ba959e8fb6552abdb7f2054b1078943 -#+ocaml-topkg.5436ed545e63dd25a35b54bf02226f8c261750e9967ef230acfd52716c2b69ae +#+opam.c52476977040d2263d528767c6edba87d8b084e49cb32768d8db3f3fe28c52a6 +#+ocaml-topkg.be6d28d2c4a8cf748eb9f5b824fcc7c60846152019abce11da74917549222584 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:. diff --git a/variants/ccx-x86_64/ocaml-topkg b/variants/ccx-x86_64/ocaml-topkg @@ -32,7 +32,7 @@ #+ocaml.bf89d3eeb0ba38f132986852f19631df96f531aa1e4f8c037f9cbcd8930f741f #+ocaml-findlib.cc5a305145b276bb86f8ade6987cafa26a869bf62b6d4295fb04722599fab33c #+ocamlbuild.3d77d9ce346e814e7a9bf6f5f95c5e43ca543d537b9491cb9c51553bd1800050 -#+opam.9eb6141129a4471d80676471c65d5ca56ba959e8fb6552abdb7f2054b1078943 +#+opam.c52476977040d2263d528767c6edba87d8b084e49cb32768d8db3f3fe28c52a6 #@untar:-j:sha256:452082626e651ac4b1633c2b4ae4cad7abeb1fb6a13046e699f95eec58b5d1c7:. diff --git a/variants/ccx-x86_64/ocaml.environment b/variants/ccx-x86_64/ocaml.environment @@ -3,7 +3,7 @@ #+dune.c35e84764bbeaec2789584e249cdf37102627d62d78b6bf30b6370aa03210a7b #+ocamlbuild.3d77d9ce346e814e7a9bf6f5f95c5e43ca543d537b9491cb9c51553bd1800050 #+ocaml-base.661fe1e74e9e5886b90cbc15879c44267ac784788f873cfb2f46b685f5e7b341 -#+opam.9eb6141129a4471d80676471c65d5ca56ba959e8fb6552abdb7f2054b1078943 -#+ocaml-bos.56b42ea0b3075d6b3f42b527fc5ad310f3158dafeaf40f9c1b8c72a1aef8bef7 +#+opam.c52476977040d2263d528767c6edba87d8b084e49cb32768d8db3f3fe28c52a6 +#+ocaml-bos.af76eb8e43736dce4ba86f9b165abaa7b4db152591d4a8bcb84d5d6d7378776e #+ocaml-lun.0c81796badbdc31f7717a8f4b2796bb5bd23c4ed755ceb853819fab73b8c367c #+ocaml-ppx_deriving.0cce535cfb407225acac5ff5ae4c1dec3a4f35f9f63ed5ccb9910c530b6f8599 \ No newline at end of file diff --git a/variants/ccx-x86_64/opam b/variants/ccx-x86_64/opam @@ -31,7 +31,7 @@ #+patch.a77c8e315f380834752e2d22243a6276d4779f7f49c0a1ed7a01bd661a431898 #+gnu-make.fb4cff1c46827d02016d0f94d5256a263e7710025f7480fffb7580dc922a6069 #+musl-cross-make.4bca2cd43f4a72eaaeefc4befc0b0ce736a5906ec0245552a8db7dc56fa9e5ec -#+getconf.e2bd556d3fcfe6c55c9564bf11196a3b4b493310af402b173da67e26788c1e72 +#+getconf.103c3820b143fe1b3ba9ef35e6cd8161da49123f4bcc7430ef1fcf8292748dcb #+ocaml.bf89d3eeb0ba38f132986852f19631df96f531aa1e4f8c037f9cbcd8930f741f #+dune.c35e84764bbeaec2789584e249cdf37102627d62d78b6bf30b6370aa03210a7b #@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:. diff --git a/variants/ccx-x86_64/rsync b/variants/ccx-x86_64/rsync @@ -32,7 +32,7 @@ #+m4.3b766e732e3c57dd6ec18a8fa68d43ad094fca807d43cdcb68f8829a0c8f6905 #+nawk.ec8a7f9ea4618a151470a1c1a0026f688a5032eb06b8e459510fe82316c17a60 #+popt.637c51f56dda6f60f8b6f17c5487471ddcf8c60e8e82fe42023eb8c92433b54d -#+libressl.75261ebda8211192bb6b31195a4563e4f5b8a6c9f514746be2c75b8be6a0f184 +#+libressl.bd2415b58d27095d76c9f1670856d7b44f23eb8ecca135c729538f452208d96e #+zstd.1569c43f77b4031079e930f7eb6107e77b72dd641fac5228c4d2c784a6f15361 #+acl.d5bf586fd44c8f6af3f7d4b4c30eabee8444ac92c54cc10edc107a230056eb19 #+attr.f6095bcfe7fb136ea1189b5cdeb8bb0e613a18bfef86703bb9b15764a856d070 diff --git a/variants/ccx-x86_64/s6-networking b/variants/ccx-x86_64/s6-networking @@ -33,7 +33,7 @@ #+execline.403a4e1645c681e8c2ca9a75704a27658b788db460265916951d1d7a1e59ce8a #+s6.8995e7d6191578e627f1a57d90c25a0e52d9afa701bbbe951f12494e5880351c #+s6-dns.27c207c15a964d8939bf32c0e79e0dec48d03968d1d89790e683298c7aff89f8 -#+libressl.75261ebda8211192bb6b31195a4563e4f5b8a6c9f514746be2c75b8be6a0f184 +#+libressl.bd2415b58d27095d76c9f1670856d7b44f23eb8ecca135c729538f452208d96e #@git:a21a4975ce06f06e4f26d73f27d3b22ee3a9da1e:s6-networking diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config @@ -49,7 +49,7 @@ #+gnu-make.fb4cff1c46827d02016d0f94d5256a263e7710025f7480fffb7580dc922a6069 #+aat.9166428aa8236b03999fcbe9e2f6da9adefa8c4675ddd36f4b7995d6c7bb87f4 #+fileset.a3b5845ff158d4a14da356583bcbbc7de921ea437f40d47d1f91d28549b384c0 -#+rsync.e67ea6a0e8778f84d4b9baf88b4a3a8f44d9cf180b7b37f11a5d9ed0594dc8a9 +#+rsync.3060eb88668700798b531a6f6d3647352e1a572ad8f5b55a75fd22a3326de06a #+execline.403a4e1645c681e8c2ca9a75704a27658b788db460265916951d1d7a1e59ce8a #+kbd.16464f49621bdefb0c896c157cbba70f6702c2b8834da0c3701159aacb87c00a #+mdevd.9e13a4a3ebe4ab99da1dc591d9646ec1287bfa575ee0845a154c8df885cdb17b @@ -60,7 +60,7 @@ #+libcgroup.b965840ad051883db316a3df064f53b4562cddf8738dea3aa31a3464b23070c8 #+system-config-scripts.35c642cad58c3945c2c3caa525fce3946ba87d0710adaf13efec1db79da75729 #+logincaps.536680c06902322ead7c7241797739c630cb11fb4c62d45c991e9b5fa03666ce -#+busybox.e2eb491435a192a50d7e8291bbdacb3bb5c42a960036a2bc251e622b2c7b723a +#+busybox.fbc9e803b04255dbb1331b834390250bc68a686d02ae51a5537b781cac049cf5 #@git:055d24bac572481d7dedba7d4ec9df37f620fbfd:system-config @@ -97,8 +97,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.27f1226f897f2fa3c677187600cd36c4649a1baf2f67dce47c22790cb749fe34' \ - 'pthbs_path_mdevd=/home/ccx/versions/env.d252549a97a8de5eb5b01f328ec83c4381256471275c357ed0653da1646f9679' \ + 'pthbs_path_containers=/home/ccx/versions/env.f05f54d4495265058fef661758cdf245b71ea739962c657e65c5fc45adbc099a' \ + 'pthbs_path_mdevd=/home/ccx/versions/env.c9c201a2b517e3aacfc4709cf44a4c399ee28302bba620d332bfb90b04bebe92' \ 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 @@ -50,7 +50,7 @@ #+s6-portable-utils.ed9b2a1a2b2eade3f210e876b2e8c08d680c2fb0f4f5a1ec4137dd262a3d9e3d #+s6-linux-init.7af048a1da88cb89e227afc4ce78f722cfde5a4bbe2f8fef1b1c4c37b1a12b8d #+execline.403a4e1645c681e8c2ca9a75704a27658b788db460265916951d1d7a1e59ce8a -#+system-config-rc.8dea0ea821b1f6e82ec913085cdf2ae288004d2b860d7b34abb115c95da78dac +#+system-config-rc.30055510e484dd4a29a35f0fb2b92ea97a96c0619c6d11bfb2f31635fedf610d # - build script start - @@ -75,7 +75,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/home/ccx/versions/system-config-rc.8dea0ea821b1f6e82ec913085cdf2ae288004d2b860d7b34abb115c95da78dac/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.30055510e484dd4a29a35f0fb2b92ea97a96c0619c6d11bfb2f31635fedf610d/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 @@ -30,7 +30,7 @@ #+busybox-diffutils.eed6ca067c994ab56e63b8b97a60f6e9f3625d3f9aeda53306e23bb42186ce78 #+s6-rc.9aac5b15b54c183366ab03f193a967d0fc66134b1623410032766e062e77bc5d #+fileset.a3b5845ff158d4a14da356583bcbbc7de921ea437f40d47d1f91d28549b384c0 -#+system-config.6b08858a986ca8dd9b6972ad4053e17326c8055de1d1b97e45485dbf47105d82 +#+system-config.e1e6decd74fe2e6c2e1acb7cfbe8eb1d92c4d9f4f5795f4de013a46771b1d16a # - build script start - @@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/home/ccx/versions/system-config.6b08858a986ca8dd9b6972ad4053e17326c8055de1d1b97e45485dbf47105d82/config/s6-rc-source +src=/home/ccx/versions/system-config.e1e6decd74fe2e6c2e1acb7cfbe8eb1d92c4d9f4f5795f4de013a46771b1d16a/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 @@ -50,7 +50,7 @@ #+patch.a77c8e315f380834752e2d22243a6276d4779f7f49c0a1ed7a01bd661a431898 #+flex.8a5aecde13d2d283b5914eaebaa5386638c0c7e8f81df17f90e7a693e75b8bcd #+bison.101f9166d34a37221f88a74b20d14d9a10138f88e4b8195996de66d7fba93e2c -#+rsync.e67ea6a0e8778f84d4b9baf88b4a3a8f44d9cf180b7b37f11a5d9ed0594dc8a9 +#+rsync.3060eb88668700798b531a6f6d3647352e1a572ad8f5b55a75fd22a3326de06a #+execline.403a4e1645c681e8c2ca9a75704a27658b788db460265916951d1d7a1e59ce8a #+s6.8995e7d6191578e627f1a57d90c25a0e52d9afa701bbbe951f12494e5880351c #+s6-rc.9aac5b15b54c183366ab03f193a967d0fc66134b1623410032766e062e77bc5d @@ -59,25 +59,25 @@ #+s6-linux-init.7af048a1da88cb89e227afc4ce78f722cfde5a4bbe2f8fef1b1c4c37b1a12b8d #+mdevd.9e13a4a3ebe4ab99da1dc591d9646ec1287bfa575ee0845a154c8df885cdb17b #+s6-dns.27c207c15a964d8939bf32c0e79e0dec48d03968d1d89790e683298c7aff89f8 -#+libressl.75261ebda8211192bb6b31195a4563e4f5b8a6c9f514746be2c75b8be6a0f184 -#+s6-networking.4a4d7cf50ccb510f48177126b30042b1633d20a8dd5562b5761e78f63d4690db +#+libressl.bd2415b58d27095d76c9f1670856d7b44f23eb8ecca135c729538f452208d96e +#+s6-networking.e5417f43b673408dfe2984366d3b66639896a8c744a9a46cb4bbb5c6bda9a2bb #+zsh.bcee316426fa08a87a1cdbd36d4192206516d31160995f7cb40171cedd8cfa2f #+pthbs-banginstall.944f9b6485bfdb1329fd9fbc78c7996dec0c63f617ccc49ba97ec77d145eedd7 #+aat.9166428aa8236b03999fcbe9e2f6da9adefa8c4675ddd36f4b7995d6c7bb87f4 #+confz.54cffc17e24f59492eb78f8fb861148dd737735dc81663f8c3cf31c37ee802c1 -#+containers.0598e1266b9ef43e7debabcb7c8ad5fee8215577d622691f32a1a0d7bae516cb +#+containers.2bf28cb069a7e0867bc05e163a3a3175a5afc0ee84b98fec719e8b9ca11ea5a2 #+fileset.a3b5845ff158d4a14da356583bcbbc7de921ea437f40d47d1f91d28549b384c0 #+logincaps.536680c06902322ead7c7241797739c630cb11fb4c62d45c991e9b5fa03666ce #+snaprep.77c41271f852de542d321eb387e5807f47a1c96f4289daaad7866be9721d4a76 -#+curl.5c276fe4d4fab33e3919e64e72f77f497b6f091f3a2fcd3551530b1c85ff7642 -#+git.16860e4191850edbfac3bb52aa30a2a5adac5544394f99c524453a33ea4ed02d -#+xbps.1e2fce2eaace515309960e0f0e4a6586fe12cd32ab8e8ec172a666d2e45a7f1d -#+apk-tools.8155ce27acbce82a7eec29d41aaa6a561136359a2b6ab5f3958ae615bf7edabc -#+getent.fe6cff02ca3d49cd8fdc4dcaa6ab60f50745e25befb3b290c9fd1dec84991f12 -#+getconf.e2bd556d3fcfe6c55c9564bf11196a3b4b493310af402b173da67e26788c1e72 -#+iconv.0d67e9456d04a04ee273169db2e2802f27a9d1d0b582a44bbf24c38f74a2c2e9 +#+curl.f818d3aa11b4e891116df541cd3d47cf92a9042a125c1c4901a8a18e680f4cfa +#+git.9990d1b6a2e0c8af3edbf1de71eb58ac4170eaef1c7a8b26921c06b54a37ac1e +#+xbps.78c26b386597df65c868c0999e9f1eefa56b3614a5759626e8d2fb6d32f93362 +#+apk-tools.391099a02718b7da787c88ffca94989b6cab19f9f96fba339180bd593caeb63c +#+getent.72975138dd291666bbc3d0a0b60f3072f0b925f66ca3ff8fb0e0b8481848827b +#+getconf.103c3820b143fe1b3ba9ef35e6cd8161da49123f4bcc7430ef1fcf8292748dcb +#+iconv.a6e8b2095dfdb66c699638f0365a840ff5dc7abd22e1c0bd184b0c534dafd42e #+libcap.ecad0ebabe3cad4c99717b80b60a24e91970f05a6ed9e37e96f147377522bee3 -#+applyuidgid-caps.be47ec66d7811ebb9ec5aa7383b6a4a76decca3f82d1d1180fd7c59b979173c0 +#+applyuidgid-caps.5686455a4eb04ec1a2bddbefe5fbc02b1c2ee926d76cb5c80f49615ae8fd2d46 #+ccx-utils.a0dd0b66ee77bbde1c20e981ba4ddf14995cacb0b99789c0bf50eb40286a63c6 #+user-env.46ffb119f20a713e192e63c63a0bcc7420343381d756ee6fb5a39d3bbc395414 #+strace.16677554a13d04e241d4be4e16e2d477ebeb3ce6e38be7bde69f6fbeaf09ad79 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.eae5c15c0d13a8047d6fc64c65e61d902195c4487ad848a50cd9f58d7020ab66- \ No newline at end of file +#+linux-qemu-guest.8815d78c8b0fc32feca9bc0942e8aea8d0faed8c263a8907481d36692b330a59+ \ No newline at end of file diff --git a/variants/ccx-x86_64/xbps b/variants/ccx-x86_64/xbps @@ -30,7 +30,7 @@ #+musl-cross-make.4bca2cd43f4a72eaaeefc4befc0b0ce736a5906ec0245552a8db7dc56fa9e5ec #+gnu-make.fb4cff1c46827d02016d0f94d5256a263e7710025f7480fffb7580dc922a6069 #+libarchive.d918c2157861e320a76414146bb3f1332cd71db426cc7f80dd90388de987aed8 -#+libressl.75261ebda8211192bb6b31195a4563e4f5b8a6c9f514746be2c75b8be6a0f184 +#+libressl.bd2415b58d27095d76c9f1670856d7b44f23eb8ecca135c729538f452208d96e #+pkgconf-pkg-config.e727e04fa14db15c16a52d4d389e55602d35b463dfe80b75d5120e383ec17ffb #@untar:-z:sha256:f51d528fa680873914aa8367707726dd777fccc6e5c95cfad90fdb3562375c04:. diff --git a/variants/root-x86_64/apk-tools b/variants/root-x86_64/apk-tools @@ -31,7 +31,7 @@ #+gnu-make.17b0037e8a3f24180cb7bb9ddb488039d540ba905aecca0315de313adfbae81c #+busybox-diffutils.895f7a6bf6d00136038d8bafa91a6fb1e7027ce5a32e1e3b64a9119fe69ef19a #+patch.96351292cca51303a6659875ff00da38adbcc491e1966e0db30cea5469b8c123 -#+libressl.9848b682c418b0fd601a78aeb2727c829570af12c4bdb3f0a1461a48c37a2509 +#+libressl.254ad2e06940ca82a891a4c5c8e4e84cbab28dbb9790e958ade5f3be4d463dc6 #+zstd.b096b77421f338e2452668ae6faa2713158264b0378007a1c772d73ab2aefd52 #+pkgconf-pkg-config.c656966f2889c43d4e39921cc583813e6b7894db3754ea7af30d3361c7c40c63 #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch diff --git a/variants/root-x86_64/applyuidgid-caps b/variants/root-x86_64/applyuidgid-caps @@ -61,11 +61,13 @@ dest=${pthbs_destdir%/}${prefix} cd '.' name='applyuidgid-caps' -CFLAGS="-D_GNU_SOURCE" -LDFLAGS="-lskarnet -lcap" +CFLAGS="-D_GNU_SOURCE $CFLAGS" +LDLIBS="-lskarnet -lcap" build_env_static -gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS +${CC:-gcc} ${CPPFLAGS} ${CFLAGS} \ + -o "$name" "$name.c" \ + ${LDFLAGS} ${LOADLIBES} ${LDLIBS} install -d "$pthbs_destdir/$prefix/command" install -m 755 "$name" "$pthbs_destdir/$prefix/command" diff --git a/variants/root-x86_64/ca-certificates-wip-donotuse b/variants/root-x86_64/ca-certificates-wip-donotuse @@ -27,7 +27,7 @@ #+busybox-util-linux-unpriv.5a286246aa7204f7fa8c9a247f1c93c751979690a65200030f29e255645c1eae #+busybox-findutils.207f73a9f41a8f9e279072e920cbf0c38ba6516734fa3cf2c1faf55565613487 #+nawk.84c186be0a6d09a951a8c6a5377d16b0ba0a9e476e6b554c0c832d6407ebb5b2 -#+certdata2pem.0c99fc1f3e4d1bac10601bc1577baeb1a9ddfa9a43705c9cc4c2916aaa0a381c +#+certdata2pem.4423ad7ee0144fb1201d5abcb688895808cfeb3aff91a45f713011f2c2f8c19b #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:. diff --git a/variants/root-x86_64/certdata2pem b/variants/root-x86_64/certdata2pem @@ -62,7 +62,9 @@ name='certdata2pem' CFLAGS="-D_GNU_SOURCE" build_env_static -gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS +${CC:-gcc} ${CPPFLAGS} ${CFLAGS} \ + -o "$name" "$name.c" \ + ${LDFLAGS} ${LOADLIBES} ${LDLIBS} install -d "$pthbs_destdir/$prefix/command" install -m 755 "$name" "$pthbs_destdir/$prefix/command" diff --git a/variants/root-x86_64/container-bin-image b/variants/root-x86_64/container-bin-image @@ -49,7 +49,7 @@ #+execline.4e773f1ba308227aa5402fd63038f6dcbaf3866ca3fa70555a8bec9b81c8e2d2 #+s6.64db7103e34ea2b2dd5d657ebf1a62bea89d31b2a5df8cd6ef0c140ef574828f #+ccx-utils.03320cb6f512de325611c0af488f96433fb29ca1c4a7c71454da478b48cf607e -#+applyuidgid-caps.2916827d22d53b40674079dd28c0fbd0044fafb7af8cc7db84cd582a1e420dbd +#+applyuidgid-caps.d659b2f3dc98be5e954d7be392ee4f1cb54f6df5f701b8bce83904047c100318 #+easyseccomp.14113f820fb502f0771b760e125e5a222b19d76413a9cd99c1f6569281bbdb98 #+mlog.f63e3f9617bf9711d5569d7215cc91aececf0bbcd3ac887e2351b2f501d890c5 #+abduco.29d2355de545dae9b8a739f668de35a5b1aa80b8df3895243d5da4e98155981c diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers @@ -31,9 +31,9 @@ #+pthbs-banginstall.c568b82ef8544f41d05a56244bb32a93e2f5edd433293243a7037e36f2aa5155 #+execline.4e773f1ba308227aa5402fd63038f6dcbaf3866ca3fa70555a8bec9b81c8e2d2 #+alpine-keys.28471830774daf16fabe3b35657f73e2ae25c8bf137fa1f0dfa70f3fd5f31ae1 -#+apk-tools.bbc7958b38c0626dfcf81bfcb4f965d947cf63c3adb44292b4fe455e5f615c19 -#+xbps.54db99afb1be4f67d6757cb08e9f69feeec8e7fd5b691b92abd9206844bb71aa -#+container-bin-image.907b8ae505a68f744a186000f2736a1e095446c927904fd5ab3644da7eeaf160 +#+apk-tools.6fd0a18cfc9392a693775fbc2f0c18a8b18735ecdd04ae81a52f9dad0949eb84 +#+xbps.3971c316db28b21ccf1e6bfa1b5df8a24b30f623e24333d7144c35e970a4ad14 +#+container-bin-image.452672a6c0ec6cec95a8d20427aebde70a5a48a4609b1bbe13e803a81270ff10 #@git:68a211c657547b3f5c9d3dfecb2f6d51872bb8d2:containers @@ -76,8 +76,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.bbc7958b38c0626dfcf81bfcb4f965d947cf63c3adb44292b4fe455e5f615c19/command/apk.static' "${dest}/deps/command/" -ln -sf '/versions/xbps.54db99afb1be4f67d6757cb08e9f69feeec8e7fd5b691b92abd9206844bb71aa/command/xbps-install.static' "${dest}/deps/command/" +ln -sf '/versions/apk-tools.6fd0a18cfc9392a693775fbc2f0c18a8b18735ecdd04ae81a52f9dad0949eb84/command/apk.static' "${dest}/deps/command/" +ln -sf '/versions/xbps.3971c316db28b21ccf1e6bfa1b5df8a24b30f623e24333d7144c35e970a4ad14/command/xbps-install.static' "${dest}/deps/command/" for f in '/versions/alpine-keys.28471830774daf16fabe3b35657f73e2ae25c8bf137fa1f0dfa70f3fd5f31ae1'/keys/alpine/*/*; do test -f "$f" @@ -87,13 +87,13 @@ for f in '/versions/alpine-keys.28471830774daf16fabe3b35657f73e2ae25c8bf137fa1f0 done mkdir -p "${dest}/deps/keys/void" -for f in '/versions/xbps.54db99afb1be4f67d6757cb08e9f69feeec8e7fd5b691b92abd9206844bb71aa'/keys/void/*; do +for f in '/versions/xbps.3971c316db28b21ccf1e6bfa1b5df8a24b30f623e24333d7144c35e970a4ad14'/keys/void/*; do ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/versions/container-bin-image.907b8ae505a68f744a186000f2736a1e095446c927904fd5ab3644da7eeaf160/container-bin-image' -test -f '/versions/container-bin-image.907b8ae505a68f744a186000f2736a1e095446c927904fd5ab3644da7eeaf160/container-bin-image/if' -ln -sf '/versions/container-bin-image.907b8ae505a68f744a186000f2736a1e095446c927904fd5ab3644da7eeaf160/container-bin-image' "${dest}/deps/" +test -d '/versions/container-bin-image.452672a6c0ec6cec95a8d20427aebde70a5a48a4609b1bbe13e803a81270ff10/container-bin-image' +test -f '/versions/container-bin-image.452672a6c0ec6cec95a8d20427aebde70a5a48a4609b1bbe13e803a81270ff10/container-bin-image/if' +ln -sf '/versions/container-bin-image.452672a6c0ec6cec95a8d20427aebde70a5a48a4609b1bbe13e803a81270ff10/container-bin-image' "${dest}/deps/" diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment @@ -50,12 +50,12 @@ #+s6-linux-utils.34bdcec91aae280416c16a52959e513382aeb67ffd9f68bcdec6f5967434b445 #+zsh.355a949de332be38ccdfad4e0d3e4a3d60d4b2f3ee257698a87f25ce811c2008 #+confz.5dfd584a711633259aecac13da60d50f455c7716916c74e04ded1457ae04a071 -#+containers.2686ccca4e98fdef5f04fa8fab7773de3e9b19edec70d88d9590aa5744ca3e91 -#+xbps.54db99afb1be4f67d6757cb08e9f69feeec8e7fd5b691b92abd9206844bb71aa +#+containers.32e407241677450bd719888af0be85c4d1cd3ef67a03e23034bc42ef52d8d944 +#+xbps.3971c316db28b21ccf1e6bfa1b5df8a24b30f623e24333d7144c35e970a4ad14 #+zstd.b096b77421f338e2452668ae6faa2713158264b0378007a1c772d73ab2aefd52 -#+apk-tools.bbc7958b38c0626dfcf81bfcb4f965d947cf63c3adb44292b4fe455e5f615c19 +#+apk-tools.6fd0a18cfc9392a693775fbc2f0c18a8b18735ecdd04ae81a52f9dad0949eb84 #+alpine-keys.28471830774daf16fabe3b35657f73e2ae25c8bf137fa1f0dfa70f3fd5f31ae1 -#+getent.20fb90694a2718bfd2c26942a1fbae3d6e61aaa49cebf1a83cec27775dc9c334 +#+getent.ccddb98254f2f18a8e0e7e787d9316d22f61824fafb395264c4e7a8bbe0b4b5d #+fileset.2156fb8cabd628b062bc9fcc2f673d772a25574dfe5c2c2b779ada64fe9d9d08 #+ccx-utils.03320cb6f512de325611c0af488f96433fb29ca1c4a7c71454da478b48cf607e #+easyseccomp.14113f820fb502f0771b760e125e5a222b19d76413a9cd99c1f6569281bbdb98 diff --git a/variants/root-x86_64/curl b/variants/root-x86_64/curl @@ -31,7 +31,7 @@ #+musl-cross-make.19d51dec5328ccacd41d47d7f24e33bac084aebefb839cb3fecb6573577b831a #+gnu-make.17b0037e8a3f24180cb7bb9ddb488039d540ba905aecca0315de313adfbae81c #+m4.615d99c28c6a4c9a2fab9b75c3ae68b6adf51a7afc4b03482077a284888aedb4 -#+libressl.9848b682c418b0fd601a78aeb2727c829570af12c4bdb3f0a1461a48c37a2509 +#+libressl.254ad2e06940ca82a891a4c5c8e4e84cbab28dbb9790e958ade5f3be4d463dc6 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:. diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -50,7 +50,7 @@ #+patch.96351292cca51303a6659875ff00da38adbcc491e1966e0db30cea5469b8c123 #+flex.06df30c870e62ce8f95024e74ad8d03b7f1d675d3501563cd55f16409d438b4a #+bison.183ae03f9de10534e919d4bd2bef1fa782b047f671fea90044796180284d38a7 -#+rsync.3c837c4cf6ba439fd2d6573685a49e14b279594e5f6a23fef7eff880948b764b +#+rsync.0862e31de38b4a570ee619a737c7cd3f382d195dcfeee77fab3c00386fd8609b #+execline.4e773f1ba308227aa5402fd63038f6dcbaf3866ca3fa70555a8bec9b81c8e2d2 #+s6.64db7103e34ea2b2dd5d657ebf1a62bea89d31b2a5df8cd6ef0c140ef574828f #+s6-rc.e09e2d9c42a1bbc18b406ff114d945db0d3187fd09b703ddd7c28a4d64357ad3 @@ -59,25 +59,25 @@ #+s6-linux-init.de74cb1d43a63d9c9e4e2a44ee5a7f9a50deab7776bd2b2bd0c3d67cb44f01c3 #+mdevd.3ba58bb7f820dbc30d791987f1034862f021d75dd171e9a8e93e8abc81575bf5 #+s6-dns.2c28f16b8811e7e067366e02bdb492346e4f2f3d4c63ee0cf07fceb0ed1c6472 -#+libressl.9848b682c418b0fd601a78aeb2727c829570af12c4bdb3f0a1461a48c37a2509 -#+s6-networking.f2c2fc8a514ac46bc024a01470cf600a8f171ea411a5c3c3c9551c6e0e626bb2 +#+libressl.254ad2e06940ca82a891a4c5c8e4e84cbab28dbb9790e958ade5f3be4d463dc6 +#+s6-networking.a7beb6bc1832b1111ceee65d4cf2826c419628188aeac097926be9edbdc008ca #+zsh.355a949de332be38ccdfad4e0d3e4a3d60d4b2f3ee257698a87f25ce811c2008 #+pthbs-banginstall.c568b82ef8544f41d05a56244bb32a93e2f5edd433293243a7037e36f2aa5155 #+aat.b2df2bfbff48087d5ef34ef39f712038b0d35c0112f04003b12510555fc3a1f2 #+confz.5dfd584a711633259aecac13da60d50f455c7716916c74e04ded1457ae04a071 -#+containers.2686ccca4e98fdef5f04fa8fab7773de3e9b19edec70d88d9590aa5744ca3e91 +#+containers.32e407241677450bd719888af0be85c4d1cd3ef67a03e23034bc42ef52d8d944 #+fileset.2156fb8cabd628b062bc9fcc2f673d772a25574dfe5c2c2b779ada64fe9d9d08 #+logincaps.8eecccc5adf986da642a0e803f9dd0c71311059104c342f8f5d6d99223d793ec #+snaprep.9367398cdf89d51bfb5e6c8cb7ec368b8fa8f18b05c4926b7249f28703977504 -#+curl.de666e9e011223f6dbbf0232f52d0e43778c128b6c04e0add9b33602435ea7bb -#+git.2a486b7472935ff9e977ddeb1e6cb7209259cf2f8b67cfe1aacde4e9dd4fde29 -#+xbps.54db99afb1be4f67d6757cb08e9f69feeec8e7fd5b691b92abd9206844bb71aa -#+apk-tools.bbc7958b38c0626dfcf81bfcb4f965d947cf63c3adb44292b4fe455e5f615c19 -#+getent.20fb90694a2718bfd2c26942a1fbae3d6e61aaa49cebf1a83cec27775dc9c334 -#+getconf.785d49fa007378b5045f71b81eac91e28697344c0b7643ee6016ee3e60da0a4d -#+iconv.49647ce39c09f8ece8c52eac0d8ae54d752c822ae6cd83b9e53aabe2c3e6a580 +#+curl.43b1d313241d4cd3308bf89dd3d2b11b00efd059c778d5c2bc3ade745b2c81e3 +#+git.7d6c91254a7981e6a9c7df59829e8eeaff943095e0288cd7ca4a78a1c1160b89 +#+xbps.3971c316db28b21ccf1e6bfa1b5df8a24b30f623e24333d7144c35e970a4ad14 +#+apk-tools.6fd0a18cfc9392a693775fbc2f0c18a8b18735ecdd04ae81a52f9dad0949eb84 +#+getent.ccddb98254f2f18a8e0e7e787d9316d22f61824fafb395264c4e7a8bbe0b4b5d +#+getconf.389beb94b7d7302b1512629a3a0a728627efa094ac6376c9cad06ea7c4405ef7 +#+iconv.b4fa4bdc1127bb4c7b13bc004e40e10c655a112f2e815c981e65e27bba072768 #+libcap.8eb713ba6242a6553f60222291d08461b1d83b63aa1aee69e69e7551e45b06cd -#+applyuidgid-caps.2916827d22d53b40674079dd28c0fbd0044fafb7af8cc7db84cd582a1e420dbd +#+applyuidgid-caps.d659b2f3dc98be5e954d7be392ee4f1cb54f6df5f701b8bce83904047c100318 #+ccx-utils.03320cb6f512de325611c0af488f96433fb29ca1c4a7c71454da478b48cf607e #+user-env.2653c8a3c2d92c1f44d82abeb9f6bfe7f5247a4bc6d222ed5feed5940cfd0816 #+strace.e8385cd2fa0e911b5d50599e5868c5a87acc53d169abe64916cf16471220d182 @@ -88,9 +88,9 @@ #+squashfs-tools.1b91e9f3f87cc15a2eb60ab5b95325158a49b03c20c1262801491563d93311c6 #+mandoc.24165da5b9553ff75b2b70a43d8e584d7f71ab38aa329769e7425e57790e5712 #+tinyssh.b86b96a90e668bd3500db7bac7652e8654ec0dafd0b6c9486a02682cd31f515a -#+system-config.8737c45209497c38797b425c36c03656771ca1cb5a0b95c2689dc4604a8b70a9 -#+system-config-rc.421e391717b1f080dbccee0ddfc4c56859eaf4d68e2db93fd93391de25217b39 +#+system-config.e18a6f4ba2c562713c962ebdc2247c7370d63c8ff2e199fb1298dfaab3c210c5 +#+system-config-rc.485c081af1765ba2bf327ddaa42edc5e3fd51498d2c10f2e4a4ca9f682b3f8c0 #+system-config-scripts.bfe6189587fc33d037051c22a904d60dab3f025f4d33de17745f1ea1ecc919bc -#+system-config-init.0cfce24d4cc9b31192fdfbfb8efb1d5a75305b95242a40103ec98e2b60a137fb +#+system-config-init.1e352382e85a0f59c6dac4330e3f36f28015d6621b32be762521330d5935e55e #+system-config-zsh.f00ec445d6e46a6d06e6d33b32483662b1574b30616960465e4b3d0325d53668 #+busybox-modutils.4aef0ae5907514beeff60f30370a78d0e294055c92d2409920150a5ebeedca2a \ No newline at end of file diff --git a/variants/root-x86_64/getconf b/variants/root-x86_64/getconf @@ -61,7 +61,9 @@ name='getconf' build_env_static -gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS +${CC:-gcc} ${CPPFLAGS} ${CFLAGS} \ + -o "$name" "$name.c" \ + ${LDFLAGS} ${LOADLIBES} ${LDLIBS} install -d "$pthbs_destdir/$prefix/command" install -m 755 "$name" "$pthbs_destdir/$prefix/command" diff --git a/variants/root-x86_64/getent b/variants/root-x86_64/getent @@ -61,7 +61,9 @@ name='getent' build_env_static -gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS +${CC:-gcc} ${CPPFLAGS} ${CFLAGS} \ + -o "$name" "$name.c" \ + ${LDFLAGS} ${LOADLIBES} ${LDLIBS} install -d "$pthbs_destdir/$prefix/command" install -m 755 "$name" "$pthbs_destdir/$prefix/command" diff --git a/variants/root-x86_64/git b/variants/root-x86_64/git @@ -31,8 +31,8 @@ #+gnu-make.17b0037e8a3f24180cb7bb9ddb488039d540ba905aecca0315de313adfbae81c #+busybox-diffutils.895f7a6bf6d00136038d8bafa91a6fb1e7027ce5a32e1e3b64a9119fe69ef19a #+m4.615d99c28c6a4c9a2fab9b75c3ae68b6adf51a7afc4b03482077a284888aedb4 -#+libressl.9848b682c418b0fd601a78aeb2727c829570af12c4bdb3f0a1461a48c37a2509 -#+curl.de666e9e011223f6dbbf0232f52d0e43778c128b6c04e0add9b33602435ea7bb +#+libressl.254ad2e06940ca82a891a4c5c8e4e84cbab28dbb9790e958ade5f3be4d463dc6 +#+curl.43b1d313241d4cd3308bf89dd3d2b11b00efd059c778d5c2bc3ade745b2c81e3 #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:. diff --git a/variants/root-x86_64/iconv b/variants/root-x86_64/iconv @@ -61,7 +61,9 @@ name='iconv' build_env_static -gcc ${CFLAGS} -o "$name" "$name.c" $LDFLAGS +${CC:-gcc} ${CPPFLAGS} ${CFLAGS} \ + -o "$name" "$name.c" \ + ${LDFLAGS} ${LOADLIBES} ${LDLIBS} install -d "$pthbs_destdir/$prefix/command" install -m 755 "$name" "$pthbs_destdir/$prefix/command" diff --git a/variants/root-x86_64/libressl b/variants/root-x86_64/libressl @@ -31,7 +31,7 @@ #+musl-cross-make.19d51dec5328ccacd41d47d7f24e33bac084aebefb839cb3fecb6573577b831a #+gnu-make.17b0037e8a3f24180cb7bb9ddb488039d540ba905aecca0315de313adfbae81c #+m4.615d99c28c6a4c9a2fab9b75c3ae68b6adf51a7afc4b03482077a284888aedb4 -#+ca-certificates-wip-donotuse.97f83417a980f6a8129544d87ec407faf49c164a2e01b7dce50167a00767a402 +#+ca-certificates-wip-donotuse.56db642192465a159d88d99f840317e6534744c1ec999886eb8c50d26c4c83b6 #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:. @@ -99,7 +99,7 @@ make DESTDIR="$pthbs_destdir" install cd .. gcc ./c_rehash.c -o c_rehash --static -static -I"$pthbs_destdir/$prefix/include" -L"$pthbs_destdir/$prefix/library" -lssl -lcrypto -cp -vs '/versions/ca-certificates-wip-donotuse.97f83417a980f6a8129544d87ec407faf49c164a2e01b7dce50167a00767a402/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/" +cp -vs '/versions/ca-certificates-wip-donotuse.56db642192465a159d88d99f840317e6534744c1ec999886eb8c50d26c4c83b6/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/" ./c_rehash "$pthbs_destdir/$prefix/config/ssl/certs/" cd "$pthbs_destdir/$prefix/config/ssl/" mv cert.pem libressl-cert.pem diff --git a/variants/root-x86_64/linux-qemu-guest b/variants/root-x86_64/linux-qemu-guest @@ -34,7 +34,7 @@ #+patch.96351292cca51303a6659875ff00da38adbcc491e1966e0db30cea5469b8c123 #+flex.06df30c870e62ce8f95024e74ad8d03b7f1d675d3501563cd55f16409d438b4a #+bison.183ae03f9de10534e919d4bd2bef1fa782b047f671fea90044796180284d38a7 -#+rsync.3c837c4cf6ba439fd2d6573685a49e14b279594e5f6a23fef7eff880948b764b +#+rsync.0862e31de38b4a570ee619a737c7cd3f382d195dcfeee77fab3c00386fd8609b #+zstd.b096b77421f338e2452668ae6faa2713158264b0378007a1c772d73ab2aefd52 #+libelf.1bbdc5c3515c79e7805fee1627da1b6f31b95539e6ef2c7546e9647631dad29e #+pkgconf-pkg-config.c656966f2889c43d4e39921cc583813e6b7894db3754ea7af30d3361c7c40c63 diff --git a/variants/root-x86_64/ocaml-astring b/variants/root-x86_64/ocaml-astring @@ -32,8 +32,8 @@ #+ocaml.5d68a619356fa3da8a61022cde7b7b58e6d4e05bd0cad320650fe78e2359e764 #+ocaml-findlib.119645cc19ad20e25ac8fff6531d6bd3b5d0c90dcf5a2ea2369d935467241e09 #+ocamlbuild.30e4bfbe643190132b01f96703607ced88d89cdee689d27ad26257d0d3757a6d -#+opam.72de4480def84dea000e198b2c9bd86e5e149ec5e6c3e2ce8e3f0fa5016b30ec -#+ocaml-topkg.44f5a2cd081ead7dfefb1fa43dfe2b57b140e390be33a63431ab830ac80ec5c7 +#+opam.70f3a1027e3c3c4255aa047339538305bb651f229e25a10e79c236d79eaa2073 +#+ocaml-topkg.47ec48d069bbb09724d00eeefee9f38df96c966fc2138a03393eb24fb2a6b36b #@untar:-j:sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa:. diff --git a/variants/root-x86_64/ocaml-bos b/variants/root-x86_64/ocaml-bos @@ -32,14 +32,14 @@ #+ocaml.5d68a619356fa3da8a61022cde7b7b58e6d4e05bd0cad320650fe78e2359e764 #+ocaml-findlib.119645cc19ad20e25ac8fff6531d6bd3b5d0c90dcf5a2ea2369d935467241e09 #+ocamlbuild.30e4bfbe643190132b01f96703607ced88d89cdee689d27ad26257d0d3757a6d -#+opam.72de4480def84dea000e198b2c9bd86e5e149ec5e6c3e2ce8e3f0fa5016b30ec -#+ocaml-topkg.44f5a2cd081ead7dfefb1fa43dfe2b57b140e390be33a63431ab830ac80ec5c7 -#+ocaml-astring.9d55f85df2d555971830e0be7f43f7b8798d5934e71c2b0d32f1feaf6ba079d2 -#+ocaml-fpath.dfcd8e659671f4e47b7fa47280d69450d6565b115a173bb8ba55ba81a23ed2b2 -#+ocaml-rresult.9050dc898eb19d7f17aa1ef5cc97acac6a2355659655f223a3c3d60478f9898f -#+ocaml-fmt.527245ac343e303fbcfb8a4e91471d7167ed0cb3559b14a2a42a3cbb04122028 -#+ocaml-logs.be1d9613f9ff1eef50db1ef622a84a4693802e1700fe0f8a59447bc7f84400d6 -#+ocaml-mtime.2dfa2ba583050da327d19d957ab0df6339a9d8cf9dd583e354a5a48dd55ffb4e +#+opam.70f3a1027e3c3c4255aa047339538305bb651f229e25a10e79c236d79eaa2073 +#+ocaml-topkg.47ec48d069bbb09724d00eeefee9f38df96c966fc2138a03393eb24fb2a6b36b +#+ocaml-astring.a4728143e319d9b9b8957cf07eb911a02ab311ce13a946a5bc133ef339f71665 +#+ocaml-fpath.67a597daf5fd5e6cf802756ff5dc559b2cfba74e71f47af06ef1b155bcabc6db +#+ocaml-rresult.78b43db9f1775e583ee51326d04037a0cb11612c39421f53f390d8a675ff4a1d +#+ocaml-fmt.8c535292c39a3df0a1d004ba643cc1567f7d1bcf4125a55303c13194285fcce9 +#+ocaml-logs.fbc2cfc8f44f0d86d8726918305faf1ffb164ec1bb7564a932e028d08b7c4fa6 +#+ocaml-mtime.be93b9acdc6b6f7900f9a62a0707d53771e2e19e8f5cb6fa856fd5e7db7ae002 #@untar:-j:sha256:d8d62e786b10d697e0457205a8eedeaa27ebcc90f1855f18df190cac2e3d8f37:. diff --git a/variants/root-x86_64/ocaml-cmdliner b/variants/root-x86_64/ocaml-cmdliner @@ -32,8 +32,8 @@ #+ocaml.5d68a619356fa3da8a61022cde7b7b58e6d4e05bd0cad320650fe78e2359e764 #+ocaml-findlib.119645cc19ad20e25ac8fff6531d6bd3b5d0c90dcf5a2ea2369d935467241e09 #+ocamlbuild.30e4bfbe643190132b01f96703607ced88d89cdee689d27ad26257d0d3757a6d -#+opam.72de4480def84dea000e198b2c9bd86e5e149ec5e6c3e2ce8e3f0fa5016b30ec -#+ocaml-topkg.44f5a2cd081ead7dfefb1fa43dfe2b57b140e390be33a63431ab830ac80ec5c7 +#+opam.70f3a1027e3c3c4255aa047339538305bb651f229e25a10e79c236d79eaa2073 +#+ocaml-topkg.47ec48d069bbb09724d00eeefee9f38df96c966fc2138a03393eb24fb2a6b36b #@untar:-j:sha256:4e547a631c36fbaadff60d3bd7724eb3f83ba274e92fb725950bae7868378582:. diff --git a/variants/root-x86_64/ocaml-fmt b/variants/root-x86_64/ocaml-fmt @@ -32,9 +32,9 @@ #+ocaml.5d68a619356fa3da8a61022cde7b7b58e6d4e05bd0cad320650fe78e2359e764 #+ocaml-findlib.119645cc19ad20e25ac8fff6531d6bd3b5d0c90dcf5a2ea2369d935467241e09 #+ocamlbuild.30e4bfbe643190132b01f96703607ced88d89cdee689d27ad26257d0d3757a6d -#+opam.72de4480def84dea000e198b2c9bd86e5e149ec5e6c3e2ce8e3f0fa5016b30ec -#+ocaml-topkg.44f5a2cd081ead7dfefb1fa43dfe2b57b140e390be33a63431ab830ac80ec5c7 -#+ocaml-cmdliner.dba6b208b0e5a5274c076fd692d0e92132cf95ba82bc12b3fc927a3a27ac8ed2 +#+opam.70f3a1027e3c3c4255aa047339538305bb651f229e25a10e79c236d79eaa2073 +#+ocaml-topkg.47ec48d069bbb09724d00eeefee9f38df96c966fc2138a03393eb24fb2a6b36b +#+ocaml-cmdliner.9f52c4b43ca1f4c1a97dc36b105ac35b8256195d35d1df4f7ed73f55eaa212df #@untar:-j:sha256:857cfd47a54b52429cd9b3e2665e44173cd1bd3b435bece7172f984ad5376a1b:. diff --git a/variants/root-x86_64/ocaml-fpath b/variants/root-x86_64/ocaml-fpath @@ -32,9 +32,9 @@ #+ocaml.5d68a619356fa3da8a61022cde7b7b58e6d4e05bd0cad320650fe78e2359e764 #+ocaml-findlib.119645cc19ad20e25ac8fff6531d6bd3b5d0c90dcf5a2ea2369d935467241e09 #+ocamlbuild.30e4bfbe643190132b01f96703607ced88d89cdee689d27ad26257d0d3757a6d -#+opam.72de4480def84dea000e198b2c9bd86e5e149ec5e6c3e2ce8e3f0fa5016b30ec -#+ocaml-topkg.44f5a2cd081ead7dfefb1fa43dfe2b57b140e390be33a63431ab830ac80ec5c7 -#+ocaml-astring.9d55f85df2d555971830e0be7f43f7b8798d5934e71c2b0d32f1feaf6ba079d2 +#+opam.70f3a1027e3c3c4255aa047339538305bb651f229e25a10e79c236d79eaa2073 +#+ocaml-topkg.47ec48d069bbb09724d00eeefee9f38df96c966fc2138a03393eb24fb2a6b36b +#+ocaml-astring.a4728143e319d9b9b8957cf07eb911a02ab311ce13a946a5bc133ef339f71665 #@untar:-j:sha256:12b08ff192d037d9b6d69e9ca19d1d385184f20b3237c27231e437ac81ace70f:. diff --git a/variants/root-x86_64/ocaml-logs b/variants/root-x86_64/ocaml-logs @@ -32,11 +32,11 @@ #+ocaml.5d68a619356fa3da8a61022cde7b7b58e6d4e05bd0cad320650fe78e2359e764 #+ocaml-findlib.119645cc19ad20e25ac8fff6531d6bd3b5d0c90dcf5a2ea2369d935467241e09 #+ocamlbuild.30e4bfbe643190132b01f96703607ced88d89cdee689d27ad26257d0d3757a6d -#+opam.72de4480def84dea000e198b2c9bd86e5e149ec5e6c3e2ce8e3f0fa5016b30ec -#+ocaml-topkg.44f5a2cd081ead7dfefb1fa43dfe2b57b140e390be33a63431ab830ac80ec5c7 -#+ocaml-mtime.2dfa2ba583050da327d19d957ab0df6339a9d8cf9dd583e354a5a48dd55ffb4e -#+ocaml-cmdliner.dba6b208b0e5a5274c076fd692d0e92132cf95ba82bc12b3fc927a3a27ac8ed2 -#+ocaml-fmt.527245ac343e303fbcfb8a4e91471d7167ed0cb3559b14a2a42a3cbb04122028 +#+opam.70f3a1027e3c3c4255aa047339538305bb651f229e25a10e79c236d79eaa2073 +#+ocaml-topkg.47ec48d069bbb09724d00eeefee9f38df96c966fc2138a03393eb24fb2a6b36b +#+ocaml-mtime.be93b9acdc6b6f7900f9a62a0707d53771e2e19e8f5cb6fa856fd5e7db7ae002 +#+ocaml-cmdliner.9f52c4b43ca1f4c1a97dc36b105ac35b8256195d35d1df4f7ed73f55eaa212df +#+ocaml-fmt.8c535292c39a3df0a1d004ba643cc1567f7d1bcf4125a55303c13194285fcce9 #@untar:-j:sha256:ee97065ba41ce28f19dea9453c6bec4e0ef26165ad7394c4131ea0c65c0f06d5:. diff --git a/variants/root-x86_64/ocaml-mtime b/variants/root-x86_64/ocaml-mtime @@ -32,8 +32,8 @@ #+ocaml.5d68a619356fa3da8a61022cde7b7b58e6d4e05bd0cad320650fe78e2359e764 #+ocaml-findlib.119645cc19ad20e25ac8fff6531d6bd3b5d0c90dcf5a2ea2369d935467241e09 #+ocamlbuild.30e4bfbe643190132b01f96703607ced88d89cdee689d27ad26257d0d3757a6d -#+opam.72de4480def84dea000e198b2c9bd86e5e149ec5e6c3e2ce8e3f0fa5016b30ec -#+ocaml-topkg.44f5a2cd081ead7dfefb1fa43dfe2b57b140e390be33a63431ab830ac80ec5c7 +#+opam.70f3a1027e3c3c4255aa047339538305bb651f229e25a10e79c236d79eaa2073 +#+ocaml-topkg.47ec48d069bbb09724d00eeefee9f38df96c966fc2138a03393eb24fb2a6b36b #@untar:-j:sha256:097cb2802e3701ead9572e1b483d5a28c6e2f0a39449faaf9b44ad8a89834d88:. diff --git a/variants/root-x86_64/ocaml-rresult b/variants/root-x86_64/ocaml-rresult @@ -32,8 +32,8 @@ #+ocaml.5d68a619356fa3da8a61022cde7b7b58e6d4e05bd0cad320650fe78e2359e764 #+ocaml-findlib.119645cc19ad20e25ac8fff6531d6bd3b5d0c90dcf5a2ea2369d935467241e09 #+ocamlbuild.30e4bfbe643190132b01f96703607ced88d89cdee689d27ad26257d0d3757a6d -#+opam.72de4480def84dea000e198b2c9bd86e5e149ec5e6c3e2ce8e3f0fa5016b30ec -#+ocaml-topkg.44f5a2cd081ead7dfefb1fa43dfe2b57b140e390be33a63431ab830ac80ec5c7 +#+opam.70f3a1027e3c3c4255aa047339538305bb651f229e25a10e79c236d79eaa2073 +#+ocaml-topkg.47ec48d069bbb09724d00eeefee9f38df96c966fc2138a03393eb24fb2a6b36b #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:. diff --git a/variants/root-x86_64/ocaml-topkg b/variants/root-x86_64/ocaml-topkg @@ -32,7 +32,7 @@ #+ocaml.5d68a619356fa3da8a61022cde7b7b58e6d4e05bd0cad320650fe78e2359e764 #+ocaml-findlib.119645cc19ad20e25ac8fff6531d6bd3b5d0c90dcf5a2ea2369d935467241e09 #+ocamlbuild.30e4bfbe643190132b01f96703607ced88d89cdee689d27ad26257d0d3757a6d -#+opam.72de4480def84dea000e198b2c9bd86e5e149ec5e6c3e2ce8e3f0fa5016b30ec +#+opam.70f3a1027e3c3c4255aa047339538305bb651f229e25a10e79c236d79eaa2073 #@untar:-j:sha256:452082626e651ac4b1633c2b4ae4cad7abeb1fb6a13046e699f95eec58b5d1c7:. diff --git a/variants/root-x86_64/ocaml.environment b/variants/root-x86_64/ocaml.environment @@ -3,7 +3,7 @@ #+dune.bdbad0945fefe62e7931a5893921985b9d646d47879854db04bd18b4afd912dc #+ocamlbuild.30e4bfbe643190132b01f96703607ced88d89cdee689d27ad26257d0d3757a6d #+ocaml-base.d41af1000bd81e60d4cf15770c369b6fd750a02f525f96a98f1147f9f5a32ba4 -#+opam.72de4480def84dea000e198b2c9bd86e5e149ec5e6c3e2ce8e3f0fa5016b30ec -#+ocaml-bos.25c7357a3fe55831eb00cd0bee87f78c959aef79600c5a76846612731236ab0f +#+opam.70f3a1027e3c3c4255aa047339538305bb651f229e25a10e79c236d79eaa2073 +#+ocaml-bos.4f49179a6d0ba62161f7918782e898dcc49cbf3ef626c352731cc558777d7564 #+ocaml-lun.558d827941b44bbf22131e6e9e90fd9ee4fbb901cb7c36c06e286b041fe9b56e #+ocaml-ppx_deriving.9076e57e5bf6b6845d553c6b5412c7f1de802c88e5222bea4ec6615d44d0ec6d \ No newline at end of file diff --git a/variants/root-x86_64/opam b/variants/root-x86_64/opam @@ -31,7 +31,7 @@ #+patch.96351292cca51303a6659875ff00da38adbcc491e1966e0db30cea5469b8c123 #+gnu-make.17b0037e8a3f24180cb7bb9ddb488039d540ba905aecca0315de313adfbae81c #+musl-cross-make.19d51dec5328ccacd41d47d7f24e33bac084aebefb839cb3fecb6573577b831a -#+getconf.785d49fa007378b5045f71b81eac91e28697344c0b7643ee6016ee3e60da0a4d +#+getconf.389beb94b7d7302b1512629a3a0a728627efa094ac6376c9cad06ea7c4405ef7 #+ocaml.5d68a619356fa3da8a61022cde7b7b58e6d4e05bd0cad320650fe78e2359e764 #+dune.bdbad0945fefe62e7931a5893921985b9d646d47879854db04bd18b4afd912dc #@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:. diff --git a/variants/root-x86_64/rsync b/variants/root-x86_64/rsync @@ -32,7 +32,7 @@ #+m4.615d99c28c6a4c9a2fab9b75c3ae68b6adf51a7afc4b03482077a284888aedb4 #+nawk.84c186be0a6d09a951a8c6a5377d16b0ba0a9e476e6b554c0c832d6407ebb5b2 #+popt.4b59d29a1509bac35b805e598b3d13cd98a32802ae43cdc5c393f641153084a7 -#+libressl.9848b682c418b0fd601a78aeb2727c829570af12c4bdb3f0a1461a48c37a2509 +#+libressl.254ad2e06940ca82a891a4c5c8e4e84cbab28dbb9790e958ade5f3be4d463dc6 #+zstd.b096b77421f338e2452668ae6faa2713158264b0378007a1c772d73ab2aefd52 #+acl.c501fa261f6eec6ecb2f70fe13902de0c9713b8631ee3cfc361978c49d7ef182 #+attr.aa7e191682863292efbc8277085bc75cf04d20a95afcba81ddcaa416b77cb52c diff --git a/variants/root-x86_64/s6-networking b/variants/root-x86_64/s6-networking @@ -33,7 +33,7 @@ #+execline.4e773f1ba308227aa5402fd63038f6dcbaf3866ca3fa70555a8bec9b81c8e2d2 #+s6.64db7103e34ea2b2dd5d657ebf1a62bea89d31b2a5df8cd6ef0c140ef574828f #+s6-dns.2c28f16b8811e7e067366e02bdb492346e4f2f3d4c63ee0cf07fceb0ed1c6472 -#+libressl.9848b682c418b0fd601a78aeb2727c829570af12c4bdb3f0a1461a48c37a2509 +#+libressl.254ad2e06940ca82a891a4c5c8e4e84cbab28dbb9790e958ade5f3be4d463dc6 #@git:a21a4975ce06f06e4f26d73f27d3b22ee3a9da1e:s6-networking diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config @@ -49,7 +49,7 @@ #+gnu-make.17b0037e8a3f24180cb7bb9ddb488039d540ba905aecca0315de313adfbae81c #+aat.b2df2bfbff48087d5ef34ef39f712038b0d35c0112f04003b12510555fc3a1f2 #+fileset.2156fb8cabd628b062bc9fcc2f673d772a25574dfe5c2c2b779ada64fe9d9d08 -#+rsync.3c837c4cf6ba439fd2d6573685a49e14b279594e5f6a23fef7eff880948b764b +#+rsync.0862e31de38b4a570ee619a737c7cd3f382d195dcfeee77fab3c00386fd8609b #+execline.4e773f1ba308227aa5402fd63038f6dcbaf3866ca3fa70555a8bec9b81c8e2d2 #+kbd.8335c364d0912b8b2b25dbf85fa2bd61713505eaf91487dfc178b5eff18fcc6d #+mdevd.3ba58bb7f820dbc30d791987f1034862f021d75dd171e9a8e93e8abc81575bf5 @@ -97,7 +97,7 @@ printf '%s\n' >config/etc/skel/loginexec \ chmod +x config/etc/skel/loginexec env 'pthbs_path_system-config'="$prefix" \ - 'pthbs_path_containers=/versions/env.823bb53941d6e1e2e6f370cd9865f78fc033d5a34227b8307ac33e95edcdd37d' \ + 'pthbs_path_containers=/versions/env.bd8dfc69d1937a3ac11c421b107641e110bd0fb56c33ed7d62fd7b553069b5ec' \ 'pthbs_path_mdevd=/versions/env.b72996087d5776ae6cc04527da2721badc870ebacff57bafde63913d7bcfad2a' \ make -j${JOBS:-1} -l$((1+${JOBS:-1})) all diff --git a/variants/root-x86_64/system-config-init b/variants/root-x86_64/system-config-init @@ -50,7 +50,7 @@ #+s6-portable-utils.215fcbacf399929de5124e7f2b5d6ca4549007ccd2319a874170887bedca9a08 #+s6-linux-init.de74cb1d43a63d9c9e4e2a44ee5a7f9a50deab7776bd2b2bd0c3d67cb44f01c3 #+execline.4e773f1ba308227aa5402fd63038f6dcbaf3866ca3fa70555a8bec9b81c8e2d2 -#+system-config-rc.421e391717b1f080dbccee0ddfc4c56859eaf4d68e2db93fd93391de25217b39 +#+system-config-rc.485c081af1765ba2bf327ddaa42edc5e3fd51498d2c10f2e4a4ca9f682b3f8c0 # - build script start - @@ -75,7 +75,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/versions/system-config-rc.421e391717b1f080dbccee0ddfc4c56859eaf4d68e2db93fd93391de25217b39/config/s6-rc-db +s6rcdb=/versions/system-config-rc.485c081af1765ba2bf327ddaa42edc5e3fd51498d2c10f2e4a4ca9f682b3f8c0/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 @@ -30,7 +30,7 @@ #+busybox-diffutils.895f7a6bf6d00136038d8bafa91a6fb1e7027ce5a32e1e3b64a9119fe69ef19a #+s6-rc.e09e2d9c42a1bbc18b406ff114d945db0d3187fd09b703ddd7c28a4d64357ad3 #+fileset.2156fb8cabd628b062bc9fcc2f673d772a25574dfe5c2c2b779ada64fe9d9d08 -#+system-config.8737c45209497c38797b425c36c03656771ca1cb5a0b95c2689dc4604a8b70a9 +#+system-config.e18a6f4ba2c562713c962ebdc2247c7370d63c8ff2e199fb1298dfaab3c210c5 # - build script start - @@ -40,7 +40,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/versions/system-config.8737c45209497c38797b425c36c03656771ca1cb5a0b95c2689dc4604a8b70a9/config/s6-rc-source +src=/versions/system-config.e18a6f4ba2c562713c962ebdc2247c7370d63c8ff2e199fb1298dfaab3c210c5/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 @@ -50,7 +50,7 @@ #+patch.96351292cca51303a6659875ff00da38adbcc491e1966e0db30cea5469b8c123 #+flex.06df30c870e62ce8f95024e74ad8d03b7f1d675d3501563cd55f16409d438b4a #+bison.183ae03f9de10534e919d4bd2bef1fa782b047f671fea90044796180284d38a7 -#+rsync.3c837c4cf6ba439fd2d6573685a49e14b279594e5f6a23fef7eff880948b764b +#+rsync.0862e31de38b4a570ee619a737c7cd3f382d195dcfeee77fab3c00386fd8609b #+execline.4e773f1ba308227aa5402fd63038f6dcbaf3866ca3fa70555a8bec9b81c8e2d2 #+s6.64db7103e34ea2b2dd5d657ebf1a62bea89d31b2a5df8cd6ef0c140ef574828f #+s6-rc.e09e2d9c42a1bbc18b406ff114d945db0d3187fd09b703ddd7c28a4d64357ad3 @@ -59,25 +59,25 @@ #+s6-linux-init.de74cb1d43a63d9c9e4e2a44ee5a7f9a50deab7776bd2b2bd0c3d67cb44f01c3 #+mdevd.3ba58bb7f820dbc30d791987f1034862f021d75dd171e9a8e93e8abc81575bf5 #+s6-dns.2c28f16b8811e7e067366e02bdb492346e4f2f3d4c63ee0cf07fceb0ed1c6472 -#+libressl.9848b682c418b0fd601a78aeb2727c829570af12c4bdb3f0a1461a48c37a2509 -#+s6-networking.f2c2fc8a514ac46bc024a01470cf600a8f171ea411a5c3c3c9551c6e0e626bb2 +#+libressl.254ad2e06940ca82a891a4c5c8e4e84cbab28dbb9790e958ade5f3be4d463dc6 +#+s6-networking.a7beb6bc1832b1111ceee65d4cf2826c419628188aeac097926be9edbdc008ca #+zsh.355a949de332be38ccdfad4e0d3e4a3d60d4b2f3ee257698a87f25ce811c2008 #+pthbs-banginstall.c568b82ef8544f41d05a56244bb32a93e2f5edd433293243a7037e36f2aa5155 #+aat.b2df2bfbff48087d5ef34ef39f712038b0d35c0112f04003b12510555fc3a1f2 #+confz.5dfd584a711633259aecac13da60d50f455c7716916c74e04ded1457ae04a071 -#+containers.2686ccca4e98fdef5f04fa8fab7773de3e9b19edec70d88d9590aa5744ca3e91 +#+containers.32e407241677450bd719888af0be85c4d1cd3ef67a03e23034bc42ef52d8d944 #+fileset.2156fb8cabd628b062bc9fcc2f673d772a25574dfe5c2c2b779ada64fe9d9d08 #+logincaps.8eecccc5adf986da642a0e803f9dd0c71311059104c342f8f5d6d99223d793ec #+snaprep.9367398cdf89d51bfb5e6c8cb7ec368b8fa8f18b05c4926b7249f28703977504 -#+curl.de666e9e011223f6dbbf0232f52d0e43778c128b6c04e0add9b33602435ea7bb -#+git.2a486b7472935ff9e977ddeb1e6cb7209259cf2f8b67cfe1aacde4e9dd4fde29 -#+xbps.54db99afb1be4f67d6757cb08e9f69feeec8e7fd5b691b92abd9206844bb71aa -#+apk-tools.bbc7958b38c0626dfcf81bfcb4f965d947cf63c3adb44292b4fe455e5f615c19 -#+getent.20fb90694a2718bfd2c26942a1fbae3d6e61aaa49cebf1a83cec27775dc9c334 -#+getconf.785d49fa007378b5045f71b81eac91e28697344c0b7643ee6016ee3e60da0a4d -#+iconv.49647ce39c09f8ece8c52eac0d8ae54d752c822ae6cd83b9e53aabe2c3e6a580 +#+curl.43b1d313241d4cd3308bf89dd3d2b11b00efd059c778d5c2bc3ade745b2c81e3 +#+git.7d6c91254a7981e6a9c7df59829e8eeaff943095e0288cd7ca4a78a1c1160b89 +#+xbps.3971c316db28b21ccf1e6bfa1b5df8a24b30f623e24333d7144c35e970a4ad14 +#+apk-tools.6fd0a18cfc9392a693775fbc2f0c18a8b18735ecdd04ae81a52f9dad0949eb84 +#+getent.ccddb98254f2f18a8e0e7e787d9316d22f61824fafb395264c4e7a8bbe0b4b5d +#+getconf.389beb94b7d7302b1512629a3a0a728627efa094ac6376c9cad06ea7c4405ef7 +#+iconv.b4fa4bdc1127bb4c7b13bc004e40e10c655a112f2e815c981e65e27bba072768 #+libcap.8eb713ba6242a6553f60222291d08461b1d83b63aa1aee69e69e7551e45b06cd -#+applyuidgid-caps.2916827d22d53b40674079dd28c0fbd0044fafb7af8cc7db84cd582a1e420dbd +#+applyuidgid-caps.d659b2f3dc98be5e954d7be392ee4f1cb54f6df5f701b8bce83904047c100318 #+ccx-utils.03320cb6f512de325611c0af488f96433fb29ca1c4a7c71454da478b48cf607e #+user-env.2653c8a3c2d92c1f44d82abeb9f6bfe7f5247a4bc6d222ed5feed5940cfd0816 #+strace.e8385cd2fa0e911b5d50599e5868c5a87acc53d169abe64916cf16471220d182 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.3d65db33ea4cc6140af2f74a371de105d2d7cc2f4300ece5cedd4eb6cca043c0- \ No newline at end of file +#+linux-qemu-guest.32542044f387957576e1ca9f34438e2d8f22ae884add27537047958589fc7e96+ \ No newline at end of file diff --git a/variants/root-x86_64/xbps b/variants/root-x86_64/xbps @@ -30,7 +30,7 @@ #+musl-cross-make.19d51dec5328ccacd41d47d7f24e33bac084aebefb839cb3fecb6573577b831a #+gnu-make.17b0037e8a3f24180cb7bb9ddb488039d540ba905aecca0315de313adfbae81c #+libarchive.435003e9c9168d640fac019e612241c543d183f5638d39f89a8e0f948223e311 -#+libressl.9848b682c418b0fd601a78aeb2727c829570af12c4bdb3f0a1461a48c37a2509 +#+libressl.254ad2e06940ca82a891a4c5c8e4e84cbab28dbb9790e958ade5f3be4d463dc6 #+pkgconf-pkg-config.c656966f2889c43d4e39921cc583813e6b7894db3754ea7af30d3361c7c40c63 #@untar:-z:sha256:f51d528fa680873914aa8367707726dd777fccc6e5c95cfad90fdb3562375c04:.