commit 82972564340121b6184bd20dd6dcb54ab4fb9787 parent 70b184e578aaff0016d30e334035c4bf6c7c1fa4 Author: Jan Pobrislo <ccx@te2000.cz> Date: Wed, 5 Nov 2025 00:55:28 +0000 ocaml packages Diffstat:
223 files changed, 1145 insertions(+), 976 deletions(-)
diff --git a/templates/functions/check_dynamic b/templates/functions/check_dynamic @@ -0,0 +1,22 @@ +check_static() { + local exe || true + exe=$pthbs_destdir'{{versions}}'/$pthbs_package/$1 + if ! test -f $exe; then + printf '%s\n' "Error: file '$1' doesn't exist!" + exit 1 + fi + local interp_info || true + interp_info=$(readelf --string-dump=.interp "$exe") || exit $? + case $interp_info in + ('') + printf '%s\n' "Error: '$1' is not a dynamic binary!" + exit 1 + ;; + (*'{{pkg_install_dir("musl-cross-make")}}/{{triplet}}/lib/ld-musl-{{triplet.split('-')[0]}}.so.1') + return 0 + ;; + (*) + printf '%s\n' "Error: '$1' unexpected linker path!" + exit 1 + esac +} diff --git a/templates/functions/check_static b/templates/functions/check_static @@ -5,6 +5,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/templates/pkg/dune b/templates/pkg/dune @@ -1,6 +1,6 @@ {%- set pkg_version="3.20.2" -%} {% extends "genlinks" %} -{%- do import_functions.add("check_static") %} +{%- do import_functions.add("check_dynamic") %} {% block package_deps -%} #+{{pkg_install_name("busybox-diffutils")}} #+{{pkg_install_name("musl-cross-make")}} @@ -45,7 +45,7 @@ rm -vrf _build ls -lhA . {% endblock install %} {% block check -%} -check_static command/dune +check_dynamic command/dune {% endblock check%} {% block genlinks_begin %} diff --git a/templates/pkg/ocaml-findlib b/templates/pkg/ocaml-findlib @@ -1,7 +1,7 @@ {%- set pkg_version="1.9.8" -%} {%- set src_dir="findlib-"+pkg_version -%} {% extends "genlinks" %} -{%- do import_functions.add("check_static") %} +{%- do import_functions.add("check_dynamic") %} {% block package_deps -%} #+{{pkg_install_name("busybox-diffutils")}} #+{{pkg_install_name("musl-cross-make")}} @@ -35,7 +35,7 @@ make install prefix="$pthbs_destdir" {% endblock install %} {% block check -%} -check_static command/ocamlfind +check_dynamic command/ocamlfind {% endblock check %} {% block genlinks_begin %} diff --git a/templates/pkg/ocamlbuild b/templates/pkg/ocamlbuild @@ -1,6 +1,6 @@ {%- set pkg_version="0.16.1" -%} {% extends "genlinks" %} -{%- do import_functions.add("check_static") %} +{%- do import_functions.add("check_dynamic") %} {% block package_deps -%} #+{{pkg_install_name("busybox-diffutils")}} #+{{pkg_install_name("musl-cross-make")}} @@ -18,7 +18,7 @@ make configure \ {% endblock configure %} {% block check -%} -check_static command/ocamlbuild +check_dynamic command/ocamlbuild {% endblock check %} {% block genlinks_begin %} diff --git a/variants/ccx-x86_64/aat b/variants/ccx-x86_64/aat @@ -2,8 +2,8 @@ #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b -#+zsh.7a73a1599d87b3e354a0e58e4119f89b71fb053e261e36802af49d80ce8d9ba1 -#+pthbs-banginstall.47e87f044eea270225da61ee7d709e01b2e6385fee494566c647cddac19e0592 +#+zsh.6b63a085e8fb430ea9a23e76bc73e3c5eabe03f82f9be10ae52fd1102173a4c2 +#+pthbs-banginstall.0e5a2b80e893a0efd6aa82c61fbba54954641ddcffbbbbda089c86e46c8c6d7f #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat diff --git a/variants/ccx-x86_64/abduco b/variants/ccx-x86_64/abduco @@ -3,7 +3,7 @@ #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #@git:8c32909a159aaa9484c82b71f05b7a73321eb491:abduco @@ -23,6 +23,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/acl b/variants/ccx-x86_64/acl @@ -4,9 +4,9 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d -#+attr.c8f68a0b4fd8b342cd680063c35ff283b57807dd2b380948e9f8de035dd18a89 +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+m4.66d25b84c09f00d05fda77de9a81a8dff3bec716f8e32554e5b7a548c50613a2 +#+attr.bb0f6fc4d09323227b9d68e6e3a456ccc242871c94cce118555e852fa768c41b #@untar:-z:sha256:5f2bdbad629707aa7d85c623f994aa8a1d2dec55a73de5205bac0bf6058a2f7c:. @@ -49,6 +49,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/apk-tools b/variants/ccx-x86_64/apk-tools @@ -3,12 +3,12 @@ #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 -#+patch.71865adfe1b1a83862c182902ff3bf77fcce6168cde6b35cd59fd5a85916e7c8 -#+libressl.3c695ed4a79eb6a22d402fd9c9aff21db481385d7f2281bb02d7e92dd931b894 -#+zstd.3aa7a31b787480effc16a34130b5199a5160b690d71ef0912b080d71e6031e88 -#+pkgconf-pkg-config.24aef2bf062e9dcad4159c34e3c2bb58ca9b4c1021a7a5a2189fa5193c81b2a8 +#+patch.97db9b3af6da753a37f8e2c51e40bb6859d59b9dfa7c32721f2af46af7af6ab9 +#+libressl.efc62a6b7a2137db880f4deaa627c73d4aa514afee60f3eba7edae55f01d3a6e +#+zstd.78836b93084ce1741f46b6b22e7573aec234256b3fbd355edc72975bfc8f7130 +#+pkgconf-pkg-config.e7fd6597cfea40d34e9b0d1b64327af359bce05efe2c33294eba57134eaa99ff #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools @@ -28,6 +28,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/applyuidgid-caps b/variants/ccx-x86_64/applyuidgid-caps @@ -3,8 +3,8 @@ #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+skalibs.9bcaae5f66b172ce64f9c640a4f1e0f6c4602a3192ede08d81954dec77b2df92 -#+libcap.edaeb61cf445dc9f4a4f1af73ab3d5994f08fac16339e75cf84c713b1079eb3d +#+skalibs.4248bcf90d151c0884f749d39396ddf8a42d4c28e9f176ad2127cd92f4db6fad +#+libcap.8ea1aca238a835f7e432168b9794acc09a0d347707cad11bedcf175460f8c2b1 #@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c @@ -23,6 +23,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/argp-standalone b/variants/ccx-x86_64/argp-standalone @@ -4,8 +4,8 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+m4.66d25b84c09f00d05fda77de9a81a8dff3bec716f8e32554e5b7a548c50613a2 #@untar:-z:sha256:c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6:. #@untar::sha256:a4facc0856b512ad8ab5aed7b07e14a9629aaf042b1e92377ba22fcfc4c4205b:argp-standalone-1.5.0 diff --git a/variants/ccx-x86_64/attr b/variants/ccx-x86_64/attr @@ -4,8 +4,8 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+m4.66d25b84c09f00d05fda77de9a81a8dff3bec716f8e32554e5b7a548c50613a2 #@untar:-z:sha256:39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87:. @@ -48,6 +48,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/bison b/variants/ccx-x86_64/bison @@ -4,9 +4,9 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d -#+flex.d82e65569a261bd6140e6daafad40475f4c37a706fdaac7048bdf24d7200b63c +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+m4.66d25b84c09f00d05fda77de9a81a8dff3bec716f8e32554e5b7a548c50613a2 +#+flex.44889b89a099e11ac990e3db40775f475338eecd842544a636ebe8aead049fe4 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:. #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:. @@ -50,6 +50,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/busybox:modutils b/variants/ccx-x86_64/busybox:modutils @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+linux.a99f4a82caf2d952998b472102d007bbe3ff6bc879629b9e20d0f8d045490a14 +#+linux.1d9e08850bf807075c28703d6b40ec34c04f2061ee42efee573d337d30e19ec5 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 @@ -18,6 +18,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" @@ -34,7 +35,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.a99f4a82caf2d952998b472102d007bbe3ff6bc879629b9e20d0f8d045490a14" +CONFIG_DEFAULT_MODULES_DIR="/home/ccx/versions/linux.1d9e08850bf807075c28703d6b40ec34c04f2061ee42efee573d337d30e19ec5" 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 @@ -2,7 +2,7 @@ #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b -#+certdata2pem.61800d791b6c1f64b1fd5caa115f97cb74d82996e72b33e79590273a3e7f5334 +#+certdata2pem.12124a137d658ed4c9127367fb2654d943a07537a7bd12c9fe7a3eba5096bee2 #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:. diff --git a/variants/ccx-x86_64/ccx-utils b/variants/ccx-x86_64/ccx-utils @@ -3,9 +3,9 @@ #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+skalibs.9bcaae5f66b172ce64f9c640a4f1e0f6c4602a3192ede08d81954dec77b2df92 -#+s6.aba44e80074ee5ae8921a773c04c3f2433945ad5566cb986e3edc5fe5c5600cf +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+skalibs.4248bcf90d151c0884f749d39396ddf8a42d4c28e9f176ad2127cd92f4db6fad +#+s6.625d36f529cb11a792f72464c287123f3ba74c0307c4f91293811507ec390df4 #@git:fae441e25a1ac266742ba6446b37ae56c8e57076:ccx-utils @@ -24,6 +24,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/certdata2pem b/variants/ccx-x86_64/certdata2pem @@ -21,6 +21,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/confz b/variants/ccx-x86_64/confz @@ -2,8 +2,8 @@ #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b -#+zsh.7a73a1599d87b3e354a0e58e4119f89b71fb053e261e36802af49d80ce8d9ba1 -#+pthbs-banginstall.47e87f044eea270225da61ee7d709e01b2e6385fee494566c647cddac19e0592 +#+zsh.6b63a085e8fb430ea9a23e76bc73e3c5eabe03f82f9be10ae52fd1102173a4c2 +#+pthbs-banginstall.0e5a2b80e893a0efd6aa82c61fbba54954641ddcffbbbbda089c86e46c8c6d7f #@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz diff --git a/variants/ccx-x86_64/container-bin-image b/variants/ccx-x86_64/container-bin-image @@ -2,14 +2,14 @@ #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+busybox-login.5ae3c5fe63ac87ad0a5a463507b448486909634ac48b26d1c771a5e614f54002 -#+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a -#+s6.aba44e80074ee5ae8921a773c04c3f2433945ad5566cb986e3edc5fe5c5600cf -#+ccx-utils.ff0ba3fc3db06a0bbee9cfc410b7894b7d06c158e35b01162f46f6ece9e2dbdf -#+applyuidgid-caps.7ac897e14684b8eebb110eded4e7759c67326a1c20b8ff62e1ada4176333e191 -#+easyseccomp.7dee370789a91260dda4d92a1fb85c8e71126b902ca57baea6a2350ea8ab5a4d -#+mlog.d3f90010a808d81d0e4e26efefd0b2325b395fd1b011f1d94cdc0be1cb017339 -#+abduco.e426fc1d139e8bfcfd6ebd986ac28b8d62bff115bdc379ad9c84b4bc97024065 -#+nawk.24907cbb8100b37ab37723f0335e79103b0135b8ae6175e179b145bbdbe500e0 +#+execline.7102a2ddde68a289705375865c9485103ebfb43724ca3335656c868e46e161d7 +#+s6.625d36f529cb11a792f72464c287123f3ba74c0307c4f91293811507ec390df4 +#+ccx-utils.7400a7804843609bdd3fc324748fd667d7e0b8a989ca92ce673eedb0baa2a1fd +#+applyuidgid-caps.a4054c3251686fa49ab0aad881c33fa8f06e0303446c23f37eea0eed795a4cf7 +#+easyseccomp.cd37d1e5b310795e4f6f5d887b593a44028c71acd2288fc723690ab935ed6d9a +#+mlog.2661b2d7c965bf9b955f31d9d9fcc3fdf1cbbfd8241c9fb54559f9626c77cb3b +#+abduco.ef4562f40e3a145738cde57e930a129a2c54a7bfe9fe303670ca1448395db025 +#+nawk.7a55f56635e44d1ae3762e2754ec61a73445bafd872483e4638f1de2e9f606c5 #@sha256:b9236c0fd504ffbc56f65d0522d2acadcd2683380eaa6f1873e8201eaa7388a5:default-policy.easyseccomp img="$pthbs_destdir/home/ccx/versions/$pthbs_package/container-bin-image" diff --git a/variants/ccx-x86_64/containers b/variants/ccx-x86_64/containers @@ -2,13 +2,13 @@ #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b -#+zsh.7a73a1599d87b3e354a0e58e4119f89b71fb053e261e36802af49d80ce8d9ba1 -#+pthbs-banginstall.47e87f044eea270225da61ee7d709e01b2e6385fee494566c647cddac19e0592 -#+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a +#+zsh.6b63a085e8fb430ea9a23e76bc73e3c5eabe03f82f9be10ae52fd1102173a4c2 +#+pthbs-banginstall.0e5a2b80e893a0efd6aa82c61fbba54954641ddcffbbbbda089c86e46c8c6d7f +#+execline.7102a2ddde68a289705375865c9485103ebfb43724ca3335656c868e46e161d7 #+alpine-keys.58180943d1e4712df08cb1eae2454fafcf543d90ac169c524e84eef81df9af01 -#+apk-tools.45eb1e70cdc4977e1c9c965f392b2a54e7b1b77485fdaf695d381dd062842d18 -#+xbps.c27da8d06944b4584d922e84f3587e0507b59fb9b0bfd799d883551514b2ca24 -#+container-bin-image.ba85f16465283d50b8ff18e0e82726df49b22e0a8d9929b0e88a758382711dc5 +#+apk-tools.8f5eb8ed32584ba1b9078546daef5673744710cd5d6e3bb155d4c4176f004a53 +#+xbps.7eb9038a37545d90425cd98fab7368dc62d656e9de8794f6ceafe8f0f1ffc4f1 +#+container-bin-image.c9addb9e153a009b29d8a03b2d1884ee5e9fa6fc019d322d525397170b366b57 #@git:b2ba08f728a01a5bac734c823016be77035ab687: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.45eb1e70cdc4977e1c9c965f392b2a54e7b1b77485fdaf695d381dd062842d18/command/apk.static' "${dest}/deps/command/" -ln -sf '/home/ccx/versions/xbps.c27da8d06944b4584d922e84f3587e0507b59fb9b0bfd799d883551514b2ca24/command/xbps-install.static' "${dest}/deps/command/" +ln -sf '/home/ccx/versions/apk-tools.8f5eb8ed32584ba1b9078546daef5673744710cd5d6e3bb155d4c4176f004a53/command/apk.static' "${dest}/deps/command/" +ln -sf '/home/ccx/versions/xbps.7eb9038a37545d90425cd98fab7368dc62d656e9de8794f6ceafe8f0f1ffc4f1/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.c27da8d06944b4584d922e84f3587e0507b59fb9b0bfd799d883551514b2ca24'/keys/void/*; do +for f in '/home/ccx/versions/xbps.7eb9038a37545d90425cd98fab7368dc62d656e9de8794f6ceafe8f0f1ffc4f1'/keys/void/*; do ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/home/ccx/versions/container-bin-image.ba85f16465283d50b8ff18e0e82726df49b22e0a8d9929b0e88a758382711dc5/container-bin-image' -test -f '/home/ccx/versions/container-bin-image.ba85f16465283d50b8ff18e0e82726df49b22e0a8d9929b0e88a758382711dc5/container-bin-image/if' -ln -sf '/home/ccx/versions/container-bin-image.ba85f16465283d50b8ff18e0e82726df49b22e0a8d9929b0e88a758382711dc5/container-bin-image' "${dest}/deps/" +test -d '/home/ccx/versions/container-bin-image.c9addb9e153a009b29d8a03b2d1884ee5e9fa6fc019d322d525397170b366b57/container-bin-image' +test -f '/home/ccx/versions/container-bin-image.c9addb9e153a009b29d8a03b2d1884ee5e9fa6fc019d322d525397170b366b57/container-bin-image/if' +ln -sf '/home/ccx/versions/container-bin-image.c9addb9e153a009b29d8a03b2d1884ee5e9fa6fc019d322d525397170b366b57/container-bin-image' "${dest}/deps/" diff --git a/variants/ccx-x86_64/containers.environment b/variants/ccx-x86_64/containers.environment @@ -1,20 +1,20 @@ #!/usr/bin/env pthbs-build #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 -#+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a -#+s6.aba44e80074ee5ae8921a773c04c3f2433945ad5566cb986e3edc5fe5c5600cf -#+s6-portable-utils.945ba0fbba6153923f5a761abc154568d30fc1db69b26f03ead9fe248f87d351 -#+s6-linux-utils.664dc33ed8e500126bfb4e74c565990e8632879b9e165b09f7f48ac054c89a22 -#+zsh.7a73a1599d87b3e354a0e58e4119f89b71fb053e261e36802af49d80ce8d9ba1 -#+confz.f5eca9ab19f09818cfcd46267b61b488344983b0931114b597ad1238173fafcf -#+containers.71cd98edff323c709e1644584725e983519b8568fb09a672e38bea5a8241a412 -#+xbps.c27da8d06944b4584d922e84f3587e0507b59fb9b0bfd799d883551514b2ca24 -#+zstd.3aa7a31b787480effc16a34130b5199a5160b690d71ef0912b080d71e6031e88 -#+apk-tools.45eb1e70cdc4977e1c9c965f392b2a54e7b1b77485fdaf695d381dd062842d18 +#+execline.7102a2ddde68a289705375865c9485103ebfb43724ca3335656c868e46e161d7 +#+s6.625d36f529cb11a792f72464c287123f3ba74c0307c4f91293811507ec390df4 +#+s6-portable-utils.ad8ffe8c50f21cb1a5e68432a843538ffed4c36cfea3a44045e43feef09c49bc +#+s6-linux-utils.bc7b18719bad23f61b1629e4fc76aead7b5605a39f91167d8d84724e0cbc5e1c +#+zsh.6b63a085e8fb430ea9a23e76bc73e3c5eabe03f82f9be10ae52fd1102173a4c2 +#+confz.58e59eb9b56c335f5dbac869762f270def5275f4565f4bca0be98ba13258424e +#+containers.1f1168beeda21e7ecef08b58c90b4c2ee8c6a504c6c98a6773ef30d6eb4e3d87 +#+xbps.7eb9038a37545d90425cd98fab7368dc62d656e9de8794f6ceafe8f0f1ffc4f1 +#+zstd.78836b93084ce1741f46b6b22e7573aec234256b3fbd355edc72975bfc8f7130 +#+apk-tools.8f5eb8ed32584ba1b9078546daef5673744710cd5d6e3bb155d4c4176f004a53 #+alpine-keys.58180943d1e4712df08cb1eae2454fafcf543d90ac169c524e84eef81df9af01 -#+getent.2608d23855b8d871fc65438dcc9889a93095bf0131f55045e517e037243898f1 -#+fileset.c9ce28ff816e023243d76d1bcb4d2b732f6b1f89c0cb9df15c1fd73880896a07 -#+ccx-utils.ff0ba3fc3db06a0bbee9cfc410b7894b7d06c158e35b01162f46f6ece9e2dbdf -#+easyseccomp.7dee370789a91260dda4d92a1fb85c8e71126b902ca57baea6a2350ea8ab5a4d -#+findutils.c80b9056e275f82f7d371a44035a3c11dd43faae948a696f9cea0cd681b76aef -#+nawk.24907cbb8100b37ab37723f0335e79103b0135b8ae6175e179b145bbdbe500e0- \ No newline at end of file +#+getent.a12dbfe5f56d8b7d474f01e771ee6caf8d94908ea3459893bebc439a7109bbf2 +#+fileset.0738b332782461b91070e25524a61bd78594c82b249ef0c0c75e93ff78c92c26 +#+ccx-utils.7400a7804843609bdd3fc324748fd667d7e0b8a989ca92ce673eedb0baa2a1fd +#+easyseccomp.cd37d1e5b310795e4f6f5d887b593a44028c71acd2288fc723690ab935ed6d9a +#+findutils.b97995c4629ad45a8c7cd488c649f6c6487560d6eadc10ba5ca62f7f5d47fd1e +#+nawk.7a55f56635e44d1ae3762e2754ec61a73445bafd872483e4638f1de2e9f606c5+ \ No newline at end of file diff --git a/variants/ccx-x86_64/curl b/variants/ccx-x86_64/curl @@ -4,9 +4,9 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d -#+libressl.3c695ed4a79eb6a22d402fd9c9aff21db481385d7f2281bb02d7e92dd931b894 +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+m4.66d25b84c09f00d05fda77de9a81a8dff3bec716f8e32554e5b7a548c50613a2 +#+libressl.efc62a6b7a2137db880f4deaa627c73d4aa514afee60f3eba7edae55f01d3a6e #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:. @@ -49,6 +49,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment @@ -1,48 +1,48 @@ #!/usr/bin/env pthbs-build #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+diffutils.70f9ddaec27568b14a011789f3c6c51ee4b849637a2b8ea9dc8f6685a646c3cf -#+patch.71865adfe1b1a83862c182902ff3bf77fcce6168cde6b35cd59fd5a85916e7c8 -#+flex.d82e65569a261bd6140e6daafad40475f4c37a706fdaac7048bdf24d7200b63c -#+bison.9264e348887dcc4943fb8b8a49bbf2462e53852ce4d782bc1ad95513eb225240 -#+rsync.55276833e2833a1041e73acab778feec8f1e456f1010a6c3b02379bcdde02d39 -#+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a -#+s6.aba44e80074ee5ae8921a773c04c3f2433945ad5566cb986e3edc5fe5c5600cf -#+s6-rc.77ee4f3326027d4463fb531273c8b42b4d8f6fabba2d075e15e18eb2cb2a8c50 -#+s6-portable-utils.945ba0fbba6153923f5a761abc154568d30fc1db69b26f03ead9fe248f87d351 -#+s6-linux-utils.664dc33ed8e500126bfb4e74c565990e8632879b9e165b09f7f48ac054c89a22 -#+s6-linux-init.30ee852e07291b5f3c94ed4037e403122037366bcc655a87f5527f1813332d62 -#+mdevd.f93eb2eff2928fd4618a959255b19e6a01e056a6a9287ce5d1a3bce89eca1a15 -#+s6-dns.d0134713eb4f2fa10036f492ca4dc945e2188a8b648a78fcd8bb085a5bd627d4 -#+libressl.3c695ed4a79eb6a22d402fd9c9aff21db481385d7f2281bb02d7e92dd931b894 -#+s6-networking.f4a78285871a0559cd61c17855bc3d610f4b5a77c67fdc93418d599d0af1c207 -#+zsh.7a73a1599d87b3e354a0e58e4119f89b71fb053e261e36802af49d80ce8d9ba1 -#+pthbs-banginstall.47e87f044eea270225da61ee7d709e01b2e6385fee494566c647cddac19e0592 -#+aat.ce323557b768bcc986fbb1557fda1309637474ccd8b9b5e4c4a56ba56634d75a -#+confz.f5eca9ab19f09818cfcd46267b61b488344983b0931114b597ad1238173fafcf -#+containers.71cd98edff323c709e1644584725e983519b8568fb09a672e38bea5a8241a412 -#+fileset.c9ce28ff816e023243d76d1bcb4d2b732f6b1f89c0cb9df15c1fd73880896a07 -#+logincaps.de7defec936b2f4498a2010578eb507abfa6f48d6c51d0b64a9ada67cce50335 -#+snaprep.c16cd20ecb28f90d83b6963a32a6f01f964fe5b99e75d7f3d9f0d2258899c26a -#+curl.10fc879ea14256ab6e511319c63f19da974300ecbf2fadf3e3ccc2c6e77c9994 -#+git.e9d3f4c1010863e3b73ab7d33d013793a4839e989361dda16178e2b118595292 -#+xbps.c27da8d06944b4584d922e84f3587e0507b59fb9b0bfd799d883551514b2ca24 -#+apk-tools.45eb1e70cdc4977e1c9c965f392b2a54e7b1b77485fdaf695d381dd062842d18 -#+getent.2608d23855b8d871fc65438dcc9889a93095bf0131f55045e517e037243898f1 -#+getconf.3f6e9e56867c13fc1f1bc3a95e692c675500944f94bd0726e34ee010d8213697 -#+iconv.0618baa01d98a1805b5ff362de984adfca782727cfe5335327341c376a8c3602 -#+libcap.edaeb61cf445dc9f4a4f1af73ab3d5994f08fac16339e75cf84c713b1079eb3d -#+applyuidgid-caps.7ac897e14684b8eebb110eded4e7759c67326a1c20b8ff62e1ada4176333e191 -#+ccx-utils.ff0ba3fc3db06a0bbee9cfc410b7894b7d06c158e35b01162f46f6ece9e2dbdf -#+user-env.9b736d39c3f3ad6e2d5d7e1d3fb52d8c5667c48474062ce09c784c59edacacc6 -#+strace.24f817d87229531d5a2218f804224619ed7635b8f847c96ccb8f8926478b144a -#+mlog.d3f90010a808d81d0e4e26efefd0b2325b395fd1b011f1d94cdc0be1cb017339 -#+findutils.c80b9056e275f82f7d371a44035a3c11dd43faae948a696f9cea0cd681b76aef -#+nawk.24907cbb8100b37ab37723f0335e79103b0135b8ae6175e179b145bbdbe500e0 -#+system-config.85b18497c63d417c4ef6c827c477b314bc8161032a21c57b6340cfb5d9d9aa3a -#+system-config-rc.38183756d5943ddd931669373134d7954b79c7830585c84daee3e58cd918911b -#+system-config-scripts.6080239044e6d330a6ea9e01625ca9d04971775d95bfc60a336235e0a4b1d743 -#+system-config-init.d33cd532ac2202ff310521a963d1986340cd390b614a58c901c9edb84403a964 -#+system-config-zsh.44342c96638209b72ed90af329e3f90445dd1c5f6ca837b3d735833a48d8dd34 +#+diffutils.e5d06cd01c742b4b6c5db456bec49ade715434e5e2aa6a3ef101624dd68b6440 +#+patch.97db9b3af6da753a37f8e2c51e40bb6859d59b9dfa7c32721f2af46af7af6ab9 +#+flex.44889b89a099e11ac990e3db40775f475338eecd842544a636ebe8aead049fe4 +#+bison.4a6e2f26c0b4a0d290e11aa67b8f9b39316d4080d4bebb9155b73857c5106d94 +#+rsync.91987802551ee2b2b6334d296d73611d5eee5d5c256b74d628baa3eaba756de8 +#+execline.7102a2ddde68a289705375865c9485103ebfb43724ca3335656c868e46e161d7 +#+s6.625d36f529cb11a792f72464c287123f3ba74c0307c4f91293811507ec390df4 +#+s6-rc.b356246ab14ce71be59e9cdc5dfca373b0c38c5b4bfc37899f379be01849a1bc +#+s6-portable-utils.ad8ffe8c50f21cb1a5e68432a843538ffed4c36cfea3a44045e43feef09c49bc +#+s6-linux-utils.bc7b18719bad23f61b1629e4fc76aead7b5605a39f91167d8d84724e0cbc5e1c +#+s6-linux-init.5b8d42d87162efd6b55396f493f876a871daeb3e45c218e1347287db700179e4 +#+mdevd.539bd0d22229d122851685067b8138fd1e185932d1dce8b8c2a7f1167e8ac7b6 +#+s6-dns.00bb0cc6f8e4b99a0d8cdcb309f786cdf1083f8dc9d941d7826c8d419f832924 +#+libressl.efc62a6b7a2137db880f4deaa627c73d4aa514afee60f3eba7edae55f01d3a6e +#+s6-networking.1f70214c326bc27c4edf05628811b81e896631b685f0a20b1b95673e89097358 +#+zsh.6b63a085e8fb430ea9a23e76bc73e3c5eabe03f82f9be10ae52fd1102173a4c2 +#+pthbs-banginstall.0e5a2b80e893a0efd6aa82c61fbba54954641ddcffbbbbda089c86e46c8c6d7f +#+aat.41652cfbe25a63941ef5282514525b44b03924f9fa4b8e45d2ed55cf066d583a +#+confz.58e59eb9b56c335f5dbac869762f270def5275f4565f4bca0be98ba13258424e +#+containers.1f1168beeda21e7ecef08b58c90b4c2ee8c6a504c6c98a6773ef30d6eb4e3d87 +#+fileset.0738b332782461b91070e25524a61bd78594c82b249ef0c0c75e93ff78c92c26 +#+logincaps.b2cf373b3a33dcddc0b49513d5267b0cdb62398d981980b7f5b17785b86c80f8 +#+snaprep.8e3f3f8ea2f652a5b10054b20afabb44657f0dad7f61683ed829139be3c1540d +#+curl.9512d6f6434ca272462728d4299c0ed2a7fb62f79332786b24269a4216732004 +#+git.9f73a2be3b4e5a8eb22680c1b811c7960a7e3da28ee7afff24fb3f30c2edf43b +#+xbps.7eb9038a37545d90425cd98fab7368dc62d656e9de8794f6ceafe8f0f1ffc4f1 +#+apk-tools.8f5eb8ed32584ba1b9078546daef5673744710cd5d6e3bb155d4c4176f004a53 +#+getent.a12dbfe5f56d8b7d474f01e771ee6caf8d94908ea3459893bebc439a7109bbf2 +#+getconf.1756f266a6e2a6ba1d5264b7a0048bea66e45f80640e68aa284a621762525702 +#+iconv.414ce06d073f7ed9a7baf71df47e49500d988513bf54f911ecc6e8d4edd51265 +#+libcap.8ea1aca238a835f7e432168b9794acc09a0d347707cad11bedcf175460f8c2b1 +#+applyuidgid-caps.a4054c3251686fa49ab0aad881c33fa8f06e0303446c23f37eea0eed795a4cf7 +#+ccx-utils.7400a7804843609bdd3fc324748fd667d7e0b8a989ca92ce673eedb0baa2a1fd +#+user-env.cdc65f1a5de402b316b76fe01287e2cd2e3feb9a86e66e0023e714eb3dc538ff +#+strace.5c717cf4161a8ad928956a03727247428a348e72a94c89a32ad7bc2a7028bcf8 +#+mlog.2661b2d7c965bf9b955f31d9d9fcc3fdf1cbbfd8241c9fb54559f9626c77cb3b +#+findutils.b97995c4629ad45a8c7cd488c649f6c6487560d6eadc10ba5ca62f7f5d47fd1e +#+nawk.7a55f56635e44d1ae3762e2754ec61a73445bafd872483e4638f1de2e9f606c5 +#+system-config.163670701ea1bf9323c5e2551137213fd086b1fdf5adb9522a3376d5f23e9024 +#+system-config-rc.2828d900092b3d942fe86ca1158dd88690fe53f285e5cbb219fbcb88616ed8e6 +#+system-config-scripts.08f6030d68edd03d9a95dd73ca8e1feebfc3604f19bc7ffe887679d81edd1495 +#+system-config-init.2bb4592b5d03937762fcd9f54eb74e7a1166574b448381e5689b42c80d29ae0e +#+system-config-zsh.d7805c621c4a170d0b904f7a58b6d8eaa7f747ef6ed47d2704618619c0b00d8b #+busybox-modutils.4b75849c60eb1dc2a0435cd9072816ef60dd80565ff6892d1b00cc664656ec87 \ No newline at end of file diff --git a/variants/ccx-x86_64/diffutils b/variants/ccx-x86_64/diffutils @@ -4,8 +4,8 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+m4.66d25b84c09f00d05fda77de9a81a8dff3bec716f8e32554e5b7a548c50613a2 #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:. @@ -48,6 +48,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/dune b/variants/ccx-x86_64/dune @@ -4,7 +4,7 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.25730b05a968e5472a0458d040d5a52a7eee2d5b896231dc9476f51117cb7c5c +#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc #@untar:-z:sha256:579c738f8ca191ba0a9b22dbe78f1377542442c9827cf4939f8964f09f9edb28:. @@ -17,11 +17,20 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + case $interp_info in + ('') + printf '%s\n' "Error: '$1' is not a dynamic binary!" + exit 1 + ;; + (*'/home/ccx/versions/musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') + return 0 + ;; + (*) + printf '%s\n' "Error: '$1' unexpected linker path!" + exit 1 + esac } @@ -62,7 +71,7 @@ rm -vrf _build ls -lhA . -check_static command/dune +check_dynamic command/dune diff --git a/variants/ccx-x86_64/easyseccomp b/variants/ccx-x86_64/easyseccomp @@ -4,14 +4,14 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d -#+patch.71865adfe1b1a83862c182902ff3bf77fcce6168cde6b35cd59fd5a85916e7c8 -#+flex.d82e65569a261bd6140e6daafad40475f4c37a706fdaac7048bdf24d7200b63c -#+bison.9264e348887dcc4943fb8b8a49bbf2462e53852ce4d782bc1ad95513eb225240 -#+libseccomp.4acb4d19627ea775e263125457cfa77c295f4a4bffdfab56560495dde8e31474 -#+error-standalone.c5bed16451398238f10e83182031c3f5a22949b6b98c723567214828b9053c37 -#+argp-standalone.12091fe79283b890260cdf7d47a9aa9f7a57b63f1a9f4127dd537e2f897c4399 +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+m4.66d25b84c09f00d05fda77de9a81a8dff3bec716f8e32554e5b7a548c50613a2 +#+patch.97db9b3af6da753a37f8e2c51e40bb6859d59b9dfa7c32721f2af46af7af6ab9 +#+flex.44889b89a099e11ac990e3db40775f475338eecd842544a636ebe8aead049fe4 +#+bison.4a6e2f26c0b4a0d290e11aa67b8f9b39316d4080d4bebb9155b73857c5106d94 +#+libseccomp.011c76aa9b8f0b42d311e5b013f500b9f7389607f4a13390c2148380f5844f32 +#+error-standalone.8b7b20030abe778dccce8b9183c0abe9374cbabb7a2366b186bf84936136e77a +#+argp-standalone.d5b05b5c85ca779d6937652e18db88debf0d81725c1df33e47f2c28f7953ea51 #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp #@sha256:eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10:easyseccomp_fix_includes.patch #@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp @@ -56,6 +56,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/error-standalone b/variants/ccx-x86_64/error-standalone @@ -3,7 +3,7 @@ #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:. diff --git a/variants/ccx-x86_64/execline b/variants/ccx-x86_64/execline @@ -3,8 +3,8 @@ #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+skalibs.9bcaae5f66b172ce64f9c640a4f1e0f6c4602a3192ede08d81954dec77b2df92 +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+skalibs.4248bcf90d151c0884f749d39396ddf8a42d4c28e9f176ad2127cd92f4db6fad #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline @@ -21,7 +21,7 @@ cd 'execline' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.9bcaae5f66b172ce64f9c640a4f1e0f6c4602a3192ede08d81954dec77b2df92/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.4248bcf90d151c0884f749d39396ddf8a42d4c28e9f176ad2127cd92f4db6fad/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/ccx-x86_64/fileset b/variants/ccx-x86_64/fileset @@ -2,8 +2,8 @@ #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b -#+zsh.7a73a1599d87b3e354a0e58e4119f89b71fb053e261e36802af49d80ce8d9ba1 -#+pthbs-banginstall.47e87f044eea270225da61ee7d709e01b2e6385fee494566c647cddac19e0592 +#+zsh.6b63a085e8fb430ea9a23e76bc73e3c5eabe03f82f9be10ae52fd1102173a4c2 +#+pthbs-banginstall.0e5a2b80e893a0efd6aa82c61fbba54954641ddcffbbbbda089c86e46c8c6d7f #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset diff --git a/variants/ccx-x86_64/findutils b/variants/ccx-x86_64/findutils @@ -4,8 +4,8 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+m4.66d25b84c09f00d05fda77de9a81a8dff3bec716f8e32554e5b7a548c50613a2 #@untar:-J:sha256:1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5:. @@ -48,6 +48,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/flex b/variants/ccx-x86_64/flex @@ -4,8 +4,8 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+m4.66d25b84c09f00d05fda77de9a81a8dff3bec716f8e32554e5b7a548c50613a2 #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:. @@ -48,6 +48,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/getconf b/variants/ccx-x86_64/getconf @@ -21,6 +21,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/getent b/variants/ccx-x86_64/getent @@ -21,6 +21,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/git b/variants/ccx-x86_64/git @@ -3,11 +3,11 @@ #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 -#+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d -#+libressl.3c695ed4a79eb6a22d402fd9c9aff21db481385d7f2281bb02d7e92dd931b894 -#+curl.10fc879ea14256ab6e511319c63f19da974300ecbf2fadf3e3ccc2c6e77c9994 +#+m4.66d25b84c09f00d05fda77de9a81a8dff3bec716f8e32554e5b7a548c50613a2 +#+libressl.efc62a6b7a2137db880f4deaa627c73d4aa514afee60f3eba7edae55f01d3a6e +#+curl.9512d6f6434ca272462728d4299c0ed2a7fb62f79332786b24269a4216732004 #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:. @@ -20,6 +20,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/gnu-make b/variants/ccx-x86_64/gnu-make @@ -44,6 +44,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/gperf b/variants/ccx-x86_64/gperf @@ -4,8 +4,8 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+m4.66d25b84c09f00d05fda77de9a81a8dff3bec716f8e32554e5b7a548c50613a2 #@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:. @@ -48,6 +48,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/iconv b/variants/ccx-x86_64/iconv @@ -21,6 +21,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/kbd b/variants/ccx-x86_64/kbd @@ -4,8 +4,8 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+m4.66d25b84c09f00d05fda77de9a81a8dff3bec716f8e32554e5b7a548c50613a2 #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:. #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:. @@ -49,6 +49,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" 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.a99f4a82caf2d952998b472102d007bbe3ff6bc879629b9e20d0f8d045490a14 -#+busybox.9231d8d9390327e0f99ebfdc49efdab27d0797f0c20f7349981add284eae635c- \ No newline at end of file +#+linux.1d9e08850bf807075c28703d6b40ec34c04f2061ee42efee573d337d30e19ec5 +#+busybox.26906fa4af8129da8822322238f5584af035c7f6318dd357619d1d37de308177+ \ No newline at end of file diff --git a/variants/ccx-x86_64/libarchive b/variants/ccx-x86_64/libarchive @@ -4,8 +4,8 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+m4.66d25b84c09f00d05fda77de9a81a8dff3bec716f8e32554e5b7a548c50613a2 #@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:. @@ -48,6 +48,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/libbsd b/variants/ccx-x86_64/libbsd @@ -4,9 +4,9 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d -#+libmd.fa170b19cb9e45babc77f921543d75a450d6e38404a97eeded75e85524c18b50 +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+m4.66d25b84c09f00d05fda77de9a81a8dff3bec716f8e32554e5b7a548c50613a2 +#+libmd.e40006cba47d44f232b0db1101516b2c5c9e10e402adbd5e5eeac2e142f01844 #@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:. @@ -49,6 +49,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/libcap b/variants/ccx-x86_64/libcap @@ -3,9 +3,9 @@ #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 -#+pkgconf-pkg-config.24aef2bf062e9dcad4159c34e3c2bb58ca9b4c1021a7a5a2189fa5193c81b2a8 +#+pkgconf-pkg-config.e7fd6597cfea40d34e9b0d1b64327af359bce05efe2c33294eba57134eaa99ff #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:. @@ -24,6 +24,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/libcgroup b/variants/ccx-x86_64/libcgroup @@ -4,11 +4,11 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d -#+flex.d82e65569a261bd6140e6daafad40475f4c37a706fdaac7048bdf24d7200b63c -#+bison.9264e348887dcc4943fb8b8a49bbf2462e53852ce4d782bc1ad95513eb225240 -#+musl-fts.ac29201b328a132f82e0fa4b56b7bfcfdeb116400ba8fe08642a067058a26d8e +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+m4.66d25b84c09f00d05fda77de9a81a8dff3bec716f8e32554e5b7a548c50613a2 +#+flex.44889b89a099e11ac990e3db40775f475338eecd842544a636ebe8aead049fe4 +#+bison.4a6e2f26c0b4a0d290e11aa67b8f9b39316d4080d4bebb9155b73857c5106d94 +#+musl-fts.285d0fbf54db525b2be5580b69f761df27ede7f40ee4384aedec591e95b591fc #@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:. @@ -51,6 +51,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/libelf b/variants/ccx-x86_64/libelf @@ -3,9 +3,9 @@ #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 -#+zstd.3aa7a31b787480effc16a34130b5199a5160b690d71ef0912b080d71e6031e88 +#+zstd.78836b93084ce1741f46b6b22e7573aec234256b3fbd355edc72975bfc8f7130 #@git:288355d104ff9930520c0283fe82556c6cc5c16f:libelf diff --git a/variants/ccx-x86_64/libmd b/variants/ccx-x86_64/libmd @@ -4,8 +4,8 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+m4.66d25b84c09f00d05fda77de9a81a8dff3bec716f8e32554e5b7a548c50613a2 #@untar:-J:sha256:1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332:. @@ -48,6 +48,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/libressl b/variants/ccx-x86_64/libressl @@ -4,9 +4,9 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d -#+ca-certificates-wip-donotuse.b3c597f83303731126f1678a9de2d91daea9ea06934160ca1a00a29f5a167032 +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+m4.66d25b84c09f00d05fda77de9a81a8dff3bec716f8e32554e5b7a548c50613a2 +#+ca-certificates-wip-donotuse.f3e794951cdff9938f0c7b5608405b7cec22845ceec4851b595db03d088120fe #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:. @@ -50,6 +50,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" @@ -73,7 +74,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.b3c597f83303731126f1678a9de2d91daea9ea06934160ca1a00a29f5a167032/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/" +cp -vs '/home/ccx/versions/ca-certificates-wip-donotuse.f3e794951cdff9938f0c7b5608405b7cec22845ceec4851b595db03d088120fe/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/libretls b/variants/ccx-x86_64/libretls @@ -4,8 +4,8 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+m4.66d25b84c09f00d05fda77de9a81a8dff3bec716f8e32554e5b7a548c50613a2 #@untar:-z:sha256:3bc9fc0e61827ee2f608e5e44993a8fda6d610b80a1e01a9c75610cc292997b5:. @@ -48,6 +48,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/libseccomp b/variants/ccx-x86_64/libseccomp @@ -4,10 +4,10 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d -#+pkgconf-pkg-config.24aef2bf062e9dcad4159c34e3c2bb58ca9b4c1021a7a5a2189fa5193c81b2a8 -#+gperf.07a9122cf4d1c1a15a072266b7a4adf0a607f1178b2d326491500c6ac589d7df +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+m4.66d25b84c09f00d05fda77de9a81a8dff3bec716f8e32554e5b7a548c50613a2 +#+pkgconf-pkg-config.e7fd6597cfea40d34e9b0d1b64327af359bce05efe2c33294eba57134eaa99ff +#+gperf.59eba4f4ebb1b535c190520fa44d473c38cbda5ea43c1bc401a71fcb19c702c1 #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:. @@ -50,6 +50,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/libunwind b/variants/ccx-x86_64/libunwind @@ -4,8 +4,8 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+m4.66d25b84c09f00d05fda77de9a81a8dff3bec716f8e32554e5b7a548c50613a2 #@untar:-z:sha256:ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157:. @@ -48,6 +48,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/linux b/variants/ccx-x86_64/linux @@ -1,18 +1,18 @@ #!/usr/bin/env pthbs-build #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-modutils.4b75849c60eb1dc2a0435cd9072816ef60dd80565ff6892d1b00cc664656ec87 -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+findutils.c80b9056e275f82f7d371a44035a3c11dd43faae948a696f9cea0cd681b76aef -#+diffutils.70f9ddaec27568b14a011789f3c6c51ee4b849637a2b8ea9dc8f6685a646c3cf -#+patch.71865adfe1b1a83862c182902ff3bf77fcce6168cde6b35cd59fd5a85916e7c8 -#+flex.d82e65569a261bd6140e6daafad40475f4c37a706fdaac7048bdf24d7200b63c -#+bison.9264e348887dcc4943fb8b8a49bbf2462e53852ce4d782bc1ad95513eb225240 -#+rsync.55276833e2833a1041e73acab778feec8f1e456f1010a6c3b02379bcdde02d39 -#+zstd.3aa7a31b787480effc16a34130b5199a5160b690d71ef0912b080d71e6031e88 -#+libelf.ccbb68a9c6feaf4b434ea0cfd38b3027ff369507165cbf8b01abb8c6e3eabe98 -#+pkgconf-pkg-config.24aef2bf062e9dcad4159c34e3c2bb58ca9b4c1021a7a5a2189fa5193c81b2a8 -#+nawk.24907cbb8100b37ab37723f0335e79103b0135b8ae6175e179b145bbdbe500e0 +#+findutils.b97995c4629ad45a8c7cd488c649f6c6487560d6eadc10ba5ca62f7f5d47fd1e +#+diffutils.e5d06cd01c742b4b6c5db456bec49ade715434e5e2aa6a3ef101624dd68b6440 +#+patch.97db9b3af6da753a37f8e2c51e40bb6859d59b9dfa7c32721f2af46af7af6ab9 +#+flex.44889b89a099e11ac990e3db40775f475338eecd842544a636ebe8aead049fe4 +#+bison.4a6e2f26c0b4a0d290e11aa67b8f9b39316d4080d4bebb9155b73857c5106d94 +#+rsync.91987802551ee2b2b6334d296d73611d5eee5d5c256b74d628baa3eaba756de8 +#+zstd.78836b93084ce1741f46b6b22e7573aec234256b3fbd355edc72975bfc8f7130 +#+libelf.f7ab94b6ccde77e365c0430b01b35f358d844764960e46f6636cd92854229d35 +#+pkgconf-pkg-config.e7fd6597cfea40d34e9b0d1b64327af359bce05efe2c33294eba57134eaa99ff +#+nawk.7a55f56635e44d1ae3762e2754ec61a73445bafd872483e4638f1de2e9f606c5 #@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:. #@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config diff --git a/variants/ccx-x86_64/linux-qemu-guest b/variants/ccx-x86_64/linux-qemu-guest @@ -1,18 +1,18 @@ #!/usr/bin/env pthbs-build #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-modutils.4b75849c60eb1dc2a0435cd9072816ef60dd80565ff6892d1b00cc664656ec87 -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+findutils.c80b9056e275f82f7d371a44035a3c11dd43faae948a696f9cea0cd681b76aef -#+diffutils.70f9ddaec27568b14a011789f3c6c51ee4b849637a2b8ea9dc8f6685a646c3cf -#+patch.71865adfe1b1a83862c182902ff3bf77fcce6168cde6b35cd59fd5a85916e7c8 -#+flex.d82e65569a261bd6140e6daafad40475f4c37a706fdaac7048bdf24d7200b63c -#+bison.9264e348887dcc4943fb8b8a49bbf2462e53852ce4d782bc1ad95513eb225240 -#+rsync.55276833e2833a1041e73acab778feec8f1e456f1010a6c3b02379bcdde02d39 -#+zstd.3aa7a31b787480effc16a34130b5199a5160b690d71ef0912b080d71e6031e88 -#+libelf.ccbb68a9c6feaf4b434ea0cfd38b3027ff369507165cbf8b01abb8c6e3eabe98 -#+pkgconf-pkg-config.24aef2bf062e9dcad4159c34e3c2bb58ca9b4c1021a7a5a2189fa5193c81b2a8 -#+nawk.24907cbb8100b37ab37723f0335e79103b0135b8ae6175e179b145bbdbe500e0 +#+findutils.b97995c4629ad45a8c7cd488c649f6c6487560d6eadc10ba5ca62f7f5d47fd1e +#+diffutils.e5d06cd01c742b4b6c5db456bec49ade715434e5e2aa6a3ef101624dd68b6440 +#+patch.97db9b3af6da753a37f8e2c51e40bb6859d59b9dfa7c32721f2af46af7af6ab9 +#+flex.44889b89a099e11ac990e3db40775f475338eecd842544a636ebe8aead049fe4 +#+bison.4a6e2f26c0b4a0d290e11aa67b8f9b39316d4080d4bebb9155b73857c5106d94 +#+rsync.91987802551ee2b2b6334d296d73611d5eee5d5c256b74d628baa3eaba756de8 +#+zstd.78836b93084ce1741f46b6b22e7573aec234256b3fbd355edc72975bfc8f7130 +#+libelf.f7ab94b6ccde77e365c0430b01b35f358d844764960e46f6636cd92854229d35 +#+pkgconf-pkg-config.e7fd6597cfea40d34e9b0d1b64327af359bce05efe2c33294eba57134eaa99ff +#+nawk.7a55f56635e44d1ae3762e2754ec61a73445bafd872483e4638f1de2e9f606c5 #@untar:-J:sha256:7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764:. #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config #@sha256:ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417:noobjtool.patch diff --git a/variants/ccx-x86_64/logincaps b/variants/ccx-x86_64/logincaps @@ -2,11 +2,11 @@ #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b -#+zsh.7a73a1599d87b3e354a0e58e4119f89b71fb053e261e36802af49d80ce8d9ba1 -#+pthbs-banginstall.47e87f044eea270225da61ee7d709e01b2e6385fee494566c647cddac19e0592 -#+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a +#+zsh.6b63a085e8fb430ea9a23e76bc73e3c5eabe03f82f9be10ae52fd1102173a4c2 +#+pthbs-banginstall.0e5a2b80e893a0efd6aa82c61fbba54954641ddcffbbbbda089c86e46c8c6d7f +#+execline.7102a2ddde68a289705375865c9485103ebfb43724ca3335656c868e46e161d7 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ccx-utils.ff0ba3fc3db06a0bbee9cfc410b7894b7d06c158e35b01162f46f6ece9e2dbdf +#+ccx-utils.7400a7804843609bdd3fc324748fd667d7e0b8a989ca92ce673eedb0baa2a1fd #@git:409db79b3e7e5fc6b73305471d9bbb6ac5c14036:logincaps @@ -19,6 +19,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/m4 b/variants/ccx-x86_64/m4 @@ -1,6 +1,6 @@ #!/usr/bin/env pthbs-build #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 @@ -47,6 +47,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/mdev-scripts b/variants/ccx-x86_64/mdev-scripts @@ -2,8 +2,8 @@ #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b -#+zsh.7a73a1599d87b3e354a0e58e4119f89b71fb053e261e36802af49d80ce8d9ba1 -#+pthbs-banginstall.47e87f044eea270225da61ee7d709e01b2e6385fee494566c647cddac19e0592 +#+zsh.6b63a085e8fb430ea9a23e76bc73e3c5eabe03f82f9be10ae52fd1102173a4c2 +#+pthbs-banginstall.0e5a2b80e893a0efd6aa82c61fbba54954641ddcffbbbbda089c86e46c8c6d7f #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts diff --git a/variants/ccx-x86_64/mdevd b/variants/ccx-x86_64/mdevd @@ -3,9 +3,9 @@ #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+skalibs.9bcaae5f66b172ce64f9c640a4f1e0f6c4602a3192ede08d81954dec77b2df92 -#+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+skalibs.4248bcf90d151c0884f749d39396ddf8a42d4c28e9f176ad2127cd92f4db6fad +#+execline.7102a2ddde68a289705375865c9485103ebfb43724ca3335656c868e46e161d7 #@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd @@ -22,7 +22,7 @@ cd 'mdevd' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.9bcaae5f66b172ce64f9c640a4f1e0f6c4602a3192ede08d81954dec77b2df92/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.4248bcf90d151c0884f749d39396ddf8a42d4c28e9f176ad2127cd92f4db6fad/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/ccx-x86_64/mdevd.environment b/variants/ccx-x86_64/mdevd.environment @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f -#+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a -#+s6.aba44e80074ee5ae8921a773c04c3f2433945ad5566cb986e3edc5fe5c5600cf -#+mdev-scripts.056213588dc63cc192d272bc9681fd493af9bef5373da9914b07b55057f25a60 -#+mdevd.f93eb2eff2928fd4618a959255b19e6a01e056a6a9287ce5d1a3bce89eca1a15 +#+execline.7102a2ddde68a289705375865c9485103ebfb43724ca3335656c868e46e161d7 +#+s6.625d36f529cb11a792f72464c287123f3ba74c0307c4f91293811507ec390df4 +#+mdev-scripts.00e06adec035e09310f3550d4c15a61d8c0b7a268a976c5808e6edcf363f099a +#+mdevd.539bd0d22229d122851685067b8138fd1e185932d1dce8b8c2a7f1167e8ac7b6 #+busybox-modutils.4b75849c60eb1dc2a0435cd9072816ef60dd80565ff6892d1b00cc664656ec87 \ No newline at end of file diff --git a/variants/ccx-x86_64/mlog b/variants/ccx-x86_64/mlog @@ -3,7 +3,7 @@ #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 #@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog @@ -22,6 +22,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/musl-fts b/variants/ccx-x86_64/musl-fts @@ -4,8 +4,8 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+m4.66d25b84c09f00d05fda77de9a81a8dff3bec716f8e32554e5b7a548c50613a2 #@untar:-z:sha256:49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6:. @@ -48,6 +48,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/nawk b/variants/ccx-x86_64/nawk @@ -2,9 +2,9 @@ #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b -#+bison.9264e348887dcc4943fb8b8a49bbf2462e53852ce4d782bc1ad95513eb225240 +#+bison.4a6e2f26c0b4a0d290e11aa67b8f9b39316d4080d4bebb9155b73857c5106d94 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 #@untar:-z:sha256:e031b1e1d2b230f276f975bffb923f0ea15f798c839d15a3f26a1a39448e32d7:. diff --git a/variants/ccx-x86_64/netbsd-curses b/variants/ccx-x86_64/netbsd-curses @@ -2,7 +2,7 @@ #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f #@git:51d179dad861640caeb76674b5908ccd79f04fae:netbsd-curses diff --git a/variants/ccx-x86_64/ocaml b/variants/ccx-x86_64/ocaml @@ -4,8 +4,8 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+m4.66d25b84c09f00d05fda77de9a81a8dff3bec716f8e32554e5b7a548c50613a2 #@untar:-J:sha256:dfaa8a2e11c799bc1765d8bef44911406ee5f4803027190382a939f88c912266:. @@ -48,6 +48,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/ocaml-astring b/variants/ccx-x86_64/ocaml-astring @@ -4,11 +4,11 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.25730b05a968e5472a0458d040d5a52a7eee2d5b896231dc9476f51117cb7c5c -#+ocaml-findlib.6e02e25254234bd75b03488bdf4f30fa0fc3e1d4541dc32d26a42e3789317e67 -#+ocamlbuild.3965330991d47b95832c993da7654e0c85f89a9fd9d6079083273e12ac1cc3d7 -#+opam.56b929a1d2f88d4acd319f6392f65aa57f7cb995e7b68b7d1e2e10fa46703e9f -#+ocaml-topkg.ef6d90dca7a155027ed90d50365a273aaa6e724cdcb8fdd4f2926755d92dbe2b +#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc +#+ocaml-findlib.6971db3f894bd306e8907c308b0989de2d8f552ca8013b482b60e404da46c0cb +#+ocamlbuild.8971011fba6095b2813ffeeebefd2e6699ae94722ab20dedd4933174c28f24ef +#+opam.d779b518acd197b63b103c101d4d98df816c154a2dbafb3d901b53f5aef80931 +#+ocaml-topkg.011ae9a8f8a90acc70b2b01a6efa206cfbfee7b5c1c5ca4218de8562223a3181 #@untar:-j:sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa:. diff --git a/variants/ccx-x86_64/ocaml-base b/variants/ccx-x86_64/ocaml-base @@ -4,10 +4,10 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.25730b05a968e5472a0458d040d5a52a7eee2d5b896231dc9476f51117cb7c5c -#+dune.95e79141951a0ed8626725d477afc2556a97139825690b09c4ba5c426a94db82 -#+ocaml_intrinsics_kernel.9a613e47b5f9feafc59a8472e57d94df95e7cd2534a87e89e0682d26e0dfbf22 -#+ocaml-sexplib0.54788ab11e61e32255257e38e7758ca37630ad859ced0685150d8069a03ba076 +#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc +#+dune.0c68d39f56de1bb838f9fc9dcd16012f870284de159e0c477adceee29c80e4a2 +#+ocaml_intrinsics_kernel.2e97d5fef6a31c0b8e4a5108165680b6edcba54963c74cbe1bfb0cb944b2b9e0 +#+ocaml-sexplib0.cbf3d06b7353e91ee99665ddf72215dad033099e7c652dd56e4dbc4c6ac3c44e #@untar:-z:sha256:3f3f64789ab25bb5cb7f5f907dd651dec9cc9440981822fe75df6b94344b7208:. diff --git a/variants/ccx-x86_64/ocaml-bos b/variants/ccx-x86_64/ocaml-bos @@ -4,17 +4,17 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.25730b05a968e5472a0458d040d5a52a7eee2d5b896231dc9476f51117cb7c5c -#+ocaml-findlib.6e02e25254234bd75b03488bdf4f30fa0fc3e1d4541dc32d26a42e3789317e67 -#+ocamlbuild.3965330991d47b95832c993da7654e0c85f89a9fd9d6079083273e12ac1cc3d7 -#+opam.56b929a1d2f88d4acd319f6392f65aa57f7cb995e7b68b7d1e2e10fa46703e9f -#+ocaml-topkg.ef6d90dca7a155027ed90d50365a273aaa6e724cdcb8fdd4f2926755d92dbe2b -#+ocaml-astring.9dbd8bc0428c9063c38db95966548c5459249c4b3d7be608a955bcbf5f615f7a -#+ocaml-fpath.f21922a8e83cf88c0aac6757d28efd6206288bf5605ce087df6c53b107b638a1 -#+ocaml-rresult.9f9d91ec417b6169704c98e362c990546739d58ebd6bce9306e8d66ea655cc8c -#+ocaml-fmt.eae2a5598a86aa7fab1b21eb595d619d0da643114aec8aead32128ffa2d390e7 -#+ocaml-logs.bc313036dfddb7224ae2bce8608c0a76e2187001d7314175c55baded4b6b2328 -#+ocaml-mtime.6be2fcc10e71f90d42509fc0bee67b3830c5d309ba26bfb1372f84b4eb8d15a4 +#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc +#+ocaml-findlib.6971db3f894bd306e8907c308b0989de2d8f552ca8013b482b60e404da46c0cb +#+ocamlbuild.8971011fba6095b2813ffeeebefd2e6699ae94722ab20dedd4933174c28f24ef +#+opam.d779b518acd197b63b103c101d4d98df816c154a2dbafb3d901b53f5aef80931 +#+ocaml-topkg.011ae9a8f8a90acc70b2b01a6efa206cfbfee7b5c1c5ca4218de8562223a3181 +#+ocaml-astring.94c32ee5bce5c47fa9ec1d7201bfcfe35a17dfa4241f1e912f056d023d9832db +#+ocaml-fpath.e15b0b8a584acdeb18a3b59b4071199e0466e430280e5d11dd98f7ac40224edd +#+ocaml-rresult.1ea51f6b398c12cd245a501c98ae7ee16e310b25d5ce7902319be3dba8eb633c +#+ocaml-fmt.18fa94f82264e9ae584f30688b41c767904bff44682e44f377abc577c7d53297 +#+ocaml-logs.752edf533ee9cfb72d694c9fa36b1f56f38d924ea1e2d11c94e3c896dc731491 +#+ocaml-mtime.ef8a85416d67d690b30c530a2e1c4a9e351bf6af1bcebd589ea317ae4dd8d283 #@untar:-j:sha256:d8d62e786b10d697e0457205a8eedeaa27ebcc90f1855f18df190cac2e3d8f37:. diff --git a/variants/ccx-x86_64/ocaml-cmdliner b/variants/ccx-x86_64/ocaml-cmdliner @@ -4,11 +4,11 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.25730b05a968e5472a0458d040d5a52a7eee2d5b896231dc9476f51117cb7c5c -#+ocaml-findlib.6e02e25254234bd75b03488bdf4f30fa0fc3e1d4541dc32d26a42e3789317e67 -#+ocamlbuild.3965330991d47b95832c993da7654e0c85f89a9fd9d6079083273e12ac1cc3d7 -#+opam.56b929a1d2f88d4acd319f6392f65aa57f7cb995e7b68b7d1e2e10fa46703e9f -#+ocaml-topkg.ef6d90dca7a155027ed90d50365a273aaa6e724cdcb8fdd4f2926755d92dbe2b +#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc +#+ocaml-findlib.6971db3f894bd306e8907c308b0989de2d8f552ca8013b482b60e404da46c0cb +#+ocamlbuild.8971011fba6095b2813ffeeebefd2e6699ae94722ab20dedd4933174c28f24ef +#+opam.d779b518acd197b63b103c101d4d98df816c154a2dbafb3d901b53f5aef80931 +#+ocaml-topkg.011ae9a8f8a90acc70b2b01a6efa206cfbfee7b5c1c5ca4218de8562223a3181 #@untar:-j:sha256:4e547a631c36fbaadff60d3bd7724eb3f83ba274e92fb725950bae7868378582:. diff --git a/variants/ccx-x86_64/ocaml-compiler-libs b/variants/ccx-x86_64/ocaml-compiler-libs @@ -4,8 +4,8 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.25730b05a968e5472a0458d040d5a52a7eee2d5b896231dc9476f51117cb7c5c -#+dune.95e79141951a0ed8626725d477afc2556a97139825690b09c4ba5c426a94db82 +#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc +#+dune.0c68d39f56de1bb838f9fc9dcd16012f870284de159e0c477adceee29c80e4a2 #@untar:-z:sha256:9b9644d7351db699e57ddba7c767bb4153e6e988ccf45ead2fb238a3bd75cdc7:. diff --git a/variants/ccx-x86_64/ocaml-cppo b/variants/ccx-x86_64/ocaml-cppo @@ -4,9 +4,9 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.25730b05a968e5472a0458d040d5a52a7eee2d5b896231dc9476f51117cb7c5c -#+dune.95e79141951a0ed8626725d477afc2556a97139825690b09c4ba5c426a94db82 -#+ocamlbuild.3965330991d47b95832c993da7654e0c85f89a9fd9d6079083273e12ac1cc3d7 +#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc +#+dune.0c68d39f56de1bb838f9fc9dcd16012f870284de159e0c477adceee29c80e4a2 +#+ocamlbuild.8971011fba6095b2813ffeeebefd2e6699ae94722ab20dedd4933174c28f24ef #@untar:-z:sha256:6e62a8ee0217c9cc38d5860110eb18eb8d89c05c420353d298e1431fe8bac00f:. diff --git a/variants/ccx-x86_64/ocaml-findlib b/variants/ccx-x86_64/ocaml-findlib @@ -4,11 +4,11 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d -#+netbsd-curses.f9c6320015f13dcaadbffabc70b81116260eb7c69cb8f99dd372543a6e64ee79 -#+ocaml.25730b05a968e5472a0458d040d5a52a7eee2d5b896231dc9476f51117cb7c5c -#+ocamlbuild.3965330991d47b95832c993da7654e0c85f89a9fd9d6079083273e12ac1cc3d7 +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+m4.66d25b84c09f00d05fda77de9a81a8dff3bec716f8e32554e5b7a548c50613a2 +#+netbsd-curses.602505ed434c46abbdf43553127f96497f63866c823d5e45cdede00f3ffa29bb +#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc +#+ocamlbuild.8971011fba6095b2813ffeeebefd2e6699ae94722ab20dedd4933174c28f24ef #@untar:-z:sha256:662c910f774e9fee3a19c4e057f380581ab2fc4ee52da4761304ac9c31b8869d:. @@ -21,11 +21,20 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + case $interp_info in + ('') + printf '%s\n' "Error: '$1' is not a dynamic binary!" + exit 1 + ;; + (*'/home/ccx/versions/musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') + return 0 + ;; + (*) + printf '%s\n' "Error: '$1' unexpected linker path!" + exit 1 + esac } prefix=/home/ccx/versions/$pthbs_package @@ -45,14 +54,14 @@ cd 'findlib-1.9.8' make -j1 all opt # workaround `topfind` getting installed to stdlib directory, this is not configurable -stdlib="$pthbs_destdir/home/ccx/versions/ocaml.25730b05a968e5472a0458d040d5a52a7eee2d5b896231dc9476f51117cb7c5c" +stdlib="$pthbs_destdir/home/ccx/versions/ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc" mkdir -p "${stdlib%/*}" ln -s "$pthbs_package" "$stdlib" make install prefix="$pthbs_destdir" -check_static command/ocamlfind +check_dynamic command/ocamlfind diff --git a/variants/ccx-x86_64/ocaml-fmt b/variants/ccx-x86_64/ocaml-fmt @@ -4,12 +4,12 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.25730b05a968e5472a0458d040d5a52a7eee2d5b896231dc9476f51117cb7c5c -#+ocaml-findlib.6e02e25254234bd75b03488bdf4f30fa0fc3e1d4541dc32d26a42e3789317e67 -#+ocamlbuild.3965330991d47b95832c993da7654e0c85f89a9fd9d6079083273e12ac1cc3d7 -#+opam.56b929a1d2f88d4acd319f6392f65aa57f7cb995e7b68b7d1e2e10fa46703e9f -#+ocaml-topkg.ef6d90dca7a155027ed90d50365a273aaa6e724cdcb8fdd4f2926755d92dbe2b -#+ocaml-cmdliner.fab3669c86ba56638c673c528c80c27d49c3d91220d93d92ef769d9b5595241f +#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc +#+ocaml-findlib.6971db3f894bd306e8907c308b0989de2d8f552ca8013b482b60e404da46c0cb +#+ocamlbuild.8971011fba6095b2813ffeeebefd2e6699ae94722ab20dedd4933174c28f24ef +#+opam.d779b518acd197b63b103c101d4d98df816c154a2dbafb3d901b53f5aef80931 +#+ocaml-topkg.011ae9a8f8a90acc70b2b01a6efa206cfbfee7b5c1c5ca4218de8562223a3181 +#+ocaml-cmdliner.61af81348cb8a76671a9f08ddaed34cc72c43fff217ab53457a9ff395187ab49 #@untar:-j:sha256:857cfd47a54b52429cd9b3e2665e44173cd1bd3b435bece7172f984ad5376a1b:. diff --git a/variants/ccx-x86_64/ocaml-fpath b/variants/ccx-x86_64/ocaml-fpath @@ -4,12 +4,12 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.25730b05a968e5472a0458d040d5a52a7eee2d5b896231dc9476f51117cb7c5c -#+ocaml-findlib.6e02e25254234bd75b03488bdf4f30fa0fc3e1d4541dc32d26a42e3789317e67 -#+ocamlbuild.3965330991d47b95832c993da7654e0c85f89a9fd9d6079083273e12ac1cc3d7 -#+opam.56b929a1d2f88d4acd319f6392f65aa57f7cb995e7b68b7d1e2e10fa46703e9f -#+ocaml-topkg.ef6d90dca7a155027ed90d50365a273aaa6e724cdcb8fdd4f2926755d92dbe2b -#+ocaml-astring.9dbd8bc0428c9063c38db95966548c5459249c4b3d7be608a955bcbf5f615f7a +#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc +#+ocaml-findlib.6971db3f894bd306e8907c308b0989de2d8f552ca8013b482b60e404da46c0cb +#+ocamlbuild.8971011fba6095b2813ffeeebefd2e6699ae94722ab20dedd4933174c28f24ef +#+opam.d779b518acd197b63b103c101d4d98df816c154a2dbafb3d901b53f5aef80931 +#+ocaml-topkg.011ae9a8f8a90acc70b2b01a6efa206cfbfee7b5c1c5ca4218de8562223a3181 +#+ocaml-astring.94c32ee5bce5c47fa9ec1d7201bfcfe35a17dfa4241f1e912f056d023d9832db #@untar:-j:sha256:12b08ff192d037d9b6d69e9ca19d1d385184f20b3237c27231e437ac81ace70f:. diff --git a/variants/ccx-x86_64/ocaml-logs b/variants/ccx-x86_64/ocaml-logs @@ -4,14 +4,14 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.25730b05a968e5472a0458d040d5a52a7eee2d5b896231dc9476f51117cb7c5c -#+ocaml-findlib.6e02e25254234bd75b03488bdf4f30fa0fc3e1d4541dc32d26a42e3789317e67 -#+ocamlbuild.3965330991d47b95832c993da7654e0c85f89a9fd9d6079083273e12ac1cc3d7 -#+opam.56b929a1d2f88d4acd319f6392f65aa57f7cb995e7b68b7d1e2e10fa46703e9f -#+ocaml-topkg.ef6d90dca7a155027ed90d50365a273aaa6e724cdcb8fdd4f2926755d92dbe2b -#+ocaml-mtime.6be2fcc10e71f90d42509fc0bee67b3830c5d309ba26bfb1372f84b4eb8d15a4 -#+ocaml-cmdliner.fab3669c86ba56638c673c528c80c27d49c3d91220d93d92ef769d9b5595241f -#+ocaml-fmt.eae2a5598a86aa7fab1b21eb595d619d0da643114aec8aead32128ffa2d390e7 +#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc +#+ocaml-findlib.6971db3f894bd306e8907c308b0989de2d8f552ca8013b482b60e404da46c0cb +#+ocamlbuild.8971011fba6095b2813ffeeebefd2e6699ae94722ab20dedd4933174c28f24ef +#+opam.d779b518acd197b63b103c101d4d98df816c154a2dbafb3d901b53f5aef80931 +#+ocaml-topkg.011ae9a8f8a90acc70b2b01a6efa206cfbfee7b5c1c5ca4218de8562223a3181 +#+ocaml-mtime.ef8a85416d67d690b30c530a2e1c4a9e351bf6af1bcebd589ea317ae4dd8d283 +#+ocaml-cmdliner.61af81348cb8a76671a9f08ddaed34cc72c43fff217ab53457a9ff395187ab49 +#+ocaml-fmt.18fa94f82264e9ae584f30688b41c767904bff44682e44f377abc577c7d53297 #@untar:-j:sha256:ee97065ba41ce28f19dea9453c6bec4e0ef26165ad7394c4131ea0c65c0f06d5:. diff --git a/variants/ccx-x86_64/ocaml-lun b/variants/ccx-x86_64/ocaml-lun @@ -4,8 +4,8 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.25730b05a968e5472a0458d040d5a52a7eee2d5b896231dc9476f51117cb7c5c -#+dune.95e79141951a0ed8626725d477afc2556a97139825690b09c4ba5c426a94db82 +#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc +#+dune.0c68d39f56de1bb838f9fc9dcd16012f870284de159e0c477adceee29c80e4a2 #@untar:-j:sha256:cca8badff83b470fdcfb1840116f8e8a6f2cb86cde2f44ed28cf26cbf692a793:. diff --git a/variants/ccx-x86_64/ocaml-mtime b/variants/ccx-x86_64/ocaml-mtime @@ -4,11 +4,11 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.25730b05a968e5472a0458d040d5a52a7eee2d5b896231dc9476f51117cb7c5c -#+ocaml-findlib.6e02e25254234bd75b03488bdf4f30fa0fc3e1d4541dc32d26a42e3789317e67 -#+ocamlbuild.3965330991d47b95832c993da7654e0c85f89a9fd9d6079083273e12ac1cc3d7 -#+opam.56b929a1d2f88d4acd319f6392f65aa57f7cb995e7b68b7d1e2e10fa46703e9f -#+ocaml-topkg.ef6d90dca7a155027ed90d50365a273aaa6e724cdcb8fdd4f2926755d92dbe2b +#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc +#+ocaml-findlib.6971db3f894bd306e8907c308b0989de2d8f552ca8013b482b60e404da46c0cb +#+ocamlbuild.8971011fba6095b2813ffeeebefd2e6699ae94722ab20dedd4933174c28f24ef +#+opam.d779b518acd197b63b103c101d4d98df816c154a2dbafb3d901b53f5aef80931 +#+ocaml-topkg.011ae9a8f8a90acc70b2b01a6efa206cfbfee7b5c1c5ca4218de8562223a3181 #@untar:-j:sha256:097cb2802e3701ead9572e1b483d5a28c6e2f0a39449faaf9b44ad8a89834d88:. diff --git a/variants/ccx-x86_64/ocaml-ppx_derivers b/variants/ccx-x86_64/ocaml-ppx_derivers @@ -4,8 +4,8 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.25730b05a968e5472a0458d040d5a52a7eee2d5b896231dc9476f51117cb7c5c -#+dune.95e79141951a0ed8626725d477afc2556a97139825690b09c4ba5c426a94db82 +#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc +#+dune.0c68d39f56de1bb838f9fc9dcd16012f870284de159e0c477adceee29c80e4a2 #@untar:-z:sha256:b6595ee187dea792b31fc54a0e1524ab1e48bc6068d3066c45215a138cc73b95:. diff --git a/variants/ccx-x86_64/ocaml-ppx_deriving b/variants/ccx-x86_64/ocaml-ppx_deriving @@ -4,15 +4,15 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.25730b05a968e5472a0458d040d5a52a7eee2d5b896231dc9476f51117cb7c5c -#+dune.95e79141951a0ed8626725d477afc2556a97139825690b09c4ba5c426a94db82 -#+ocaml-compiler-libs.1743f6d78014f0f13a7ce331edbefb677b483eb7f75efb2ba8fda311cc8ec69d -#+ocaml-cppo.8b269d56a7f9f5a6e74e2e64b637f48a90afe41da3fd7cae5f7e9c6f9ae9e1c2 -#+ocaml-findlib.6e02e25254234bd75b03488bdf4f30fa0fc3e1d4541dc32d26a42e3789317e67 -#+ocaml-ppx_derivers.b2cc73169f1449236cb94cc24c3d330f961de61d4ee073f4f97e044bd9b398c2 -#+ocaml-ppxlib.c649f73d66717b25eeb93769c16d197fe4ca743a2f77eeb299330ac84c615230 -#+ocaml-sexplib0.54788ab11e61e32255257e38e7758ca37630ad859ced0685150d8069a03ba076 -#+ocaml-stdlib-shims.a1422b67e6380517b92478b9aded206bda577492e374161860010d067225070f +#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc +#+dune.0c68d39f56de1bb838f9fc9dcd16012f870284de159e0c477adceee29c80e4a2 +#+ocaml-compiler-libs.3e0dc54090aee44199186c082964740c0e9a2830d796de9331dd208bad373fc8 +#+ocaml-cppo.f1b261572cf44d052b40b2d08f2a274eee902ab284fb9db90024d2f8b545ed8b +#+ocaml-findlib.6971db3f894bd306e8907c308b0989de2d8f552ca8013b482b60e404da46c0cb +#+ocaml-ppx_derivers.2fe3d3162cc2dae9ed52faad0ffacadb50068ef816ec6bd16699e850d58eb054 +#+ocaml-ppxlib.311b1ebd4e2ab1e2449f1b9c630532a3b286936d6c193613a2e6c9ebb349cb36 +#+ocaml-sexplib0.cbf3d06b7353e91ee99665ddf72215dad033099e7c652dd56e4dbc4c6ac3c44e +#+ocaml-stdlib-shims.a290aafc2f7b087bc51fa1360843d003db0a79ffb5b6a96b498e5ec783f87f4f #@untar:-z:sha256:c91d1ea5e15e6928a2f8947dbd135b9f765cc0e2d72be271427981afcd350c24:. diff --git a/variants/ccx-x86_64/ocaml-ppxlib b/variants/ccx-x86_64/ocaml-ppxlib @@ -4,12 +4,12 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.25730b05a968e5472a0458d040d5a52a7eee2d5b896231dc9476f51117cb7c5c -#+dune.95e79141951a0ed8626725d477afc2556a97139825690b09c4ba5c426a94db82 -#+ocaml-compiler-libs.1743f6d78014f0f13a7ce331edbefb677b483eb7f75efb2ba8fda311cc8ec69d -#+ocaml-ppx_derivers.b2cc73169f1449236cb94cc24c3d330f961de61d4ee073f4f97e044bd9b398c2 -#+ocaml-sexplib0.54788ab11e61e32255257e38e7758ca37630ad859ced0685150d8069a03ba076 -#+ocaml-stdlib-shims.a1422b67e6380517b92478b9aded206bda577492e374161860010d067225070f +#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc +#+dune.0c68d39f56de1bb838f9fc9dcd16012f870284de159e0c477adceee29c80e4a2 +#+ocaml-compiler-libs.3e0dc54090aee44199186c082964740c0e9a2830d796de9331dd208bad373fc8 +#+ocaml-ppx_derivers.2fe3d3162cc2dae9ed52faad0ffacadb50068ef816ec6bd16699e850d58eb054 +#+ocaml-sexplib0.cbf3d06b7353e91ee99665ddf72215dad033099e7c652dd56e4dbc4c6ac3c44e +#+ocaml-stdlib-shims.a290aafc2f7b087bc51fa1360843d003db0a79ffb5b6a96b498e5ec783f87f4f #@untar:-j:sha256:2e223837e7cecc3bc84a432432c0a72f4e1d5be9165c9c33772f156db85db0b3:. diff --git a/variants/ccx-x86_64/ocaml-rresult b/variants/ccx-x86_64/ocaml-rresult @@ -4,11 +4,11 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.25730b05a968e5472a0458d040d5a52a7eee2d5b896231dc9476f51117cb7c5c -#+ocaml-findlib.6e02e25254234bd75b03488bdf4f30fa0fc3e1d4541dc32d26a42e3789317e67 -#+ocamlbuild.3965330991d47b95832c993da7654e0c85f89a9fd9d6079083273e12ac1cc3d7 -#+opam.56b929a1d2f88d4acd319f6392f65aa57f7cb995e7b68b7d1e2e10fa46703e9f -#+ocaml-topkg.ef6d90dca7a155027ed90d50365a273aaa6e724cdcb8fdd4f2926755d92dbe2b +#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc +#+ocaml-findlib.6971db3f894bd306e8907c308b0989de2d8f552ca8013b482b60e404da46c0cb +#+ocamlbuild.8971011fba6095b2813ffeeebefd2e6699ae94722ab20dedd4933174c28f24ef +#+opam.d779b518acd197b63b103c101d4d98df816c154a2dbafb3d901b53f5aef80931 +#+ocaml-topkg.011ae9a8f8a90acc70b2b01a6efa206cfbfee7b5c1c5ca4218de8562223a3181 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:. diff --git a/variants/ccx-x86_64/ocaml-sexplib0 b/variants/ccx-x86_64/ocaml-sexplib0 @@ -4,8 +4,8 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.25730b05a968e5472a0458d040d5a52a7eee2d5b896231dc9476f51117cb7c5c -#+dune.95e79141951a0ed8626725d477afc2556a97139825690b09c4ba5c426a94db82 +#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc +#+dune.0c68d39f56de1bb838f9fc9dcd16012f870284de159e0c477adceee29c80e4a2 #@untar:-z:sha256:86dba26468194512f789f2fb709063515a9cb4e5c4461c021c239a369590701d:. diff --git a/variants/ccx-x86_64/ocaml-stdlib-shims b/variants/ccx-x86_64/ocaml-stdlib-shims @@ -4,8 +4,8 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.25730b05a968e5472a0458d040d5a52a7eee2d5b896231dc9476f51117cb7c5c -#+dune.95e79141951a0ed8626725d477afc2556a97139825690b09c4ba5c426a94db82 +#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc +#+dune.0c68d39f56de1bb838f9fc9dcd16012f870284de159e0c477adceee29c80e4a2 #@untar:-j:sha256:babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a:. diff --git a/variants/ccx-x86_64/ocaml-topkg b/variants/ccx-x86_64/ocaml-topkg @@ -4,10 +4,10 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.25730b05a968e5472a0458d040d5a52a7eee2d5b896231dc9476f51117cb7c5c -#+ocaml-findlib.6e02e25254234bd75b03488bdf4f30fa0fc3e1d4541dc32d26a42e3789317e67 -#+ocamlbuild.3965330991d47b95832c993da7654e0c85f89a9fd9d6079083273e12ac1cc3d7 -#+opam.56b929a1d2f88d4acd319f6392f65aa57f7cb995e7b68b7d1e2e10fa46703e9f +#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc +#+ocaml-findlib.6971db3f894bd306e8907c308b0989de2d8f552ca8013b482b60e404da46c0cb +#+ocamlbuild.8971011fba6095b2813ffeeebefd2e6699ae94722ab20dedd4933174c28f24ef +#+opam.d779b518acd197b63b103c101d4d98df816c154a2dbafb3d901b53f5aef80931 #@untar:-j:sha256:452082626e651ac4b1633c2b4ae4cad7abeb1fb6a13046e699f95eec58b5d1c7:. diff --git a/variants/ccx-x86_64/ocaml:dynlink b/variants/ccx-x86_64/ocaml:dynlink @@ -4,8 +4,8 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+m4.66d25b84c09f00d05fda77de9a81a8dff3bec716f8e32554e5b7a548c50613a2 #@untar:-J:sha256:dfaa8a2e11c799bc1765d8bef44911406ee5f4803027190382a939f88c912266:. diff --git a/variants/ccx-x86_64/ocaml_intrinsics_kernel b/variants/ccx-x86_64/ocaml_intrinsics_kernel @@ -4,8 +4,8 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+ocaml.25730b05a968e5472a0458d040d5a52a7eee2d5b896231dc9476f51117cb7c5c -#+dune.95e79141951a0ed8626725d477afc2556a97139825690b09c4ba5c426a94db82 +#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc +#+dune.0c68d39f56de1bb838f9fc9dcd16012f870284de159e0c477adceee29c80e4a2 #@untar:-z:sha256:c988b7769a59749631c3c98ba5edd1d2fe91f5dc380b5e0593c073c92f4bee01:. diff --git a/variants/ccx-x86_64/ocamlbuild b/variants/ccx-x86_64/ocamlbuild @@ -4,9 +4,9 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d -#+ocaml.25730b05a968e5472a0458d040d5a52a7eee2d5b896231dc9476f51117cb7c5c +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+m4.66d25b84c09f00d05fda77de9a81a8dff3bec716f8e32554e5b7a548c50613a2 +#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc #@untar:-z:sha256:2ba6857f2991b7f69368e8db818b163d31cf5a367f15f5953bf8f01a77b3d4fc:. @@ -19,11 +19,20 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + case $interp_info in + ('') + printf '%s\n' "Error: '$1' is not a dynamic binary!" + exit 1 + ;; + (*'/home/ccx/versions/musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') + return 0 + ;; + (*) + printf '%s\n' "Error: '$1' unexpected linker path!" + exit 1 + esac } prefix=/home/ccx/versions/$pthbs_package @@ -44,7 +53,7 @@ make DESTDIR="$pthbs_destdir" install -check_static command/ocamlbuild +check_dynamic command/ocamlbuild diff --git a/variants/ccx-x86_64/opam b/variants/ccx-x86_64/opam @@ -2,13 +2,13 @@ #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b -#+diffutils.70f9ddaec27568b14a011789f3c6c51ee4b849637a2b8ea9dc8f6685a646c3cf -#+patch.71865adfe1b1a83862c182902ff3bf77fcce6168cde6b35cd59fd5a85916e7c8 -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 +#+diffutils.e5d06cd01c742b4b6c5db456bec49ade715434e5e2aa6a3ef101624dd68b6440 +#+patch.97db9b3af6da753a37f8e2c51e40bb6859d59b9dfa7c32721f2af46af7af6ab9 +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+getconf.3f6e9e56867c13fc1f1bc3a95e692c675500944f94bd0726e34ee010d8213697 -#+ocaml.25730b05a968e5472a0458d040d5a52a7eee2d5b896231dc9476f51117cb7c5c -#+dune.95e79141951a0ed8626725d477afc2556a97139825690b09c4ba5c426a94db82 +#+getconf.1756f266a6e2a6ba1d5264b7a0048bea66e45f80640e68aa284a621762525702 +#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc +#+dune.0c68d39f56de1bb838f9fc9dcd16012f870284de159e0c477adceee29c80e4a2 #@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:. @@ -21,6 +21,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" @@ -46,7 +47,7 @@ export DUNE_CACHE=disabled --infodir="$prefix/info" \ --localedir="$prefix/locale" \ --localstatedir='/var/pthbs' \ - --with-dune='/home/ccx/versions/dune.95e79141951a0ed8626725d477afc2556a97139825690b09c4ba5c426a94db82/command/dune' \ + --with-dune='/home/ccx/versions/dune.0c68d39f56de1bb838f9fc9dcd16012f870284de159e0c477adceee29c80e4a2/command/dune' \ --with-mccs \ --with-vendored-deps \ --enable-static diff --git a/variants/ccx-x86_64/openssl b/variants/ccx-x86_64/openssl @@ -2,7 +2,7 @@ #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f #@untar:-z:sha256:712590fd20aaa60ec75d778fe5b810d6b829ca7fb1e530577917a131f9105539:. @@ -22,6 +22,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/patch b/variants/ccx-x86_64/patch @@ -4,8 +4,8 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+m4.66d25b84c09f00d05fda77de9a81a8dff3bec716f8e32554e5b7a548c50613a2 #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:. @@ -48,6 +48,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/patchelf:bootstrap b/variants/ccx-x86_64/patchelf:bootstrap @@ -43,6 +43,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/pkgconf b/variants/ccx-x86_64/pkgconf @@ -4,8 +4,8 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+m4.66d25b84c09f00d05fda77de9a81a8dff3bec716f8e32554e5b7a548c50613a2 #@untar:-J:sha256:3a224f2accf091b77a5781316e27b9ee3ba82c083cc2e539e08940b68a44fec5:. @@ -48,6 +48,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/pkgconf-pkg-config b/variants/ccx-x86_64/pkgconf-pkg-config @@ -1,6 +1,6 @@ #!/usr/bin/env pthbs-build #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f -#+pkgconf.5591dd9ec91a4379a950297ccb7ddf00414f1ba47d1aec8b77cfe8962b491fb6 +#+pkgconf.e422ecb75b01c56e473924f79eee449e922e54f78d28dfb9144e4de4b363aad9 mkdir -p "$pthbs_destdir/home/ccx/versions/$pthbs_package" cd "$pthbs_destdir/home/ccx/versions/$pthbs_package" diff --git a/variants/ccx-x86_64/popt b/variants/ccx-x86_64/popt @@ -4,8 +4,8 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+m4.66d25b84c09f00d05fda77de9a81a8dff3bec716f8e32554e5b7a548c50613a2 #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:. @@ -48,6 +48,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/pthbs-banginstall b/variants/ccx-x86_64/pthbs-banginstall @@ -2,7 +2,7 @@ #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b -#+zsh.7a73a1599d87b3e354a0e58e4119f89b71fb053e261e36802af49d80ce8d9ba1 +#+zsh.6b63a085e8fb430ea9a23e76bc73e3c5eabe03f82f9be10ae52fd1102173a4c2 #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall diff --git a/variants/ccx-x86_64/rsync b/variants/ccx-x86_64/rsync @@ -3,12 +3,12 @@ #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d -#+nawk.24907cbb8100b37ab37723f0335e79103b0135b8ae6175e179b145bbdbe500e0 -#+popt.d13ce001cb3b0a98e29b93df01f1b1452634b9fcd6be97af75dbca2ba32c28a1 -#+libressl.3c695ed4a79eb6a22d402fd9c9aff21db481385d7f2281bb02d7e92dd931b894 -#+zstd.3aa7a31b787480effc16a34130b5199a5160b690d71ef0912b080d71e6031e88 +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+m4.66d25b84c09f00d05fda77de9a81a8dff3bec716f8e32554e5b7a548c50613a2 +#+nawk.7a55f56635e44d1ae3762e2754ec61a73445bafd872483e4638f1de2e9f606c5 +#+popt.2c8903b4e6af3b73e4eddccf0c084befe230f2f16fe0746c20d34fb661549bf2 +#+libressl.efc62a6b7a2137db880f4deaa627c73d4aa514afee60f3eba7edae55f01d3a6e +#+zstd.78836b93084ce1741f46b6b22e7573aec234256b3fbd355edc72975bfc8f7130 #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:. @@ -51,6 +51,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/s6 b/variants/ccx-x86_64/s6 @@ -3,9 +3,9 @@ #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+skalibs.9bcaae5f66b172ce64f9c640a4f1e0f6c4602a3192ede08d81954dec77b2df92 -#+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+skalibs.4248bcf90d151c0884f749d39396ddf8a42d4c28e9f176ad2127cd92f4db6fad +#+execline.7102a2ddde68a289705375865c9485103ebfb43724ca3335656c868e46e161d7 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6 @@ -22,7 +22,7 @@ cd 's6' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.9bcaae5f66b172ce64f9c640a4f1e0f6c4602a3192ede08d81954dec77b2df92/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.4248bcf90d151c0884f749d39396ddf8a42d4c28e9f176ad2127cd92f4db6fad/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/ccx-x86_64/s6-dns b/variants/ccx-x86_64/s6-dns @@ -3,8 +3,8 @@ #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+skalibs.9bcaae5f66b172ce64f9c640a4f1e0f6c4602a3192ede08d81954dec77b2df92 +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+skalibs.4248bcf90d151c0884f749d39396ddf8a42d4c28e9f176ad2127cd92f4db6fad #@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns @@ -21,7 +21,7 @@ cd 's6-dns' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.9bcaae5f66b172ce64f9c640a4f1e0f6c4602a3192ede08d81954dec77b2df92/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.4248bcf90d151c0884f749d39396ddf8a42d4c28e9f176ad2127cd92f4db6fad/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/ccx-x86_64/s6-linux-init b/variants/ccx-x86_64/s6-linux-init @@ -3,10 +3,10 @@ #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+skalibs.9bcaae5f66b172ce64f9c640a4f1e0f6c4602a3192ede08d81954dec77b2df92 -#+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a -#+s6.aba44e80074ee5ae8921a773c04c3f2433945ad5566cb986e3edc5fe5c5600cf +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+skalibs.4248bcf90d151c0884f749d39396ddf8a42d4c28e9f176ad2127cd92f4db6fad +#+execline.7102a2ddde68a289705375865c9485103ebfb43724ca3335656c868e46e161d7 +#+s6.625d36f529cb11a792f72464c287123f3ba74c0307c4f91293811507ec390df4 #@git:b298e515efe16210048e504e3aec89ea1e627b73:s6-linux-init @@ -23,7 +23,7 @@ cd 's6-linux-init' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.9bcaae5f66b172ce64f9c640a4f1e0f6c4602a3192ede08d81954dec77b2df92/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.4248bcf90d151c0884f749d39396ddf8a42d4c28e9f176ad2127cd92f4db6fad/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/ccx-x86_64/s6-linux-utils b/variants/ccx-x86_64/s6-linux-utils @@ -3,8 +3,8 @@ #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+skalibs.9bcaae5f66b172ce64f9c640a4f1e0f6c4602a3192ede08d81954dec77b2df92 +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+skalibs.4248bcf90d151c0884f749d39396ddf8a42d4c28e9f176ad2127cd92f4db6fad #@git:a9e7acac41a8854546246dd39cb4daee54ead2cb:s6-linux-utils @@ -21,7 +21,7 @@ cd 's6-linux-utils' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.9bcaae5f66b172ce64f9c640a4f1e0f6c4602a3192ede08d81954dec77b2df92/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.4248bcf90d151c0884f749d39396ddf8a42d4c28e9f176ad2127cd92f4db6fad/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/ccx-x86_64/s6-networking b/variants/ccx-x86_64/s6-networking @@ -3,12 +3,12 @@ #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+skalibs.9bcaae5f66b172ce64f9c640a4f1e0f6c4602a3192ede08d81954dec77b2df92 -#+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a -#+s6.aba44e80074ee5ae8921a773c04c3f2433945ad5566cb986e3edc5fe5c5600cf -#+s6-dns.d0134713eb4f2fa10036f492ca4dc945e2188a8b648a78fcd8bb085a5bd627d4 -#+libressl.3c695ed4a79eb6a22d402fd9c9aff21db481385d7f2281bb02d7e92dd931b894 +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+skalibs.4248bcf90d151c0884f749d39396ddf8a42d4c28e9f176ad2127cd92f4db6fad +#+execline.7102a2ddde68a289705375865c9485103ebfb43724ca3335656c868e46e161d7 +#+s6.625d36f529cb11a792f72464c287123f3ba74c0307c4f91293811507ec390df4 +#+s6-dns.00bb0cc6f8e4b99a0d8cdcb309f786cdf1083f8dc9d941d7826c8d419f832924 +#+libressl.efc62a6b7a2137db880f4deaa627c73d4aa514afee60f3eba7edae55f01d3a6e #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking @@ -25,7 +25,7 @@ cd 's6-networking' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.9bcaae5f66b172ce64f9c640a4f1e0f6c4602a3192ede08d81954dec77b2df92/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.4248bcf90d151c0884f749d39396ddf8a42d4c28e9f176ad2127cd92f4db6fad/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/ccx-x86_64/s6-portable-utils b/variants/ccx-x86_64/s6-portable-utils @@ -3,8 +3,8 @@ #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+skalibs.9bcaae5f66b172ce64f9c640a4f1e0f6c4602a3192ede08d81954dec77b2df92 +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+skalibs.4248bcf90d151c0884f749d39396ddf8a42d4c28e9f176ad2127cd92f4db6fad #@git:dc96d8a020e83b16dd7a8bd093bdb00ab2b944c0:s6-portable-utils @@ -21,7 +21,7 @@ cd 's6-portable-utils' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.9bcaae5f66b172ce64f9c640a4f1e0f6c4602a3192ede08d81954dec77b2df92/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.4248bcf90d151c0884f749d39396ddf8a42d4c28e9f176ad2127cd92f4db6fad/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/ccx-x86_64/s6-rc b/variants/ccx-x86_64/s6-rc @@ -3,10 +3,10 @@ #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+skalibs.9bcaae5f66b172ce64f9c640a4f1e0f6c4602a3192ede08d81954dec77b2df92 -#+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a -#+s6.aba44e80074ee5ae8921a773c04c3f2433945ad5566cb986e3edc5fe5c5600cf +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+skalibs.4248bcf90d151c0884f749d39396ddf8a42d4c28e9f176ad2127cd92f4db6fad +#+execline.7102a2ddde68a289705375865c9485103ebfb43724ca3335656c868e46e161d7 +#+s6.625d36f529cb11a792f72464c287123f3ba74c0307c4f91293811507ec390df4 #@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc @@ -23,7 +23,7 @@ cd 's6-rc' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/home/ccx/versions/skalibs.9bcaae5f66b172ce64f9c640a4f1e0f6c4602a3192ede08d81954dec77b2df92/sysdeps' \ + --with-sysdeps='/home/ccx/versions/skalibs.4248bcf90d151c0884f749d39396ddf8a42d4c28e9f176ad2127cd92f4db6fad/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/ccx-x86_64/skalibs b/variants/ccx-x86_64/skalibs @@ -3,7 +3,7 @@ #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 #@git:96b537f42695da1b865588baf591fdfcae76bd41:skalibs diff --git a/variants/ccx-x86_64/snaprep b/variants/ccx-x86_64/snaprep @@ -2,8 +2,8 @@ #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b -#+zsh.7a73a1599d87b3e354a0e58e4119f89b71fb053e261e36802af49d80ce8d9ba1 -#+pthbs-banginstall.47e87f044eea270225da61ee7d709e01b2e6385fee494566c647cddac19e0592 +#+zsh.6b63a085e8fb430ea9a23e76bc73e3c5eabe03f82f9be10ae52fd1102173a4c2 +#+pthbs-banginstall.0e5a2b80e893a0efd6aa82c61fbba54954641ddcffbbbbda089c86e46c8c6d7f #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep diff --git a/variants/ccx-x86_64/strace b/variants/ccx-x86_64/strace @@ -4,10 +4,10 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d -#+patch.71865adfe1b1a83862c182902ff3bf77fcce6168cde6b35cd59fd5a85916e7c8 -#+libunwind.81dcbbc3b4e0bf74b3307a2a0b5e66ea29ab610d1ea295e044e5b3f071c125bb +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+m4.66d25b84c09f00d05fda77de9a81a8dff3bec716f8e32554e5b7a548c50613a2 +#+patch.97db9b3af6da753a37f8e2c51e40bb6859d59b9dfa7c32721f2af46af7af6ab9 +#+libunwind.4d5ef3bc5decba9788de742db4e5fba4a2630582aa6184e75243b4d8e3f6b628 #@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch #@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:. @@ -51,6 +51,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/system-config b/variants/ccx-x86_64/system-config @@ -1,21 +1,21 @@ #!/usr/bin/env pthbs-build #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 -#+nawk.24907cbb8100b37ab37723f0335e79103b0135b8ae6175e179b145bbdbe500e0 -#+diffutils.70f9ddaec27568b14a011789f3c6c51ee4b849637a2b8ea9dc8f6685a646c3cf -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+aat.ce323557b768bcc986fbb1557fda1309637474ccd8b9b5e4c4a56ba56634d75a -#+fileset.c9ce28ff816e023243d76d1bcb4d2b732f6b1f89c0cb9df15c1fd73880896a07 -#+rsync.55276833e2833a1041e73acab778feec8f1e456f1010a6c3b02379bcdde02d39 -#+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a -#+kbd.fc6daccf346ad764ded16dc20acffe20e41966ff0bff0747aabc4b68306b8485 -#+mdevd.f93eb2eff2928fd4618a959255b19e6a01e056a6a9287ce5d1a3bce89eca1a15 -#+s6-linux-utils.664dc33ed8e500126bfb4e74c565990e8632879b9e165b09f7f48ac054c89a22 -#+s6-rc.77ee4f3326027d4463fb531273c8b42b4d8f6fabba2d075e15e18eb2cb2a8c50 -#+s6.aba44e80074ee5ae8921a773c04c3f2433945ad5566cb986e3edc5fe5c5600cf -#+zsh.7a73a1599d87b3e354a0e58e4119f89b71fb053e261e36802af49d80ce8d9ba1 -#+system-config-scripts.6080239044e6d330a6ea9e01625ca9d04971775d95bfc60a336235e0a4b1d743 -#+logincaps.de7defec936b2f4498a2010578eb507abfa6f48d6c51d0b64a9ada67cce50335 +#+nawk.7a55f56635e44d1ae3762e2754ec61a73445bafd872483e4638f1de2e9f606c5 +#+diffutils.e5d06cd01c742b4b6c5db456bec49ade715434e5e2aa6a3ef101624dd68b6440 +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+aat.41652cfbe25a63941ef5282514525b44b03924f9fa4b8e45d2ed55cf066d583a +#+fileset.0738b332782461b91070e25524a61bd78594c82b249ef0c0c75e93ff78c92c26 +#+rsync.91987802551ee2b2b6334d296d73611d5eee5d5c256b74d628baa3eaba756de8 +#+execline.7102a2ddde68a289705375865c9485103ebfb43724ca3335656c868e46e161d7 +#+kbd.50cef76c0139cf832dd88d036099c8afca4321ebd0548d00213cb5de2cd15bfa +#+mdevd.539bd0d22229d122851685067b8138fd1e185932d1dce8b8c2a7f1167e8ac7b6 +#+s6-linux-utils.bc7b18719bad23f61b1629e4fc76aead7b5605a39f91167d8d84724e0cbc5e1c +#+s6-rc.b356246ab14ce71be59e9cdc5dfca373b0c38c5b4bfc37899f379be01849a1bc +#+s6.625d36f529cb11a792f72464c287123f3ba74c0307c4f91293811507ec390df4 +#+zsh.6b63a085e8fb430ea9a23e76bc73e3c5eabe03f82f9be10ae52fd1102173a4c2 +#+system-config-scripts.08f6030d68edd03d9a95dd73ca8e1feebfc3604f19bc7ffe887679d81edd1495 +#+logincaps.b2cf373b3a33dcddc0b49513d5267b0cdb62398d981980b7f5b17785b86c80f8 #+busybox-modutils.4b75849c60eb1dc2a0435cd9072816ef60dd80565ff6892d1b00cc664656ec87 #@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.6710928241fdfd3ba0f0055676652269e279e5eda36331d86cc31b71341e577b' \ - 'pthbs_path_mdevd=/home/ccx/versions/env.5e8647c09728dcc576d886422fd8ae7787a5f70228ed01417057675a231ba2a9' \ + 'pthbs_path_containers=/home/ccx/versions/env.c9a770619294ee1815494bb940c31a1b37e2d3a1fc15e278d4b6c409878a1674' \ + 'pthbs_path_mdevd=/home/ccx/versions/env.e793a3cc342d49c6e3807bc913b6d3863a521e579b72d6149e5a366e5eee70a2' \ 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 @@ -2,12 +2,12 @@ #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b -#+s6.aba44e80074ee5ae8921a773c04c3f2433945ad5566cb986e3edc5fe5c5600cf -#+s6-rc.77ee4f3326027d4463fb531273c8b42b4d8f6fabba2d075e15e18eb2cb2a8c50 -#+s6-portable-utils.945ba0fbba6153923f5a761abc154568d30fc1db69b26f03ead9fe248f87d351 -#+s6-linux-init.30ee852e07291b5f3c94ed4037e403122037366bcc655a87f5527f1813332d62 -#+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a -#+system-config-rc.38183756d5943ddd931669373134d7954b79c7830585c84daee3e58cd918911b +#+s6.625d36f529cb11a792f72464c287123f3ba74c0307c4f91293811507ec390df4 +#+s6-rc.b356246ab14ce71be59e9cdc5dfca373b0c38c5b4bfc37899f379be01849a1bc +#+s6-portable-utils.ad8ffe8c50f21cb1a5e68432a843538ffed4c36cfea3a44045e43feef09c49bc +#+s6-linux-init.5b8d42d87162efd6b55396f493f876a871daeb3e45c218e1347287db700179e4 +#+execline.7102a2ddde68a289705375865c9485103ebfb43724ca3335656c868e46e161d7 +#+system-config-rc.2828d900092b3d942fe86ca1158dd88690fe53f285e5cbb219fbcb88616ed8e6 # - build script start - @@ -32,7 +32,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/home/ccx/versions/system-config-rc.38183756d5943ddd931669373134d7954b79c7830585c84daee3e58cd918911b/config/s6-rc-db +s6rcdb=/home/ccx/versions/system-config-rc.2828d900092b3d942fe86ca1158dd88690fe53f285e5cbb219fbcb88616ed8e6/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 @@ -3,9 +3,9 @@ #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 -#+s6-rc.77ee4f3326027d4463fb531273c8b42b4d8f6fabba2d075e15e18eb2cb2a8c50 -#+fileset.c9ce28ff816e023243d76d1bcb4d2b732f6b1f89c0cb9df15c1fd73880896a07 -#+system-config.85b18497c63d417c4ef6c827c477b314bc8161032a21c57b6340cfb5d9d9aa3a +#+s6-rc.b356246ab14ce71be59e9cdc5dfca373b0c38c5b4bfc37899f379be01849a1bc +#+fileset.0738b332782461b91070e25524a61bd78594c82b249ef0c0c75e93ff78c92c26 +#+system-config.163670701ea1bf9323c5e2551137213fd086b1fdf5adb9522a3376d5f23e9024 # - build script start - @@ -15,7 +15,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/home/ccx/versions/system-config.85b18497c63d417c4ef6c827c477b314bc8161032a21c57b6340cfb5d9d9aa3a/config/s6-rc-source +src=/home/ccx/versions/system-config.163670701ea1bf9323c5e2551137213fd086b1fdf5adb9522a3376d5f23e9024/config/s6-rc-source s6-rc-compile ./s6-rc-db "$src" mkdir -p "$dest/config" mv -v s6-rc-db "$dest/config/" diff --git a/variants/ccx-x86_64/system-config-scripts b/variants/ccx-x86_64/system-config-scripts @@ -2,8 +2,8 @@ #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b -#+zsh.7a73a1599d87b3e354a0e58e4119f89b71fb053e261e36802af49d80ce8d9ba1 -#+pthbs-banginstall.47e87f044eea270225da61ee7d709e01b2e6385fee494566c647cddac19e0592 +#+zsh.6b63a085e8fb430ea9a23e76bc73e3c5eabe03f82f9be10ae52fd1102173a4c2 +#+pthbs-banginstall.0e5a2b80e893a0efd6aa82c61fbba54954641ddcffbbbbda089c86e46c8c6d7f #@git:dc793695cc0632a808af9d4415f3b0cf0f4dfba2:system-config-scripts diff --git a/variants/ccx-x86_64/system-config-zsh b/variants/ccx-x86_64/system-config-zsh @@ -2,7 +2,7 @@ #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b -#+zsh.7a73a1599d87b3e354a0e58e4119f89b71fb053e261e36802af49d80ce8d9ba1 +#+zsh.6b63a085e8fb430ea9a23e76bc73e3c5eabe03f82f9be10ae52fd1102173a4c2 #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh diff --git a/variants/ccx-x86_64/user-env b/variants/ccx-x86_64/user-env @@ -2,8 +2,8 @@ #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b -#+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a -#+pthbs-banginstall.47e87f044eea270225da61ee7d709e01b2e6385fee494566c647cddac19e0592 +#+execline.7102a2ddde68a289705375865c9485103ebfb43724ca3335656c868e46e161d7 +#+pthbs-banginstall.0e5a2b80e893a0efd6aa82c61fbba54954641ddcffbbbbda089c86e46c8c6d7f #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment @@ -1,42 +1,42 @@ #!/usr/bin/env pthbs-build #+busybox.47c820e8cf3f700bf5b693d7d379272d485e5078b2036912ce2e01bb998caf1f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+diffutils.70f9ddaec27568b14a011789f3c6c51ee4b849637a2b8ea9dc8f6685a646c3cf -#+patch.71865adfe1b1a83862c182902ff3bf77fcce6168cde6b35cd59fd5a85916e7c8 -#+flex.d82e65569a261bd6140e6daafad40475f4c37a706fdaac7048bdf24d7200b63c -#+bison.9264e348887dcc4943fb8b8a49bbf2462e53852ce4d782bc1ad95513eb225240 -#+rsync.55276833e2833a1041e73acab778feec8f1e456f1010a6c3b02379bcdde02d39 -#+execline.749fa9922ca7a4c505ca1b2c001625d161085c37c5ea75585fbddb321558157a -#+s6.aba44e80074ee5ae8921a773c04c3f2433945ad5566cb986e3edc5fe5c5600cf -#+s6-rc.77ee4f3326027d4463fb531273c8b42b4d8f6fabba2d075e15e18eb2cb2a8c50 -#+s6-portable-utils.945ba0fbba6153923f5a761abc154568d30fc1db69b26f03ead9fe248f87d351 -#+s6-linux-utils.664dc33ed8e500126bfb4e74c565990e8632879b9e165b09f7f48ac054c89a22 -#+s6-linux-init.30ee852e07291b5f3c94ed4037e403122037366bcc655a87f5527f1813332d62 -#+mdevd.f93eb2eff2928fd4618a959255b19e6a01e056a6a9287ce5d1a3bce89eca1a15 -#+s6-dns.d0134713eb4f2fa10036f492ca4dc945e2188a8b648a78fcd8bb085a5bd627d4 -#+libressl.3c695ed4a79eb6a22d402fd9c9aff21db481385d7f2281bb02d7e92dd931b894 -#+s6-networking.f4a78285871a0559cd61c17855bc3d610f4b5a77c67fdc93418d599d0af1c207 -#+zsh.7a73a1599d87b3e354a0e58e4119f89b71fb053e261e36802af49d80ce8d9ba1 -#+pthbs-banginstall.47e87f044eea270225da61ee7d709e01b2e6385fee494566c647cddac19e0592 -#+aat.ce323557b768bcc986fbb1557fda1309637474ccd8b9b5e4c4a56ba56634d75a -#+confz.f5eca9ab19f09818cfcd46267b61b488344983b0931114b597ad1238173fafcf -#+containers.71cd98edff323c709e1644584725e983519b8568fb09a672e38bea5a8241a412 -#+fileset.c9ce28ff816e023243d76d1bcb4d2b732f6b1f89c0cb9df15c1fd73880896a07 -#+logincaps.de7defec936b2f4498a2010578eb507abfa6f48d6c51d0b64a9ada67cce50335 -#+snaprep.c16cd20ecb28f90d83b6963a32a6f01f964fe5b99e75d7f3d9f0d2258899c26a -#+curl.10fc879ea14256ab6e511319c63f19da974300ecbf2fadf3e3ccc2c6e77c9994 -#+git.e9d3f4c1010863e3b73ab7d33d013793a4839e989361dda16178e2b118595292 -#+xbps.c27da8d06944b4584d922e84f3587e0507b59fb9b0bfd799d883551514b2ca24 -#+apk-tools.45eb1e70cdc4977e1c9c965f392b2a54e7b1b77485fdaf695d381dd062842d18 -#+getent.2608d23855b8d871fc65438dcc9889a93095bf0131f55045e517e037243898f1 -#+getconf.3f6e9e56867c13fc1f1bc3a95e692c675500944f94bd0726e34ee010d8213697 -#+iconv.0618baa01d98a1805b5ff362de984adfca782727cfe5335327341c376a8c3602 -#+libcap.edaeb61cf445dc9f4a4f1af73ab3d5994f08fac16339e75cf84c713b1079eb3d -#+applyuidgid-caps.7ac897e14684b8eebb110eded4e7759c67326a1c20b8ff62e1ada4176333e191 -#+ccx-utils.ff0ba3fc3db06a0bbee9cfc410b7894b7d06c158e35b01162f46f6ece9e2dbdf -#+user-env.9b736d39c3f3ad6e2d5d7e1d3fb52d8c5667c48474062ce09c784c59edacacc6 -#+strace.24f817d87229531d5a2218f804224619ed7635b8f847c96ccb8f8926478b144a -#+mlog.d3f90010a808d81d0e4e26efefd0b2325b395fd1b011f1d94cdc0be1cb017339 -#+findutils.c80b9056e275f82f7d371a44035a3c11dd43faae948a696f9cea0cd681b76aef -#+nawk.24907cbb8100b37ab37723f0335e79103b0135b8ae6175e179b145bbdbe500e0- \ No newline at end of file +#+diffutils.e5d06cd01c742b4b6c5db456bec49ade715434e5e2aa6a3ef101624dd68b6440 +#+patch.97db9b3af6da753a37f8e2c51e40bb6859d59b9dfa7c32721f2af46af7af6ab9 +#+flex.44889b89a099e11ac990e3db40775f475338eecd842544a636ebe8aead049fe4 +#+bison.4a6e2f26c0b4a0d290e11aa67b8f9b39316d4080d4bebb9155b73857c5106d94 +#+rsync.91987802551ee2b2b6334d296d73611d5eee5d5c256b74d628baa3eaba756de8 +#+execline.7102a2ddde68a289705375865c9485103ebfb43724ca3335656c868e46e161d7 +#+s6.625d36f529cb11a792f72464c287123f3ba74c0307c4f91293811507ec390df4 +#+s6-rc.b356246ab14ce71be59e9cdc5dfca373b0c38c5b4bfc37899f379be01849a1bc +#+s6-portable-utils.ad8ffe8c50f21cb1a5e68432a843538ffed4c36cfea3a44045e43feef09c49bc +#+s6-linux-utils.bc7b18719bad23f61b1629e4fc76aead7b5605a39f91167d8d84724e0cbc5e1c +#+s6-linux-init.5b8d42d87162efd6b55396f493f876a871daeb3e45c218e1347287db700179e4 +#+mdevd.539bd0d22229d122851685067b8138fd1e185932d1dce8b8c2a7f1167e8ac7b6 +#+s6-dns.00bb0cc6f8e4b99a0d8cdcb309f786cdf1083f8dc9d941d7826c8d419f832924 +#+libressl.efc62a6b7a2137db880f4deaa627c73d4aa514afee60f3eba7edae55f01d3a6e +#+s6-networking.1f70214c326bc27c4edf05628811b81e896631b685f0a20b1b95673e89097358 +#+zsh.6b63a085e8fb430ea9a23e76bc73e3c5eabe03f82f9be10ae52fd1102173a4c2 +#+pthbs-banginstall.0e5a2b80e893a0efd6aa82c61fbba54954641ddcffbbbbda089c86e46c8c6d7f +#+aat.41652cfbe25a63941ef5282514525b44b03924f9fa4b8e45d2ed55cf066d583a +#+confz.58e59eb9b56c335f5dbac869762f270def5275f4565f4bca0be98ba13258424e +#+containers.1f1168beeda21e7ecef08b58c90b4c2ee8c6a504c6c98a6773ef30d6eb4e3d87 +#+fileset.0738b332782461b91070e25524a61bd78594c82b249ef0c0c75e93ff78c92c26 +#+logincaps.b2cf373b3a33dcddc0b49513d5267b0cdb62398d981980b7f5b17785b86c80f8 +#+snaprep.8e3f3f8ea2f652a5b10054b20afabb44657f0dad7f61683ed829139be3c1540d +#+curl.9512d6f6434ca272462728d4299c0ed2a7fb62f79332786b24269a4216732004 +#+git.9f73a2be3b4e5a8eb22680c1b811c7960a7e3da28ee7afff24fb3f30c2edf43b +#+xbps.7eb9038a37545d90425cd98fab7368dc62d656e9de8794f6ceafe8f0f1ffc4f1 +#+apk-tools.8f5eb8ed32584ba1b9078546daef5673744710cd5d6e3bb155d4c4176f004a53 +#+getent.a12dbfe5f56d8b7d474f01e771ee6caf8d94908ea3459893bebc439a7109bbf2 +#+getconf.1756f266a6e2a6ba1d5264b7a0048bea66e45f80640e68aa284a621762525702 +#+iconv.414ce06d073f7ed9a7baf71df47e49500d988513bf54f911ecc6e8d4edd51265 +#+libcap.8ea1aca238a835f7e432168b9794acc09a0d347707cad11bedcf175460f8c2b1 +#+applyuidgid-caps.a4054c3251686fa49ab0aad881c33fa8f06e0303446c23f37eea0eed795a4cf7 +#+ccx-utils.7400a7804843609bdd3fc324748fd667d7e0b8a989ca92ce673eedb0baa2a1fd +#+user-env.cdc65f1a5de402b316b76fe01287e2cd2e3feb9a86e66e0023e714eb3dc538ff +#+strace.5c717cf4161a8ad928956a03727247428a348e72a94c89a32ad7bc2a7028bcf8 +#+mlog.2661b2d7c965bf9b955f31d9d9fcc3fdf1cbbfd8241c9fb54559f9626c77cb3b +#+findutils.b97995c4629ad45a8c7cd488c649f6c6487560d6eadc10ba5ca62f7f5d47fd1e +#+nawk.7a55f56635e44d1ae3762e2754ec61a73445bafd872483e4638f1de2e9f606c5+ \ No newline at end of file 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.58dd6f6db9c32506ed2a9d4e13e50e6292e0f28948c32dbbf739f570b753e544- \ No newline at end of file +#+linux-qemu-guest.fe42380c34918eb439180c9046386ce9c898ddce4c7e64d917eaa7672b9d5e45+ \ No newline at end of file diff --git a/variants/ccx-x86_64/wip.environment b/variants/ccx-x86_64/wip.environment @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+ocaml.25730b05a968e5472a0458d040d5a52a7eee2d5b896231dc9476f51117cb7c5c -#+dune.95e79141951a0ed8626725d477afc2556a97139825690b09c4ba5c426a94db82 -#+ocamlbuild.3965330991d47b95832c993da7654e0c85f89a9fd9d6079083273e12ac1cc3d7 -#+ocaml-base.935a1842287460ddf06414d800522f3558f6d6d93f8dbf54a4d5f32c944cf1cd -#+opam.56b929a1d2f88d4acd319f6392f65aa57f7cb995e7b68b7d1e2e10fa46703e9f -#+ocaml-bos.838a2876af51c510c831e09c46d62a7cc3c4567fcc6090425ae67871bab4532f -#+ocaml-lun.9907a4b964ce3124733878c99f87b7ee5dba1a20fe3f7834be0a5683aa1786f2 -#+ocaml-ppx_deriving.6dea1f1c1d50444f12701b8e0624afbf7eafbc6001177f0b54ef89a1382e2d7d- \ No newline at end of file +#+ocaml.eb2fa13dbb1e9c7f988614c422df383e298fe03cec280e0cf9fac98916268acc +#+dune.0c68d39f56de1bb838f9fc9dcd16012f870284de159e0c477adceee29c80e4a2 +#+ocamlbuild.8971011fba6095b2813ffeeebefd2e6699ae94722ab20dedd4933174c28f24ef +#+ocaml-base.354566737cdcb8bd6775fa6d1d7c0fbf65f3b020ec328cfbccc8a23352cf03ba +#+opam.d779b518acd197b63b103c101d4d98df816c154a2dbafb3d901b53f5aef80931 +#+ocaml-bos.f187fb27f49e19acc1c00d5ca407b536149e2aad3361c4e4a8ec453cead01563 +#+ocaml-lun.3a2e219cc6d64f7a01ee48777dde48dcfe24d67c89dff24de6a586882efd7ebf +#+ocaml-ppx_deriving.30b1fac96e97d10aa791bfd41848f1124d1bc5452e0c692ac4be56f34e85fb14+ \ No newline at end of file diff --git a/variants/ccx-x86_64/xbps b/variants/ccx-x86_64/xbps @@ -3,10 +3,10 @@ #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+libarchive.0ca4db115d929056aa3588b2f3b3ad24c8189c10ad71a6c0189aac4a802b9a66 -#+libressl.3c695ed4a79eb6a22d402fd9c9aff21db481385d7f2281bb02d7e92dd931b894 -#+pkgconf-pkg-config.24aef2bf062e9dcad4159c34e3c2bb58ca9b4c1021a7a5a2189fa5193c81b2a8 +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+libarchive.93f5241c38f8906e45cb0b9c5922ad7703834095abf5d4977d31b3ec7a231b4d +#+libressl.efc62a6b7a2137db880f4deaa627c73d4aa514afee60f3eba7edae55f01d3a6e +#+pkgconf-pkg-config.e7fd6597cfea40d34e9b0d1b64327af359bce05efe2c33294eba57134eaa99ff #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:. @@ -25,6 +25,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/zsh b/variants/ccx-x86_64/zsh @@ -4,10 +4,10 @@ #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 -#+m4.dc120fc43dc1cb22ba9ebbaf5639f6c7fa9f159e361a84b6ebfbdacb3fab058d -#+netbsd-curses.f9c6320015f13dcaadbffabc70b81116260eb7c69cb8f99dd372543a6e64ee79 -#+libbsd.051887d3f089d8787f77bb6349b181c051512a9acb9e5238f162b4bf266873dc +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 +#+m4.66d25b84c09f00d05fda77de9a81a8dff3bec716f8e32554e5b7a548c50613a2 +#+netbsd-curses.602505ed434c46abbdf43553127f96497f63866c823d5e45cdede00f3ffa29bb +#+libbsd.fc6cf895cfe527961b90b4255827c030ea0a6e81d39e798e9d2a09cd82462b90 #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:. @@ -51,6 +51,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/ccx-x86_64/zstd b/variants/ccx-x86_64/zstd @@ -3,7 +3,7 @@ #+busybox-findutils.79fab8ce17646e27c958348822c367903ddbef44dcebb134d16caa4fc287b716 #+busybox-awk.6efe6e8726ffa7c47dc117be114219675ccea315e4e29685e40a06b61d249f9b #+musl-cross-make.e4735d8572f9b6654a7381ebdfbd62e665d1d1da5e06a56923e89274cc6a510f -#+gnu-make.7f18f735a456d2fbe052b2605010941e48ce678fe79a65937be1769e87197062 +#+gnu-make.75a726f6c19f7bc10b95a84da3ce72fb785ebdf587504430c6b74cfb6610b728 #+busybox-diffutils.f40ac7713836b6eaa4e46db3b7577b533f4738fb10bf732edc044ffc48eb9ec8 #@untar:-z:sha256:98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1:. @@ -23,6 +23,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/aat b/variants/root-x86_64/aat @@ -2,8 +2,8 @@ #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b -#+zsh.86584889aa0a3af405974c69ab43869f82e00acdba5340528e5dd20757f7dfc8 -#+pthbs-banginstall.0442e58611ea2fc27a0a57a4c1b9b8696d799e9ebb737f3548553a61f845e34b +#+zsh.55516f3be847b82216df2719107cef2443e6ca78a25e640c91ce958a57ffefbf +#+pthbs-banginstall.47878a453e8bccc968de24b08fdb9ac896d016821936c4cb8974968875eadaa2 #@git:5ce6a6a1224101ce5b0dfec1544a98c94d233ae0:aat diff --git a/variants/root-x86_64/abduco b/variants/root-x86_64/abduco @@ -3,7 +3,7 @@ #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #@git:8c32909a159aaa9484c82b71f05b7a73321eb491:abduco @@ -23,6 +23,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/acl b/variants/root-x86_64/acl @@ -4,9 +4,9 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 -#+attr.a9b087e4d92be42039348bdc078230e7355573a392dd043b75e7032a8bb649db +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+m4.9191d0c69527b5e503257c2af7aeb2ec2dd614e9999de0c0006d481a62b59c1e +#+attr.00636383b29a71bdf2ca7c89e48e6608e245de0c1e4e570b13e6743ca6761d6f #@untar:-z:sha256:5f2bdbad629707aa7d85c623f994aa8a1d2dec55a73de5205bac0bf6058a2f7c:. @@ -49,6 +49,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/apk-tools b/variants/root-x86_64/apk-tools @@ -3,12 +3,12 @@ #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc -#+patch.1f7ab95c511ea31573c4b2e3338bd15925cd1b93631a0681388475e41678d93f -#+libressl.86f9dd5a8a3bb042d9561ef187d7fb64f9cc2be3bb707b9e171208bae5c684ef -#+zstd.38b14331a2c89a3fc5d568ddddc14918031315ba2a24b6ffa8bd874c6f54bbc1 -#+pkgconf-pkg-config.035ed72618fdde9058d87fb11cd6374080eef9927f78b0cd97cfc5afdfc21388 +#+patch.aaad0551089641f4c59cb166e6c41262d1a1b95ab18c52f4c02746951a141602 +#+libressl.2da188e728e941d7851e1179e85211e90620f9fb750b9fa064df2a87a6e590a4 +#+zstd.cab786b9c2ab7a9f45379d06b7c76011295a6725f374d1f5dbcd33e18df2bada +#+pkgconf-pkg-config.f468b6bdd77bccfc86d0814786e4a380f1370e89c2849de59ec2ef56fec84710 #@sha256:4b32a05f12c3d29befb210c88c415f7c7affd7e351b9e96b0cfde50773d22dbd:apk-tools.patch #@git:9d074efdc12bc41b5d24190595a5269a770e852a:apk-tools @@ -28,6 +28,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/applyuidgid-caps b/variants/root-x86_64/applyuidgid-caps @@ -3,8 +3,8 @@ #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+skalibs.a26d2e6f716163365561db4c61d78907be5ed9b34cfbc9d2475962029ba39aeb -#+libcap.e2f548b558f389ead47900a784150f4165c128f846d2cc0c6ef9b1ee7b3da249 +#+skalibs.7e1cc77f32e81bc7517dc10d6eaa7704bb89aaf6a4f35f88a9e400170aa93edb +#+libcap.538a4a5e4ae9be5d1981b0ca4f47d4d0943a441271c2ad94f62fb98b7b1f8201 #@sha256:818a5ad7061ab1a740a5c2e7d7d8cdcc7be7e84e3f04b479731cf94ff1f1d093:applyuidgid-caps.c @@ -23,6 +23,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/argp-standalone b/variants/root-x86_64/argp-standalone @@ -4,8 +4,8 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+m4.9191d0c69527b5e503257c2af7aeb2ec2dd614e9999de0c0006d481a62b59c1e #@untar:-z:sha256:c29eae929dfebd575c38174f2c8c315766092cec99a8f987569d0cad3c6d64f6:. #@untar::sha256:a4facc0856b512ad8ab5aed7b07e14a9629aaf042b1e92377ba22fcfc4c4205b:argp-standalone-1.5.0 diff --git a/variants/root-x86_64/attr b/variants/root-x86_64/attr @@ -4,8 +4,8 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+m4.9191d0c69527b5e503257c2af7aeb2ec2dd614e9999de0c0006d481a62b59c1e #@untar:-z:sha256:39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87:. @@ -48,6 +48,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/bison b/variants/root-x86_64/bison @@ -4,9 +4,9 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 -#+flex.a0b530df71023dab46f59c8c0a6255bae4c6e8e8d88087364e36fcc86318f41b +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+m4.9191d0c69527b5e503257c2af7aeb2ec2dd614e9999de0c0006d481a62b59c1e +#+flex.23f90e59737b0916506d7a180a53ad1ea620592ecff2d7e3aa8ece88c152af33 #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:. #@untar:-J:sha256:9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2:. @@ -50,6 +50,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/busybox:modutils b/variants/root-x86_64/busybox:modutils @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build -#+linux.386e6e56b5ea98ccc349ca95e462261faec3c211aa25775f83eab57222e6e95b +#+linux.0969663b3937c0dc4d55b25b0412de65b89c6067ba22085a3a34b987fa82dcbc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc @@ -18,6 +18,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" @@ -34,7 +35,7 @@ export CFLAGS="-D_GNU_SOURCE" export LDFLAGS="-static" # TODO: indirection via deps directory/symlink cat >>.config <<EOF -CONFIG_DEFAULT_MODULES_DIR="/versions/linux.386e6e56b5ea98ccc349ca95e462261faec3c211aa25775f83eab57222e6e95b" +CONFIG_DEFAULT_MODULES_DIR="/versions/linux.0969663b3937c0dc4d55b25b0412de65b89c6067ba22085a3a34b987fa82dcbc" EOF make oldconfig cat .config diff --git a/variants/root-x86_64/ca-certificates-wip-donotuse b/variants/root-x86_64/ca-certificates-wip-donotuse @@ -2,7 +2,7 @@ #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b -#+certdata2pem.f0b2fac8fc7f930557cceb3ec4d78266e37704500ed79582281e3b7169c4267a +#+certdata2pem.0328f942a730c1e8045b6fdb8ac04a0382907cd123ae6db260330635747d1bf6 #@untar:-j:sha256:6ef7bc56cc0e0b307d99a3c494119686091cc1d4ad08986d68aa089dd00c7788:. diff --git a/variants/root-x86_64/ccx-utils b/variants/root-x86_64/ccx-utils @@ -3,9 +3,9 @@ #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+skalibs.a26d2e6f716163365561db4c61d78907be5ed9b34cfbc9d2475962029ba39aeb -#+s6.344af4b89dee417e72484532005f0a223e20675a15daac49d498a554812bac61 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+skalibs.7e1cc77f32e81bc7517dc10d6eaa7704bb89aaf6a4f35f88a9e400170aa93edb +#+s6.825c2fd936a972faf7f4c21aa0d3b91760d4fe1acb0d80d94d71ab1ec5b0ae83 #@git:fae441e25a1ac266742ba6446b37ae56c8e57076:ccx-utils @@ -24,6 +24,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/certdata2pem b/variants/root-x86_64/certdata2pem @@ -21,6 +21,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/confz b/variants/root-x86_64/confz @@ -2,8 +2,8 @@ #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b -#+zsh.86584889aa0a3af405974c69ab43869f82e00acdba5340528e5dd20757f7dfc8 -#+pthbs-banginstall.0442e58611ea2fc27a0a57a4c1b9b8696d799e9ebb737f3548553a61f845e34b +#+zsh.55516f3be847b82216df2719107cef2443e6ca78a25e640c91ce958a57ffefbf +#+pthbs-banginstall.47878a453e8bccc968de24b08fdb9ac896d016821936c4cb8974968875eadaa2 #@git:c6aef8098d37a1773439117a5674bfc8662ef62b:confz diff --git a/variants/root-x86_64/container-bin-image b/variants/root-x86_64/container-bin-image @@ -2,14 +2,14 @@ #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+busybox-login.99677a70a44f3ccb53874476327aaa1f5824019b63fe7d5e7b744dc3a641d27e -#+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284 -#+s6.344af4b89dee417e72484532005f0a223e20675a15daac49d498a554812bac61 -#+ccx-utils.769c165236aa3bc0564901e48e65c035ab3d342564dd1a440a512347d62d4ce9 -#+applyuidgid-caps.d4cb37c46563dc1996e3faab76bc55168f85f449771a86fed5ad520ee406e07e -#+easyseccomp.e435513c7e6178450228944c131854969d922426b8f771675aaece6867e8625a -#+mlog.f9e7afa9325b4affd4298e6de0a07d22a074799f0ea7bda1e3fb58a37b98e398 -#+abduco.089653d0849acda0e1723469ed2913556b6b86a32056932b8f4069c5ceec76ae -#+nawk.8521bf13f53618b7897b7f2e070a506a0101c985f6b9bb527d5eb15d8e8d4858 +#+execline.b282f9d9ee24feffdf9ff72510c1471360d0819b0a4f7e9cf5a84679d066aa85 +#+s6.825c2fd936a972faf7f4c21aa0d3b91760d4fe1acb0d80d94d71ab1ec5b0ae83 +#+ccx-utils.c0ea397fa2cbbb6fa18bf57a54fe2b709e459c63481428b2c3df2464f098e641 +#+applyuidgid-caps.f17b0d1363162311100e1e04646bd4c15cdf6d36b216f54ba128dcf71309e65e +#+easyseccomp.957e8dd42eb65638073de6d25d66d8e1883ae3da5fabc073d0b94e7ab7f5ca12 +#+mlog.92af644369ffdc31db302c3777e519b54913ec535e87df1a4a775b98bd4f96c5 +#+abduco.b73e3625f91abd6dd74510eaaffa92c0b3ce23395f9daeb1619cf029d644d021 +#+nawk.8fa343bf9be41a9701620e63eced62e002ec008a1eeb1beb2ce7986e6d7351f9 #@sha256:b9236c0fd504ffbc56f65d0522d2acadcd2683380eaa6f1873e8201eaa7388a5:default-policy.easyseccomp img="$pthbs_destdir/versions/$pthbs_package/container-bin-image" diff --git a/variants/root-x86_64/containers b/variants/root-x86_64/containers @@ -2,13 +2,13 @@ #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b -#+zsh.86584889aa0a3af405974c69ab43869f82e00acdba5340528e5dd20757f7dfc8 -#+pthbs-banginstall.0442e58611ea2fc27a0a57a4c1b9b8696d799e9ebb737f3548553a61f845e34b -#+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284 +#+zsh.55516f3be847b82216df2719107cef2443e6ca78a25e640c91ce958a57ffefbf +#+pthbs-banginstall.47878a453e8bccc968de24b08fdb9ac896d016821936c4cb8974968875eadaa2 +#+execline.b282f9d9ee24feffdf9ff72510c1471360d0819b0a4f7e9cf5a84679d066aa85 #+alpine-keys.9903799b52320b5d6618a3e3c87cef9da76e3b5291abfe1fd563fddfd04f35ae -#+apk-tools.714e1cb8bc861dec1710a25476f209f7b0602d954f74194d58c16747c5a3ad38 -#+xbps.e7b102cdf29fa99c56eeacce8ade331896a379fad11189131b0d1efb4160a454 -#+container-bin-image.12735d6b897a23a53185b55d7ff7ae3142c371c1fb6a5c3d0e67c27bc66886da +#+apk-tools.d40e662b741fcd12dafc2570f34540c959f20672e7722f81e0dac942cc80e817 +#+xbps.c751a992d63d8aacc9f505cd6785d558c8d035ac64ab4d094a2fec116d76eb7a +#+container-bin-image.afbc85a5afb341b84bca7ef310344d54a748aa783eae156bd35715bfaaf184ca #@git:b2ba08f728a01a5bac734c823016be77035ab687: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.714e1cb8bc861dec1710a25476f209f7b0602d954f74194d58c16747c5a3ad38/command/apk.static' "${dest}/deps/command/" -ln -sf '/versions/xbps.e7b102cdf29fa99c56eeacce8ade331896a379fad11189131b0d1efb4160a454/command/xbps-install.static' "${dest}/deps/command/" +ln -sf '/versions/apk-tools.d40e662b741fcd12dafc2570f34540c959f20672e7722f81e0dac942cc80e817/command/apk.static' "${dest}/deps/command/" +ln -sf '/versions/xbps.c751a992d63d8aacc9f505cd6785d558c8d035ac64ab4d094a2fec116d76eb7a/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.e7b102cdf29fa99c56eeacce8ade331896a379fad11189131b0d1efb4160a454'/keys/void/*; do +for f in '/versions/xbps.c751a992d63d8aacc9f505cd6785d558c8d035ac64ab4d094a2fec116d76eb7a'/keys/void/*; do ln -sf "$f" "${dest}/deps/keys/void/" done -test -d '/versions/container-bin-image.12735d6b897a23a53185b55d7ff7ae3142c371c1fb6a5c3d0e67c27bc66886da/container-bin-image' -test -f '/versions/container-bin-image.12735d6b897a23a53185b55d7ff7ae3142c371c1fb6a5c3d0e67c27bc66886da/container-bin-image/if' -ln -sf '/versions/container-bin-image.12735d6b897a23a53185b55d7ff7ae3142c371c1fb6a5c3d0e67c27bc66886da/container-bin-image' "${dest}/deps/" +test -d '/versions/container-bin-image.afbc85a5afb341b84bca7ef310344d54a748aa783eae156bd35715bfaaf184ca/container-bin-image' +test -f '/versions/container-bin-image.afbc85a5afb341b84bca7ef310344d54a748aa783eae156bd35715bfaaf184ca/container-bin-image/if' +ln -sf '/versions/container-bin-image.afbc85a5afb341b84bca7ef310344d54a748aa783eae156bd35715bfaaf184ca/container-bin-image' "${dest}/deps/" diff --git a/variants/root-x86_64/containers.environment b/variants/root-x86_64/containers.environment @@ -1,20 +1,20 @@ #!/usr/bin/env pthbs-build #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc -#+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284 -#+s6.344af4b89dee417e72484532005f0a223e20675a15daac49d498a554812bac61 -#+s6-portable-utils.07e8ff4d2d45a743ec810d3e27268460d201bafbb0a765756da09179758d4b0d -#+s6-linux-utils.2e5ac9209104c458e8935a4b4e9ce3ed6e9aa3e6c4d85675a1e945d1fe77530f -#+zsh.86584889aa0a3af405974c69ab43869f82e00acdba5340528e5dd20757f7dfc8 -#+confz.953faaabf2a7a6ab4aa9b374f83addbcc1ba98bfa195cf8cc9cb2fcb2595ffdb -#+containers.e523e49b939faba9a6f87694d6888765c3506d2484fde2227349e35bbcf41394 -#+xbps.e7b102cdf29fa99c56eeacce8ade331896a379fad11189131b0d1efb4160a454 -#+zstd.38b14331a2c89a3fc5d568ddddc14918031315ba2a24b6ffa8bd874c6f54bbc1 -#+apk-tools.714e1cb8bc861dec1710a25476f209f7b0602d954f74194d58c16747c5a3ad38 +#+execline.b282f9d9ee24feffdf9ff72510c1471360d0819b0a4f7e9cf5a84679d066aa85 +#+s6.825c2fd936a972faf7f4c21aa0d3b91760d4fe1acb0d80d94d71ab1ec5b0ae83 +#+s6-portable-utils.e7aa5bc9d2f2f5ff49678a2579f7a6d1a5442871b7c69a81060d20118c9fd331 +#+s6-linux-utils.588fdfd1940fc620f1f3d0bb0e9c45ae9ac9d52160ba8896dc553060d0909527 +#+zsh.55516f3be847b82216df2719107cef2443e6ca78a25e640c91ce958a57ffefbf +#+confz.2d770247c8db0a8e9584790027f1660ada8cd61f289ed17e9b7e1c180a71f7cf +#+containers.9f88a776ab0eadd3df4319a921acc45df401ebb3debe3312c0bc0cae483d7b7e +#+xbps.c751a992d63d8aacc9f505cd6785d558c8d035ac64ab4d094a2fec116d76eb7a +#+zstd.cab786b9c2ab7a9f45379d06b7c76011295a6725f374d1f5dbcd33e18df2bada +#+apk-tools.d40e662b741fcd12dafc2570f34540c959f20672e7722f81e0dac942cc80e817 #+alpine-keys.9903799b52320b5d6618a3e3c87cef9da76e3b5291abfe1fd563fddfd04f35ae -#+getent.219406db8d31c860d8fb9052a1158f072c8b77ef4d1b71ef24e5fcc649201521 -#+fileset.8d3627d93e7b4c33483589e8602b462d3fcd31d6f38adde5ee53c024197c7286 -#+ccx-utils.769c165236aa3bc0564901e48e65c035ab3d342564dd1a440a512347d62d4ce9 -#+easyseccomp.e435513c7e6178450228944c131854969d922426b8f771675aaece6867e8625a -#+findutils.1edbb84f016e9dc61540b8396e85a2163570b9281a408f8787f17e404f685ce0 -#+nawk.8521bf13f53618b7897b7f2e070a506a0101c985f6b9bb527d5eb15d8e8d4858- \ No newline at end of file +#+getent.fe07497583b34512d19c03ae6808b82a21e66e40b257254c1ed7b8bc5065e8ec +#+fileset.29f2264850fdb33fdd55b943c8effb3928bda1bf97901c5464faa1bba70b0f72 +#+ccx-utils.c0ea397fa2cbbb6fa18bf57a54fe2b709e459c63481428b2c3df2464f098e641 +#+easyseccomp.957e8dd42eb65638073de6d25d66d8e1883ae3da5fabc073d0b94e7ab7f5ca12 +#+findutils.8fb6b0f98e900ae929a7a697bf0283f8c78df0571b5c508fd68b74aeea3eb750 +#+nawk.8fa343bf9be41a9701620e63eced62e002ec008a1eeb1beb2ce7986e6d7351f9+ \ No newline at end of file diff --git a/variants/root-x86_64/curl b/variants/root-x86_64/curl @@ -4,9 +4,9 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 -#+libressl.86f9dd5a8a3bb042d9561ef187d7fb64f9cc2be3bb707b9e171208bae5c684ef +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+m4.9191d0c69527b5e503257c2af7aeb2ec2dd614e9999de0c0006d481a62b59c1e +#+libressl.2da188e728e941d7851e1179e85211e90620f9fb750b9fa064df2a87a6e590a4 #@untar:-J:sha256:3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15:. @@ -49,6 +49,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment @@ -1,48 +1,48 @@ #!/usr/bin/env pthbs-build #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+diffutils.dbe0e2258153174e9bde5107bab7a436d8c4d8b88e9d74f35eb72b67cfc73148 -#+patch.1f7ab95c511ea31573c4b2e3338bd15925cd1b93631a0681388475e41678d93f -#+flex.a0b530df71023dab46f59c8c0a6255bae4c6e8e8d88087364e36fcc86318f41b -#+bison.50a879da42f360f6a461ecb3eaafaed1ee77389f064b469614f27328bbd15e44 -#+rsync.a3914e6a58e85cc838ef8c8cda9ec4ba6e49cdd7376d09a2d0c6b072c656c3e7 -#+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284 -#+s6.344af4b89dee417e72484532005f0a223e20675a15daac49d498a554812bac61 -#+s6-rc.9416ba0fe405fc2a019beeee1b35a666324184886c12b89deb929c515ca06183 -#+s6-portable-utils.07e8ff4d2d45a743ec810d3e27268460d201bafbb0a765756da09179758d4b0d -#+s6-linux-utils.2e5ac9209104c458e8935a4b4e9ce3ed6e9aa3e6c4d85675a1e945d1fe77530f -#+s6-linux-init.e17bf07f726729c579bb12c1d25dad4bb263f96509f7ea852bb44d50737d0b4d -#+mdevd.0502ff0a0d6e4f3b58469d0d3aef8816631718d5375ec0d41913dfa9121590fb -#+s6-dns.66def5b5ecaa018779d26f6f341b8477f6e2ef8e6aee5e4f30e2f4ee36d59299 -#+libressl.86f9dd5a8a3bb042d9561ef187d7fb64f9cc2be3bb707b9e171208bae5c684ef -#+s6-networking.2e3a2b62476afed6b35e208fda1dfb764dc27b8319ec876411dcdb0c8e3bdc3e -#+zsh.86584889aa0a3af405974c69ab43869f82e00acdba5340528e5dd20757f7dfc8 -#+pthbs-banginstall.0442e58611ea2fc27a0a57a4c1b9b8696d799e9ebb737f3548553a61f845e34b -#+aat.1a24f86810721d21e38b938be940549908121eb386821cded1a27ac973c8d47e -#+confz.953faaabf2a7a6ab4aa9b374f83addbcc1ba98bfa195cf8cc9cb2fcb2595ffdb -#+containers.e523e49b939faba9a6f87694d6888765c3506d2484fde2227349e35bbcf41394 -#+fileset.8d3627d93e7b4c33483589e8602b462d3fcd31d6f38adde5ee53c024197c7286 -#+logincaps.507ec1380a0988547542ae0ad146daffd92e08ab8faf964323c28f430edcc406 -#+snaprep.756763e7b0d2cc247a6b4a517b1d1eca3cb04cbfbfef374541079c63f0c896c8 -#+curl.718c045c064f1e9fd5a7c71f50384345e35e1fc80e3ae7fdacadce73454dd3e7 -#+git.96c05646b93e3a672c5591f704106d3f6fea912d796cd0df6abd655b243d86eb -#+xbps.e7b102cdf29fa99c56eeacce8ade331896a379fad11189131b0d1efb4160a454 -#+apk-tools.714e1cb8bc861dec1710a25476f209f7b0602d954f74194d58c16747c5a3ad38 -#+getent.219406db8d31c860d8fb9052a1158f072c8b77ef4d1b71ef24e5fcc649201521 -#+getconf.a13baa310359caefe186a823f0386190b6286fccf30aaf8301e115f3dc973d44 -#+iconv.7afe835f0a03884e71f41bd2a96a88e9e1e73233137cb94da9f73a6721ed3001 -#+libcap.e2f548b558f389ead47900a784150f4165c128f846d2cc0c6ef9b1ee7b3da249 -#+applyuidgid-caps.d4cb37c46563dc1996e3faab76bc55168f85f449771a86fed5ad520ee406e07e -#+ccx-utils.769c165236aa3bc0564901e48e65c035ab3d342564dd1a440a512347d62d4ce9 -#+user-env.f9ab8060b8c6970d3b785694ef1f839f47c9eb31a0c13c0529f365583552db01 -#+strace.f67bc48859477eb362b356c2f4fd4d3a6a38fb3d32969338ec7f87dd48634904 -#+mlog.f9e7afa9325b4affd4298e6de0a07d22a074799f0ea7bda1e3fb58a37b98e398 -#+findutils.1edbb84f016e9dc61540b8396e85a2163570b9281a408f8787f17e404f685ce0 -#+nawk.8521bf13f53618b7897b7f2e070a506a0101c985f6b9bb527d5eb15d8e8d4858 -#+system-config.6a7b108b1c4f4d1c71e2d43fceac30f1724e4728968395c0ffae119375b68524 -#+system-config-rc.f195ae3ca842cf1421012883b80b03e2d31c16ea2445a4899365620f1de0eebd -#+system-config-scripts.c533391a1fcb035cbc2e4bad71f1dc5c40ed8b2c37d0dcd2cc7929c1dea80b5f -#+system-config-init.7fc2b1ce3fcf08657fc7c687eac63f0158adf59ca2d33aa594e59416b2916aa0 -#+system-config-zsh.62c3518c0b26bb74a5913e7c6a89e60e0ac9ac138cddde75a74828713d3b7b37 +#+diffutils.566986f3321e239718d1356b3131c82833ade565b9c1a5d0dfe1b03be65f5701 +#+patch.aaad0551089641f4c59cb166e6c41262d1a1b95ab18c52f4c02746951a141602 +#+flex.23f90e59737b0916506d7a180a53ad1ea620592ecff2d7e3aa8ece88c152af33 +#+bison.5aa6c06f7231813e87b8417220b93d58ff09fbde70b348f781fb42aec2880251 +#+rsync.88a1ff8658f8a443a45b185c6099a3859966230ecb535a1c230f48fd9b74d6d0 +#+execline.b282f9d9ee24feffdf9ff72510c1471360d0819b0a4f7e9cf5a84679d066aa85 +#+s6.825c2fd936a972faf7f4c21aa0d3b91760d4fe1acb0d80d94d71ab1ec5b0ae83 +#+s6-rc.83be9ae6e6fe5025f446343c23fc8eb904149ef477f419387ee7bd6c5484d9fa +#+s6-portable-utils.e7aa5bc9d2f2f5ff49678a2579f7a6d1a5442871b7c69a81060d20118c9fd331 +#+s6-linux-utils.588fdfd1940fc620f1f3d0bb0e9c45ae9ac9d52160ba8896dc553060d0909527 +#+s6-linux-init.a5c1bae8bc5bfa54917a4f0119b268f52011a033f8583060487bc3e9dd8cb1e8 +#+mdevd.ea411dccb9b77c3d6a37830552fef579006b94a4b56f0c975f78dcf713698f75 +#+s6-dns.00c6e1080440c8475c0ec8bed3070199c9a2a9ec293cc0d2afbd233e720dfa47 +#+libressl.2da188e728e941d7851e1179e85211e90620f9fb750b9fa064df2a87a6e590a4 +#+s6-networking.c4474f16c30a09046f30e379d46c286f20d510be09dc74264337a2a2ee3a0bc6 +#+zsh.55516f3be847b82216df2719107cef2443e6ca78a25e640c91ce958a57ffefbf +#+pthbs-banginstall.47878a453e8bccc968de24b08fdb9ac896d016821936c4cb8974968875eadaa2 +#+aat.c426f699aac42c85b0b49c87fa06dc27e1a84210d66104421126c14279dd89f3 +#+confz.2d770247c8db0a8e9584790027f1660ada8cd61f289ed17e9b7e1c180a71f7cf +#+containers.9f88a776ab0eadd3df4319a921acc45df401ebb3debe3312c0bc0cae483d7b7e +#+fileset.29f2264850fdb33fdd55b943c8effb3928bda1bf97901c5464faa1bba70b0f72 +#+logincaps.865774a46882681cabdb0667c312f750c4cc19401b8a51eaba1207ffc4f8b39e +#+snaprep.a83757ac0cdf2238775d5d5510aaa3b41ab720da2d94e58fcd97c07d79c5bf4a +#+curl.1396e916eb30f88da26b2eeb0ef68399956d9795553abd3ad852b482e03a954d +#+git.17eb39bfdebfff1476f0c165b6cb307d201a158fc27205fd9b5dfd78815aadd6 +#+xbps.c751a992d63d8aacc9f505cd6785d558c8d035ac64ab4d094a2fec116d76eb7a +#+apk-tools.d40e662b741fcd12dafc2570f34540c959f20672e7722f81e0dac942cc80e817 +#+getent.fe07497583b34512d19c03ae6808b82a21e66e40b257254c1ed7b8bc5065e8ec +#+getconf.0d39c75a75e6b938e367a7c53998e6c38a20cf8bf46407cab3bf765e512e5cfd +#+iconv.3bba9aeadf167fae13cd8b021cc229d3f5425c9a17cb86a66d73666d471c9136 +#+libcap.538a4a5e4ae9be5d1981b0ca4f47d4d0943a441271c2ad94f62fb98b7b1f8201 +#+applyuidgid-caps.f17b0d1363162311100e1e04646bd4c15cdf6d36b216f54ba128dcf71309e65e +#+ccx-utils.c0ea397fa2cbbb6fa18bf57a54fe2b709e459c63481428b2c3df2464f098e641 +#+user-env.c3c2ae10ea1310e3e9e2bf7c1cfdaf61c2f1f824bae5cd4baf4b4540c3881477 +#+strace.19444191f6ab164a01b3304017ed278635f340205b1d28fa6d3c7e2d5227167a +#+mlog.92af644369ffdc31db302c3777e519b54913ec535e87df1a4a775b98bd4f96c5 +#+findutils.8fb6b0f98e900ae929a7a697bf0283f8c78df0571b5c508fd68b74aeea3eb750 +#+nawk.8fa343bf9be41a9701620e63eced62e002ec008a1eeb1beb2ce7986e6d7351f9 +#+system-config.597773922b4d29324e535e8c23a640fe86f313f1a8808d43fe4dbd7b73136452 +#+system-config-rc.a019fae4bf4f0dc7481fc6ada3a90c94a4b7bccc4b4bcfe8cfe332602be30406 +#+system-config-scripts.9324b5eb412564369d5960e3db212e690260eee2e236e72668832ec6e4ef66ba +#+system-config-init.b70a0d4fa2f3f1bc412c2e128817957872b8b08d38d9f7ff10e13549a020acdc +#+system-config-zsh.5797d5475f08ef8cece41a1861d590a441ffcb97afe7c6e3f027e830077c9fe9 #+busybox-modutils.ebb7b2cc2e280cc5c68f2c7ccd8dd75304de57061e314de8459057fb2b7c0209 \ No newline at end of file diff --git a/variants/root-x86_64/diffutils b/variants/root-x86_64/diffutils @@ -4,8 +4,8 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+m4.9191d0c69527b5e503257c2af7aeb2ec2dd614e9999de0c0006d481a62b59c1e #@untar:-J:sha256:90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e:. @@ -48,6 +48,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/dune b/variants/root-x86_64/dune @@ -4,7 +4,7 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.8c21f24d07485e61cf270c6f08b4835b300c5bbed438c00d4a15da7c4c310a82 +#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b #@untar:-z:sha256:579c738f8ca191ba0a9b22dbe78f1377542442c9827cf4939f8964f09f9edb28:. @@ -17,11 +17,20 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + case $interp_info in + ('') + printf '%s\n' "Error: '$1' is not a dynamic binary!" + exit 1 + ;; + (*'/versions/musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') + return 0 + ;; + (*) + printf '%s\n' "Error: '$1' unexpected linker path!" + exit 1 + esac } @@ -62,7 +71,7 @@ rm -vrf _build ls -lhA . -check_static command/dune +check_dynamic command/dune diff --git a/variants/root-x86_64/easyseccomp b/variants/root-x86_64/easyseccomp @@ -4,14 +4,14 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 -#+patch.1f7ab95c511ea31573c4b2e3338bd15925cd1b93631a0681388475e41678d93f -#+flex.a0b530df71023dab46f59c8c0a6255bae4c6e8e8d88087364e36fcc86318f41b -#+bison.50a879da42f360f6a461ecb3eaafaed1ee77389f064b469614f27328bbd15e44 -#+libseccomp.1ab05f3964cdba55c6fc59dd7e1785f36e12ecf23b5d9acbb164b8271ea48bab -#+error-standalone.83fe263a36f70674cf9285b3acc3ded8716d9f7ad735642160d203c3516d0b81 -#+argp-standalone.ce895c27959569e1e8043165ffc45a83f91bbab063876272eabd4870766f3721 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+m4.9191d0c69527b5e503257c2af7aeb2ec2dd614e9999de0c0006d481a62b59c1e +#+patch.aaad0551089641f4c59cb166e6c41262d1a1b95ab18c52f4c02746951a141602 +#+flex.23f90e59737b0916506d7a180a53ad1ea620592ecff2d7e3aa8ece88c152af33 +#+bison.5aa6c06f7231813e87b8417220b93d58ff09fbde70b348f781fb42aec2880251 +#+libseccomp.9eb231281c8890ca15a1bd5c152c65dca5aef2716c3f34141f044e431189c8e3 +#+error-standalone.4c44d2518e02269dbbd6d4dd89b65a30a41c7c434ebc22246a3d35221e8019f2 +#+argp-standalone.df5903aace223afe97563399e4075bcc7486f0505e4710d850ceb72adbf77d0f #@untar::sha256:1b44a63d415c48ac68d210951fec8d4761d3522f3d82d53182e66fabe5e2f2cd:easyseccomp #@sha256:eec15ac67403946e9d988d485f11764cf313b4798efe01d40f951ff521a23d10:easyseccomp_fix_includes.patch #@git:94422be00da71ff44c8ad1fe3455587c62ca29d3:easyseccomp @@ -56,6 +56,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/error-standalone b/variants/root-x86_64/error-standalone @@ -3,7 +3,7 @@ #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #@untar:-z:sha256:0e751989cea94e25d5166a6a1ed9bde218786e39dff82e1f01dff12fc78639d9:. diff --git a/variants/root-x86_64/execline b/variants/root-x86_64/execline @@ -3,8 +3,8 @@ #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+skalibs.a26d2e6f716163365561db4c61d78907be5ed9b34cfbc9d2475962029ba39aeb +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+skalibs.7e1cc77f32e81bc7517dc10d6eaa7704bb89aaf6a4f35f88a9e400170aa93edb #@git:6c0957eb5e8eea2ffada4d7be08286f0e81d0527:execline @@ -21,7 +21,7 @@ cd 'execline' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.a26d2e6f716163365561db4c61d78907be5ed9b34cfbc9d2475962029ba39aeb/sysdeps' \ + --with-sysdeps='/versions/skalibs.7e1cc77f32e81bc7517dc10d6eaa7704bb89aaf6a4f35f88a9e400170aa93edb/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/root-x86_64/fileset b/variants/root-x86_64/fileset @@ -2,8 +2,8 @@ #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b -#+zsh.86584889aa0a3af405974c69ab43869f82e00acdba5340528e5dd20757f7dfc8 -#+pthbs-banginstall.0442e58611ea2fc27a0a57a4c1b9b8696d799e9ebb737f3548553a61f845e34b +#+zsh.55516f3be847b82216df2719107cef2443e6ca78a25e640c91ce958a57ffefbf +#+pthbs-banginstall.47878a453e8bccc968de24b08fdb9ac896d016821936c4cb8974968875eadaa2 #@git:1b161b09bc889d17ac0a4ccce2dc3e74b64e1433:fileset diff --git a/variants/root-x86_64/findutils b/variants/root-x86_64/findutils @@ -4,8 +4,8 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+m4.9191d0c69527b5e503257c2af7aeb2ec2dd614e9999de0c0006d481a62b59c1e #@untar:-J:sha256:1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5:. @@ -48,6 +48,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/flex b/variants/root-x86_64/flex @@ -4,8 +4,8 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+m4.9191d0c69527b5e503257c2af7aeb2ec2dd614e9999de0c0006d481a62b59c1e #@untar:-z:sha256:e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995:. @@ -48,6 +48,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/getconf b/variants/root-x86_64/getconf @@ -21,6 +21,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/getent b/variants/root-x86_64/getent @@ -21,6 +21,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/git b/variants/root-x86_64/git @@ -3,11 +3,11 @@ #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc -#+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 -#+libressl.86f9dd5a8a3bb042d9561ef187d7fb64f9cc2be3bb707b9e171208bae5c684ef -#+curl.718c045c064f1e9fd5a7c71f50384345e35e1fc80e3ae7fdacadce73454dd3e7 +#+m4.9191d0c69527b5e503257c2af7aeb2ec2dd614e9999de0c0006d481a62b59c1e +#+libressl.2da188e728e941d7851e1179e85211e90620f9fb750b9fa064df2a87a6e590a4 +#+curl.1396e916eb30f88da26b2eeb0ef68399956d9795553abd3ad852b482e03a954d #@untar:-J:sha256:f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9:. @@ -20,6 +20,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/gnu-make b/variants/root-x86_64/gnu-make @@ -44,6 +44,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/gperf b/variants/root-x86_64/gperf @@ -4,8 +4,8 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+m4.9191d0c69527b5e503257c2af7aeb2ec2dd614e9999de0c0006d481a62b59c1e #@untar:-z:sha256:588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2:. @@ -48,6 +48,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/iconv b/variants/root-x86_64/iconv @@ -21,6 +21,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/kbd b/variants/root-x86_64/kbd @@ -4,8 +4,8 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+m4.9191d0c69527b5e503257c2af7aeb2ec2dd614e9999de0c0006d481a62b59c1e #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:. #@untar:-z:sha256:99b2a39e1c5475ffe8e1bb2004345cb8849c3cc1aedbe541beee2d45e270975f:. @@ -49,6 +49,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" 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.386e6e56b5ea98ccc349ca95e462261faec3c211aa25775f83eab57222e6e95b -#+busybox.660c27fd0ce7b80248bee14d25b8f2115c408f87721d4f07a5ac9d5d360b3a56- \ No newline at end of file +#+linux.0969663b3937c0dc4d55b25b0412de65b89c6067ba22085a3a34b987fa82dcbc +#+busybox.b75f4199f8308de3809ac351459d080c9bedaf10336189a6968eaf7f98dcc39e+ \ No newline at end of file diff --git a/variants/root-x86_64/libarchive b/variants/root-x86_64/libarchive @@ -4,8 +4,8 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+m4.9191d0c69527b5e503257c2af7aeb2ec2dd614e9999de0c0006d481a62b59c1e #@untar:-J:sha256:04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb:. @@ -48,6 +48,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/libbsd b/variants/root-x86_64/libbsd @@ -4,9 +4,9 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 -#+libmd.c83cce7fb1cd629d002eab14a9a0e74e1b674f215eb14e9b63cc85c91c9a5dbf +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+m4.9191d0c69527b5e503257c2af7aeb2ec2dd614e9999de0c0006d481a62b59c1e +#+libmd.6e24e0db11b827b4408be9dd72a922c1dcc98f59f152db1412a01b91c15c0240 #@untar:-J:sha256:55fdfa2696fb4d55a592fa9ad14a9df897c7b0008ddb3b30c419914841f85f33:. @@ -49,6 +49,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/libcap b/variants/root-x86_64/libcap @@ -3,9 +3,9 @@ #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc -#+pkgconf-pkg-config.035ed72618fdde9058d87fb11cd6374080eef9927f78b0cd97cfc5afdfc21388 +#+pkgconf-pkg-config.f468b6bdd77bccfc86d0814786e4a380f1370e89c2849de59ec2ef56fec84710 #@untar:-J:sha256:f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb:. @@ -24,6 +24,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/libcgroup b/variants/root-x86_64/libcgroup @@ -4,11 +4,11 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 -#+flex.a0b530df71023dab46f59c8c0a6255bae4c6e8e8d88087364e36fcc86318f41b -#+bison.50a879da42f360f6a461ecb3eaafaed1ee77389f064b469614f27328bbd15e44 -#+musl-fts.beecb105185242180932ec3825a3f5cafdd8149a7159b244b17396ce7ac95565 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+m4.9191d0c69527b5e503257c2af7aeb2ec2dd614e9999de0c0006d481a62b59c1e +#+flex.23f90e59737b0916506d7a180a53ad1ea620592ecff2d7e3aa8ece88c152af33 +#+bison.5aa6c06f7231813e87b8417220b93d58ff09fbde70b348f781fb42aec2880251 +#+musl-fts.4b07f688260c5abc265589fc8e8a4d99be79c11b75f739d65ebbdfbea39cb768 #@untar:-z:sha256:8d284d896fca1c981b55850e92acd3ad9648a69227c028dda7ae3402af878edd:. @@ -51,6 +51,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/libelf b/variants/root-x86_64/libelf @@ -3,9 +3,9 @@ #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc -#+zstd.38b14331a2c89a3fc5d568ddddc14918031315ba2a24b6ffa8bd874c6f54bbc1 +#+zstd.cab786b9c2ab7a9f45379d06b7c76011295a6725f374d1f5dbcd33e18df2bada #@git:288355d104ff9930520c0283fe82556c6cc5c16f:libelf diff --git a/variants/root-x86_64/libmd b/variants/root-x86_64/libmd @@ -4,8 +4,8 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+m4.9191d0c69527b5e503257c2af7aeb2ec2dd614e9999de0c0006d481a62b59c1e #@untar:-J:sha256:1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332:. @@ -48,6 +48,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/libressl b/variants/root-x86_64/libressl @@ -4,9 +4,9 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 -#+ca-certificates-wip-donotuse.a66f450ca946c6c320d483b42893691a87c54c7ff432958a9b3bf473bd4c796c +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+m4.9191d0c69527b5e503257c2af7aeb2ec2dd614e9999de0c0006d481a62b59c1e +#+ca-certificates-wip-donotuse.60879e4d5d310502510dccadacd53bac0a692c75f49ba9a40969bdc55ea1e044 #@sha256:a68fedc0edd976b9f35ecfdcb252d80dc12084b1bc4e945be7dc42c437d8b540:c_rehash.c #@untar:-z:sha256:6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954:. @@ -50,6 +50,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" @@ -73,7 +74,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.a66f450ca946c6c320d483b42893691a87c54c7ff432958a9b3bf473bd4c796c/config/ssl/certs'/*.crt "$pthbs_destdir/$prefix/config/ssl/certs/" +cp -vs '/versions/ca-certificates-wip-donotuse.60879e4d5d310502510dccadacd53bac0a692c75f49ba9a40969bdc55ea1e044/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/libretls b/variants/root-x86_64/libretls @@ -4,8 +4,8 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+m4.9191d0c69527b5e503257c2af7aeb2ec2dd614e9999de0c0006d481a62b59c1e #@untar:-z:sha256:3bc9fc0e61827ee2f608e5e44993a8fda6d610b80a1e01a9c75610cc292997b5:. @@ -48,6 +48,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/libseccomp b/variants/root-x86_64/libseccomp @@ -4,10 +4,10 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 -#+pkgconf-pkg-config.035ed72618fdde9058d87fb11cd6374080eef9927f78b0cd97cfc5afdfc21388 -#+gperf.9bfec911edec77c04d4078d64a50bcdf53ad748bea18e87a593d34514f54995f +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+m4.9191d0c69527b5e503257c2af7aeb2ec2dd614e9999de0c0006d481a62b59c1e +#+pkgconf-pkg-config.f468b6bdd77bccfc86d0814786e4a380f1370e89c2849de59ec2ef56fec84710 +#+gperf.899fb9b0077506c52a9cc02f96bc5811749174bfd6c0230a6ac4f76b00dc8711 #@untar:-z:sha256:83b6085232d1588c379dc9b9cae47bb37407cf262e6e74993c61ba72d2a784dc:. @@ -50,6 +50,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/libunwind b/variants/root-x86_64/libunwind @@ -4,8 +4,8 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+m4.9191d0c69527b5e503257c2af7aeb2ec2dd614e9999de0c0006d481a62b59c1e #@untar:-z:sha256:ddf0e32dd5fafe5283198d37e4bf9decf7ba1770b6e7e006c33e6df79e6a6157:. @@ -48,6 +48,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/linux b/variants/root-x86_64/linux @@ -1,18 +1,18 @@ #!/usr/bin/env pthbs-build #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-modutils.ebb7b2cc2e280cc5c68f2c7ccd8dd75304de57061e314de8459057fb2b7c0209 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+findutils.1edbb84f016e9dc61540b8396e85a2163570b9281a408f8787f17e404f685ce0 -#+diffutils.dbe0e2258153174e9bde5107bab7a436d8c4d8b88e9d74f35eb72b67cfc73148 -#+patch.1f7ab95c511ea31573c4b2e3338bd15925cd1b93631a0681388475e41678d93f -#+flex.a0b530df71023dab46f59c8c0a6255bae4c6e8e8d88087364e36fcc86318f41b -#+bison.50a879da42f360f6a461ecb3eaafaed1ee77389f064b469614f27328bbd15e44 -#+rsync.a3914e6a58e85cc838ef8c8cda9ec4ba6e49cdd7376d09a2d0c6b072c656c3e7 -#+zstd.38b14331a2c89a3fc5d568ddddc14918031315ba2a24b6ffa8bd874c6f54bbc1 -#+libelf.e0061547c78397275ebd62dfe0e0b0640c7b7c1efdb341dc7763ac5c926b5106 -#+pkgconf-pkg-config.035ed72618fdde9058d87fb11cd6374080eef9927f78b0cd97cfc5afdfc21388 -#+nawk.8521bf13f53618b7897b7f2e070a506a0101c985f6b9bb527d5eb15d8e8d4858 +#+findutils.8fb6b0f98e900ae929a7a697bf0283f8c78df0571b5c508fd68b74aeea3eb750 +#+diffutils.566986f3321e239718d1356b3131c82833ade565b9c1a5d0dfe1b03be65f5701 +#+patch.aaad0551089641f4c59cb166e6c41262d1a1b95ab18c52f4c02746951a141602 +#+flex.23f90e59737b0916506d7a180a53ad1ea620592ecff2d7e3aa8ece88c152af33 +#+bison.5aa6c06f7231813e87b8417220b93d58ff09fbde70b348f781fb42aec2880251 +#+rsync.88a1ff8658f8a443a45b185c6099a3859966230ecb535a1c230f48fd9b74d6d0 +#+zstd.cab786b9c2ab7a9f45379d06b7c76011295a6725f374d1f5dbcd33e18df2bada +#+libelf.568856eb2053f40104a6ed71caf9d204af7699af0e6a1baee44eee12822f502b +#+pkgconf-pkg-config.f468b6bdd77bccfc86d0814786e4a380f1370e89c2849de59ec2ef56fec84710 +#+nawk.8fa343bf9be41a9701620e63eced62e002ec008a1eeb1beb2ce7986e6d7351f9 #@untar:-J:sha256:2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb:. #@sha256:d9b01e4dac3dd140c394227603c8b3339bb2f1e10c97afd3607d84e3003ec75a:patch-6.1.34.xz #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config diff --git a/variants/root-x86_64/linux-qemu-guest b/variants/root-x86_64/linux-qemu-guest @@ -1,18 +1,18 @@ #!/usr/bin/env pthbs-build #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-modutils.ebb7b2cc2e280cc5c68f2c7ccd8dd75304de57061e314de8459057fb2b7c0209 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+findutils.1edbb84f016e9dc61540b8396e85a2163570b9281a408f8787f17e404f685ce0 -#+diffutils.dbe0e2258153174e9bde5107bab7a436d8c4d8b88e9d74f35eb72b67cfc73148 -#+patch.1f7ab95c511ea31573c4b2e3338bd15925cd1b93631a0681388475e41678d93f -#+flex.a0b530df71023dab46f59c8c0a6255bae4c6e8e8d88087364e36fcc86318f41b -#+bison.50a879da42f360f6a461ecb3eaafaed1ee77389f064b469614f27328bbd15e44 -#+rsync.a3914e6a58e85cc838ef8c8cda9ec4ba6e49cdd7376d09a2d0c6b072c656c3e7 -#+zstd.38b14331a2c89a3fc5d568ddddc14918031315ba2a24b6ffa8bd874c6f54bbc1 -#+libelf.e0061547c78397275ebd62dfe0e0b0640c7b7c1efdb341dc7763ac5c926b5106 -#+pkgconf-pkg-config.035ed72618fdde9058d87fb11cd6374080eef9927f78b0cd97cfc5afdfc21388 -#+nawk.8521bf13f53618b7897b7f2e070a506a0101c985f6b9bb527d5eb15d8e8d4858 +#+findutils.8fb6b0f98e900ae929a7a697bf0283f8c78df0571b5c508fd68b74aeea3eb750 +#+diffutils.566986f3321e239718d1356b3131c82833ade565b9c1a5d0dfe1b03be65f5701 +#+patch.aaad0551089641f4c59cb166e6c41262d1a1b95ab18c52f4c02746951a141602 +#+flex.23f90e59737b0916506d7a180a53ad1ea620592ecff2d7e3aa8ece88c152af33 +#+bison.5aa6c06f7231813e87b8417220b93d58ff09fbde70b348f781fb42aec2880251 +#+rsync.88a1ff8658f8a443a45b185c6099a3859966230ecb535a1c230f48fd9b74d6d0 +#+zstd.cab786b9c2ab7a9f45379d06b7c76011295a6725f374d1f5dbcd33e18df2bada +#+libelf.568856eb2053f40104a6ed71caf9d204af7699af0e6a1baee44eee12822f502b +#+pkgconf-pkg-config.f468b6bdd77bccfc86d0814786e4a380f1370e89c2849de59ec2ef56fec84710 +#+nawk.8fa343bf9be41a9701620e63eced62e002ec008a1eeb1beb2ce7986e6d7351f9 #@untar:-J:sha256:7586962547803be7ecc4056efc927fb25214548722bd28171172f3599abb9764:. #@sha256:cc2633ee136db0283d4faf7c27c890641e90cd835fc3adb19eaf0569e4078867:linux.config #@sha256:ff3ddd131d73fee6838b11a6c4773bdb85c5f60fdd4b9ac4120ced021c341417:noobjtool.patch diff --git a/variants/root-x86_64/logincaps b/variants/root-x86_64/logincaps @@ -2,11 +2,11 @@ #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b -#+zsh.86584889aa0a3af405974c69ab43869f82e00acdba5340528e5dd20757f7dfc8 -#+pthbs-banginstall.0442e58611ea2fc27a0a57a4c1b9b8696d799e9ebb737f3548553a61f845e34b -#+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284 +#+zsh.55516f3be847b82216df2719107cef2443e6ca78a25e640c91ce958a57ffefbf +#+pthbs-banginstall.47878a453e8bccc968de24b08fdb9ac896d016821936c4cb8974968875eadaa2 +#+execline.b282f9d9ee24feffdf9ff72510c1471360d0819b0a4f7e9cf5a84679d066aa85 #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ccx-utils.769c165236aa3bc0564901e48e65c035ab3d342564dd1a440a512347d62d4ce9 +#+ccx-utils.c0ea397fa2cbbb6fa18bf57a54fe2b709e459c63481428b2c3df2464f098e641 #@git:409db79b3e7e5fc6b73305471d9bbb6ac5c14036:logincaps @@ -19,6 +19,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/m4 b/variants/root-x86_64/m4 @@ -1,6 +1,6 @@ #!/usr/bin/env pthbs-build #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc @@ -47,6 +47,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/mdev-scripts b/variants/root-x86_64/mdev-scripts @@ -2,8 +2,8 @@ #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b -#+zsh.86584889aa0a3af405974c69ab43869f82e00acdba5340528e5dd20757f7dfc8 -#+pthbs-banginstall.0442e58611ea2fc27a0a57a4c1b9b8696d799e9ebb737f3548553a61f845e34b +#+zsh.55516f3be847b82216df2719107cef2443e6ca78a25e640c91ce958a57ffefbf +#+pthbs-banginstall.47878a453e8bccc968de24b08fdb9ac896d016821936c4cb8974968875eadaa2 #@git:395634340de8349996fd273b055ae4bac9d2897c:mdev-scripts diff --git a/variants/root-x86_64/mdevd b/variants/root-x86_64/mdevd @@ -3,9 +3,9 @@ #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+skalibs.a26d2e6f716163365561db4c61d78907be5ed9b34cfbc9d2475962029ba39aeb -#+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+skalibs.7e1cc77f32e81bc7517dc10d6eaa7704bb89aaf6a4f35f88a9e400170aa93edb +#+execline.b282f9d9ee24feffdf9ff72510c1471360d0819b0a4f7e9cf5a84679d066aa85 #@git:96aef400b9f9d14f3bf54b0e444e9ad3665c4107:mdevd @@ -22,7 +22,7 @@ cd 'mdevd' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.a26d2e6f716163365561db4c61d78907be5ed9b34cfbc9d2475962029ba39aeb/sysdeps' \ + --with-sysdeps='/versions/skalibs.7e1cc77f32e81bc7517dc10d6eaa7704bb89aaf6a4f35f88a9e400170aa93edb/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/root-x86_64/mdevd.environment b/variants/root-x86_64/mdevd.environment @@ -1,7 +1,7 @@ #!/usr/bin/env pthbs-build #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 -#+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284 -#+s6.344af4b89dee417e72484532005f0a223e20675a15daac49d498a554812bac61 -#+mdev-scripts.4fa9f2d49998db1a832103801dfba30ae20d73074858bfd6ffacbb6df732a13f -#+mdevd.0502ff0a0d6e4f3b58469d0d3aef8816631718d5375ec0d41913dfa9121590fb +#+execline.b282f9d9ee24feffdf9ff72510c1471360d0819b0a4f7e9cf5a84679d066aa85 +#+s6.825c2fd936a972faf7f4c21aa0d3b91760d4fe1acb0d80d94d71ab1ec5b0ae83 +#+mdev-scripts.029329e4c6139f0bb3549a668968adba60215540134a46452ff86f6169c5187b +#+mdevd.ea411dccb9b77c3d6a37830552fef579006b94a4b56f0c975f78dcf713698f75 #+busybox-modutils.ebb7b2cc2e280cc5c68f2c7ccd8dd75304de57061e314de8459057fb2b7c0209 \ No newline at end of file diff --git a/variants/root-x86_64/mlog b/variants/root-x86_64/mlog @@ -3,7 +3,7 @@ #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c #@git:fefc95731f1260810a3551226b73d35f3d6e9d9e:mlog @@ -22,6 +22,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/musl-fts b/variants/root-x86_64/musl-fts @@ -4,8 +4,8 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+m4.9191d0c69527b5e503257c2af7aeb2ec2dd614e9999de0c0006d481a62b59c1e #@untar:-z:sha256:49ae567a96dbab22823d045ffebe0d6b14b9b799925e9ca9274d47d26ff482a6:. @@ -48,6 +48,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/nawk b/variants/root-x86_64/nawk @@ -2,9 +2,9 @@ #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b -#+bison.50a879da42f360f6a461ecb3eaafaed1ee77389f064b469614f27328bbd15e44 +#+bison.5aa6c06f7231813e87b8417220b93d58ff09fbde70b348f781fb42aec2880251 #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c #@untar:-z:sha256:e031b1e1d2b230f276f975bffb923f0ea15f798c839d15a3f26a1a39448e32d7:. diff --git a/variants/root-x86_64/netbsd-curses b/variants/root-x86_64/netbsd-curses @@ -2,7 +2,7 @@ #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 #@git:51d179dad861640caeb76674b5908ccd79f04fae:netbsd-curses diff --git a/variants/root-x86_64/ocaml b/variants/root-x86_64/ocaml @@ -4,8 +4,8 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+m4.9191d0c69527b5e503257c2af7aeb2ec2dd614e9999de0c0006d481a62b59c1e #@untar:-J:sha256:dfaa8a2e11c799bc1765d8bef44911406ee5f4803027190382a939f88c912266:. @@ -48,6 +48,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/ocaml-astring b/variants/root-x86_64/ocaml-astring @@ -4,11 +4,11 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.8c21f24d07485e61cf270c6f08b4835b300c5bbed438c00d4a15da7c4c310a82 -#+ocaml-findlib.c5f5e98a9aa394834979c1cf2a083031d07ba2a2abbb0593911ae01d121b8d76 -#+ocamlbuild.726cc4e6e87a0d957492fd5fcbf05be99360e092f45fba05b67fd554b315c799 -#+opam.bb163482eaff8861ff95b95fd081f93d4290ed31588c8993d7b0db525336c9bf -#+ocaml-topkg.405390a830aec8aeb2bca246a9603c172e9f2ed123ec1a27d3757bc7c15e0959 +#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b +#+ocaml-findlib.a39ecc09c12d26540182a6ec072aaa8d143eec8fd6fdc83fe10a1967d5a67bb4 +#+ocamlbuild.28bc3003392ee524dc5f2f801066501b38cc981cc11bae7afd2b76d7aa0c13c9 +#+opam.0b8b72eb508f113f4e05ccecbdf83b033511f6783ad9ade214a567b1416b8d9a +#+ocaml-topkg.9a47e3784212f25fbfa42e05f14746bc58e165c657012db71bc3ab0b8d5e0ae0 #@untar:-j:sha256:865692630c07c3ab87c66cdfc2734c0fdfc9c34a57f8e89ffec7c7d15e7a70fa:. diff --git a/variants/root-x86_64/ocaml-base b/variants/root-x86_64/ocaml-base @@ -4,10 +4,10 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.8c21f24d07485e61cf270c6f08b4835b300c5bbed438c00d4a15da7c4c310a82 -#+dune.c3b1edee8563f4d0ff8da72aa485efe3d03e0f0e63b09f9a4efbfa6cded23597 -#+ocaml_intrinsics_kernel.207d62bcd6ad5a49af97662c98e0517b42fbe0a0bfe154a5aa54fc0f2fd121d7 -#+ocaml-sexplib0.d321e4697e6a14d4c683a48cb327de624598e0d569d2cd06bf284b3a936ad9a6 +#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b +#+dune.1d96821471656a982ba38b4cdf267e22d9c0ae5cc62af3369060e787cbdda9be +#+ocaml_intrinsics_kernel.2de7ee252c7a45d5be186e4e8ab11e3b7cda3acfbe15c5feee4a052c08ac955f +#+ocaml-sexplib0.242d9dfbfafdcdb49d2c406a925d42dd66a2c28fa9fa3ca3d188ee041f1d6e0d #@untar:-z:sha256:3f3f64789ab25bb5cb7f5f907dd651dec9cc9440981822fe75df6b94344b7208:. diff --git a/variants/root-x86_64/ocaml-bos b/variants/root-x86_64/ocaml-bos @@ -4,17 +4,17 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.8c21f24d07485e61cf270c6f08b4835b300c5bbed438c00d4a15da7c4c310a82 -#+ocaml-findlib.c5f5e98a9aa394834979c1cf2a083031d07ba2a2abbb0593911ae01d121b8d76 -#+ocamlbuild.726cc4e6e87a0d957492fd5fcbf05be99360e092f45fba05b67fd554b315c799 -#+opam.bb163482eaff8861ff95b95fd081f93d4290ed31588c8993d7b0db525336c9bf -#+ocaml-topkg.405390a830aec8aeb2bca246a9603c172e9f2ed123ec1a27d3757bc7c15e0959 -#+ocaml-astring.86062c1f0007fcb4e9963edc4dddd0a4544aac168ecb31693a221e4127347dba -#+ocaml-fpath.3c78155da2bf66ff63010e4b01235cf05d74fe79800ae5586a5082c3687760fc -#+ocaml-rresult.60904b8f99a28f1df09aeb2f03a194db39813924c22f0c23e994f95f7d965ceb -#+ocaml-fmt.62a68e8e9b32b5912023e100942583f905a5662cb53cc6cf1f0412a5ccf8f578 -#+ocaml-logs.22841c63663cbaafaefe6514a71683d2a148f938384ebc7807905838356b25e3 -#+ocaml-mtime.2ff0762c96d64dc34c1182768f1f83c85b0f970eae8af95bdc88db14dcd4b80a +#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b +#+ocaml-findlib.a39ecc09c12d26540182a6ec072aaa8d143eec8fd6fdc83fe10a1967d5a67bb4 +#+ocamlbuild.28bc3003392ee524dc5f2f801066501b38cc981cc11bae7afd2b76d7aa0c13c9 +#+opam.0b8b72eb508f113f4e05ccecbdf83b033511f6783ad9ade214a567b1416b8d9a +#+ocaml-topkg.9a47e3784212f25fbfa42e05f14746bc58e165c657012db71bc3ab0b8d5e0ae0 +#+ocaml-astring.27e447249b3a7c53fc9804c4fcbdc98a07858d8e8df70ec572d93e37751f34d0 +#+ocaml-fpath.5758a5d30f7ff16416b8134a303b9af78bdcc0af6bbc563f0e957e2a95a19e02 +#+ocaml-rresult.cfaf1c603bc87fa9be7e11865f8dc1ba1c4238d05da6389e3ae225990bb7889d +#+ocaml-fmt.bf68dbb6ea4bf577e26991cdd31e65bfd55a047a713c8e5988a88aabc0ffa197 +#+ocaml-logs.750f15eac65ed5ccbf7f6fd806226d0cd34ca5eec0f38a0526e10da18e06a256 +#+ocaml-mtime.800f0ea1ed91cfdfbc248d207a31efd8b5d032896a7bdb493dd9363bed06a0a9 #@untar:-j:sha256:d8d62e786b10d697e0457205a8eedeaa27ebcc90f1855f18df190cac2e3d8f37:. diff --git a/variants/root-x86_64/ocaml-cmdliner b/variants/root-x86_64/ocaml-cmdliner @@ -4,11 +4,11 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.8c21f24d07485e61cf270c6f08b4835b300c5bbed438c00d4a15da7c4c310a82 -#+ocaml-findlib.c5f5e98a9aa394834979c1cf2a083031d07ba2a2abbb0593911ae01d121b8d76 -#+ocamlbuild.726cc4e6e87a0d957492fd5fcbf05be99360e092f45fba05b67fd554b315c799 -#+opam.bb163482eaff8861ff95b95fd081f93d4290ed31588c8993d7b0db525336c9bf -#+ocaml-topkg.405390a830aec8aeb2bca246a9603c172e9f2ed123ec1a27d3757bc7c15e0959 +#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b +#+ocaml-findlib.a39ecc09c12d26540182a6ec072aaa8d143eec8fd6fdc83fe10a1967d5a67bb4 +#+ocamlbuild.28bc3003392ee524dc5f2f801066501b38cc981cc11bae7afd2b76d7aa0c13c9 +#+opam.0b8b72eb508f113f4e05ccecbdf83b033511f6783ad9ade214a567b1416b8d9a +#+ocaml-topkg.9a47e3784212f25fbfa42e05f14746bc58e165c657012db71bc3ab0b8d5e0ae0 #@untar:-j:sha256:4e547a631c36fbaadff60d3bd7724eb3f83ba274e92fb725950bae7868378582:. diff --git a/variants/root-x86_64/ocaml-compiler-libs b/variants/root-x86_64/ocaml-compiler-libs @@ -4,8 +4,8 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.8c21f24d07485e61cf270c6f08b4835b300c5bbed438c00d4a15da7c4c310a82 -#+dune.c3b1edee8563f4d0ff8da72aa485efe3d03e0f0e63b09f9a4efbfa6cded23597 +#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b +#+dune.1d96821471656a982ba38b4cdf267e22d9c0ae5cc62af3369060e787cbdda9be #@untar:-z:sha256:9b9644d7351db699e57ddba7c767bb4153e6e988ccf45ead2fb238a3bd75cdc7:. diff --git a/variants/root-x86_64/ocaml-cppo b/variants/root-x86_64/ocaml-cppo @@ -4,9 +4,9 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.8c21f24d07485e61cf270c6f08b4835b300c5bbed438c00d4a15da7c4c310a82 -#+dune.c3b1edee8563f4d0ff8da72aa485efe3d03e0f0e63b09f9a4efbfa6cded23597 -#+ocamlbuild.726cc4e6e87a0d957492fd5fcbf05be99360e092f45fba05b67fd554b315c799 +#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b +#+dune.1d96821471656a982ba38b4cdf267e22d9c0ae5cc62af3369060e787cbdda9be +#+ocamlbuild.28bc3003392ee524dc5f2f801066501b38cc981cc11bae7afd2b76d7aa0c13c9 #@untar:-z:sha256:6e62a8ee0217c9cc38d5860110eb18eb8d89c05c420353d298e1431fe8bac00f:. diff --git a/variants/root-x86_64/ocaml-findlib b/variants/root-x86_64/ocaml-findlib @@ -4,11 +4,11 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 -#+netbsd-curses.8a5103b489cac54a30a106bb51046d98c27491d771c46f553caefbe0fa66df77 -#+ocaml.8c21f24d07485e61cf270c6f08b4835b300c5bbed438c00d4a15da7c4c310a82 -#+ocamlbuild.726cc4e6e87a0d957492fd5fcbf05be99360e092f45fba05b67fd554b315c799 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+m4.9191d0c69527b5e503257c2af7aeb2ec2dd614e9999de0c0006d481a62b59c1e +#+netbsd-curses.809febf41c26259736b072fcda38189d305faef167fc77b9a9ae101de7141066 +#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b +#+ocamlbuild.28bc3003392ee524dc5f2f801066501b38cc981cc11bae7afd2b76d7aa0c13c9 #@untar:-z:sha256:662c910f774e9fee3a19c4e057f380581ab2fc4ee52da4761304ac9c31b8869d:. @@ -21,11 +21,20 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + case $interp_info in + ('') + printf '%s\n' "Error: '$1' is not a dynamic binary!" + exit 1 + ;; + (*'/versions/musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') + return 0 + ;; + (*) + printf '%s\n' "Error: '$1' unexpected linker path!" + exit 1 + esac } prefix=/versions/$pthbs_package @@ -45,14 +54,14 @@ cd 'findlib-1.9.8' make -j1 all opt # workaround `topfind` getting installed to stdlib directory, this is not configurable -stdlib="$pthbs_destdir/versions/ocaml.8c21f24d07485e61cf270c6f08b4835b300c5bbed438c00d4a15da7c4c310a82" +stdlib="$pthbs_destdir/versions/ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b" mkdir -p "${stdlib%/*}" ln -s "$pthbs_package" "$stdlib" make install prefix="$pthbs_destdir" -check_static command/ocamlfind +check_dynamic command/ocamlfind diff --git a/variants/root-x86_64/ocaml-fmt b/variants/root-x86_64/ocaml-fmt @@ -4,12 +4,12 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.8c21f24d07485e61cf270c6f08b4835b300c5bbed438c00d4a15da7c4c310a82 -#+ocaml-findlib.c5f5e98a9aa394834979c1cf2a083031d07ba2a2abbb0593911ae01d121b8d76 -#+ocamlbuild.726cc4e6e87a0d957492fd5fcbf05be99360e092f45fba05b67fd554b315c799 -#+opam.bb163482eaff8861ff95b95fd081f93d4290ed31588c8993d7b0db525336c9bf -#+ocaml-topkg.405390a830aec8aeb2bca246a9603c172e9f2ed123ec1a27d3757bc7c15e0959 -#+ocaml-cmdliner.75948a7b738b97ae953b76e5ecfede609d3281e42eff08366c4061d3adb2b50a +#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b +#+ocaml-findlib.a39ecc09c12d26540182a6ec072aaa8d143eec8fd6fdc83fe10a1967d5a67bb4 +#+ocamlbuild.28bc3003392ee524dc5f2f801066501b38cc981cc11bae7afd2b76d7aa0c13c9 +#+opam.0b8b72eb508f113f4e05ccecbdf83b033511f6783ad9ade214a567b1416b8d9a +#+ocaml-topkg.9a47e3784212f25fbfa42e05f14746bc58e165c657012db71bc3ab0b8d5e0ae0 +#+ocaml-cmdliner.addf51324525664636c9519ed08cbbbdc1841914ebe57888afd4adc8b4904b00 #@untar:-j:sha256:857cfd47a54b52429cd9b3e2665e44173cd1bd3b435bece7172f984ad5376a1b:. diff --git a/variants/root-x86_64/ocaml-fpath b/variants/root-x86_64/ocaml-fpath @@ -4,12 +4,12 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.8c21f24d07485e61cf270c6f08b4835b300c5bbed438c00d4a15da7c4c310a82 -#+ocaml-findlib.c5f5e98a9aa394834979c1cf2a083031d07ba2a2abbb0593911ae01d121b8d76 -#+ocamlbuild.726cc4e6e87a0d957492fd5fcbf05be99360e092f45fba05b67fd554b315c799 -#+opam.bb163482eaff8861ff95b95fd081f93d4290ed31588c8993d7b0db525336c9bf -#+ocaml-topkg.405390a830aec8aeb2bca246a9603c172e9f2ed123ec1a27d3757bc7c15e0959 -#+ocaml-astring.86062c1f0007fcb4e9963edc4dddd0a4544aac168ecb31693a221e4127347dba +#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b +#+ocaml-findlib.a39ecc09c12d26540182a6ec072aaa8d143eec8fd6fdc83fe10a1967d5a67bb4 +#+ocamlbuild.28bc3003392ee524dc5f2f801066501b38cc981cc11bae7afd2b76d7aa0c13c9 +#+opam.0b8b72eb508f113f4e05ccecbdf83b033511f6783ad9ade214a567b1416b8d9a +#+ocaml-topkg.9a47e3784212f25fbfa42e05f14746bc58e165c657012db71bc3ab0b8d5e0ae0 +#+ocaml-astring.27e447249b3a7c53fc9804c4fcbdc98a07858d8e8df70ec572d93e37751f34d0 #@untar:-j:sha256:12b08ff192d037d9b6d69e9ca19d1d385184f20b3237c27231e437ac81ace70f:. diff --git a/variants/root-x86_64/ocaml-logs b/variants/root-x86_64/ocaml-logs @@ -4,14 +4,14 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.8c21f24d07485e61cf270c6f08b4835b300c5bbed438c00d4a15da7c4c310a82 -#+ocaml-findlib.c5f5e98a9aa394834979c1cf2a083031d07ba2a2abbb0593911ae01d121b8d76 -#+ocamlbuild.726cc4e6e87a0d957492fd5fcbf05be99360e092f45fba05b67fd554b315c799 -#+opam.bb163482eaff8861ff95b95fd081f93d4290ed31588c8993d7b0db525336c9bf -#+ocaml-topkg.405390a830aec8aeb2bca246a9603c172e9f2ed123ec1a27d3757bc7c15e0959 -#+ocaml-mtime.2ff0762c96d64dc34c1182768f1f83c85b0f970eae8af95bdc88db14dcd4b80a -#+ocaml-cmdliner.75948a7b738b97ae953b76e5ecfede609d3281e42eff08366c4061d3adb2b50a -#+ocaml-fmt.62a68e8e9b32b5912023e100942583f905a5662cb53cc6cf1f0412a5ccf8f578 +#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b +#+ocaml-findlib.a39ecc09c12d26540182a6ec072aaa8d143eec8fd6fdc83fe10a1967d5a67bb4 +#+ocamlbuild.28bc3003392ee524dc5f2f801066501b38cc981cc11bae7afd2b76d7aa0c13c9 +#+opam.0b8b72eb508f113f4e05ccecbdf83b033511f6783ad9ade214a567b1416b8d9a +#+ocaml-topkg.9a47e3784212f25fbfa42e05f14746bc58e165c657012db71bc3ab0b8d5e0ae0 +#+ocaml-mtime.800f0ea1ed91cfdfbc248d207a31efd8b5d032896a7bdb493dd9363bed06a0a9 +#+ocaml-cmdliner.addf51324525664636c9519ed08cbbbdc1841914ebe57888afd4adc8b4904b00 +#+ocaml-fmt.bf68dbb6ea4bf577e26991cdd31e65bfd55a047a713c8e5988a88aabc0ffa197 #@untar:-j:sha256:ee97065ba41ce28f19dea9453c6bec4e0ef26165ad7394c4131ea0c65c0f06d5:. diff --git a/variants/root-x86_64/ocaml-lun b/variants/root-x86_64/ocaml-lun @@ -4,8 +4,8 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.8c21f24d07485e61cf270c6f08b4835b300c5bbed438c00d4a15da7c4c310a82 -#+dune.c3b1edee8563f4d0ff8da72aa485efe3d03e0f0e63b09f9a4efbfa6cded23597 +#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b +#+dune.1d96821471656a982ba38b4cdf267e22d9c0ae5cc62af3369060e787cbdda9be #@untar:-j:sha256:cca8badff83b470fdcfb1840116f8e8a6f2cb86cde2f44ed28cf26cbf692a793:. diff --git a/variants/root-x86_64/ocaml-mtime b/variants/root-x86_64/ocaml-mtime @@ -4,11 +4,11 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.8c21f24d07485e61cf270c6f08b4835b300c5bbed438c00d4a15da7c4c310a82 -#+ocaml-findlib.c5f5e98a9aa394834979c1cf2a083031d07ba2a2abbb0593911ae01d121b8d76 -#+ocamlbuild.726cc4e6e87a0d957492fd5fcbf05be99360e092f45fba05b67fd554b315c799 -#+opam.bb163482eaff8861ff95b95fd081f93d4290ed31588c8993d7b0db525336c9bf -#+ocaml-topkg.405390a830aec8aeb2bca246a9603c172e9f2ed123ec1a27d3757bc7c15e0959 +#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b +#+ocaml-findlib.a39ecc09c12d26540182a6ec072aaa8d143eec8fd6fdc83fe10a1967d5a67bb4 +#+ocamlbuild.28bc3003392ee524dc5f2f801066501b38cc981cc11bae7afd2b76d7aa0c13c9 +#+opam.0b8b72eb508f113f4e05ccecbdf83b033511f6783ad9ade214a567b1416b8d9a +#+ocaml-topkg.9a47e3784212f25fbfa42e05f14746bc58e165c657012db71bc3ab0b8d5e0ae0 #@untar:-j:sha256:097cb2802e3701ead9572e1b483d5a28c6e2f0a39449faaf9b44ad8a89834d88:. diff --git a/variants/root-x86_64/ocaml-ppx_derivers b/variants/root-x86_64/ocaml-ppx_derivers @@ -4,8 +4,8 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.8c21f24d07485e61cf270c6f08b4835b300c5bbed438c00d4a15da7c4c310a82 -#+dune.c3b1edee8563f4d0ff8da72aa485efe3d03e0f0e63b09f9a4efbfa6cded23597 +#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b +#+dune.1d96821471656a982ba38b4cdf267e22d9c0ae5cc62af3369060e787cbdda9be #@untar:-z:sha256:b6595ee187dea792b31fc54a0e1524ab1e48bc6068d3066c45215a138cc73b95:. diff --git a/variants/root-x86_64/ocaml-ppx_deriving b/variants/root-x86_64/ocaml-ppx_deriving @@ -4,15 +4,15 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.8c21f24d07485e61cf270c6f08b4835b300c5bbed438c00d4a15da7c4c310a82 -#+dune.c3b1edee8563f4d0ff8da72aa485efe3d03e0f0e63b09f9a4efbfa6cded23597 -#+ocaml-compiler-libs.8f011876a0555e4b81cfea8bc3332c5b0a1a189aefcf0bff14dcbc24f2ad2d6d -#+ocaml-cppo.af4d83ef133ff005d15315f593c3e6b88fc2bc93f63dda4d6e9daf6f0e1150fd -#+ocaml-findlib.c5f5e98a9aa394834979c1cf2a083031d07ba2a2abbb0593911ae01d121b8d76 -#+ocaml-ppx_derivers.3364f0689e941c1b2b30247294a76d4b984ccaf3451381895fee73349bb7864b -#+ocaml-ppxlib.40beaa6c11514aa11ee08e5b5590ba7e9efb68ed653f3c3fbf0eec0434a1fcb6 -#+ocaml-sexplib0.d321e4697e6a14d4c683a48cb327de624598e0d569d2cd06bf284b3a936ad9a6 -#+ocaml-stdlib-shims.e051031377f6abee710db639ab5a6f5bcbcd06bab0bf98d1b78050356e15954e +#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b +#+dune.1d96821471656a982ba38b4cdf267e22d9c0ae5cc62af3369060e787cbdda9be +#+ocaml-compiler-libs.4c652d4cfd4eb9ea5fe9265f49342902dea5f7ef98a77a0057f87e4a4c54a088 +#+ocaml-cppo.eb86a3b8470283e2f228984213e0998e4383d1269faf64f1935ce2fbc2b781ca +#+ocaml-findlib.a39ecc09c12d26540182a6ec072aaa8d143eec8fd6fdc83fe10a1967d5a67bb4 +#+ocaml-ppx_derivers.83244a3773b4267475d1b23c8528ccf242369dae37c855561186d3970012daee +#+ocaml-ppxlib.96a12cde9971d2b97006a4dd706c4358406c5573076a4978aa01afd2e0460969 +#+ocaml-sexplib0.242d9dfbfafdcdb49d2c406a925d42dd66a2c28fa9fa3ca3d188ee041f1d6e0d +#+ocaml-stdlib-shims.fa59c7f13285261150667f50ab5169811b3febd0f28049ab4e1a113246f32caa #@untar:-z:sha256:c91d1ea5e15e6928a2f8947dbd135b9f765cc0e2d72be271427981afcd350c24:. diff --git a/variants/root-x86_64/ocaml-ppxlib b/variants/root-x86_64/ocaml-ppxlib @@ -4,12 +4,12 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.8c21f24d07485e61cf270c6f08b4835b300c5bbed438c00d4a15da7c4c310a82 -#+dune.c3b1edee8563f4d0ff8da72aa485efe3d03e0f0e63b09f9a4efbfa6cded23597 -#+ocaml-compiler-libs.8f011876a0555e4b81cfea8bc3332c5b0a1a189aefcf0bff14dcbc24f2ad2d6d -#+ocaml-ppx_derivers.3364f0689e941c1b2b30247294a76d4b984ccaf3451381895fee73349bb7864b -#+ocaml-sexplib0.d321e4697e6a14d4c683a48cb327de624598e0d569d2cd06bf284b3a936ad9a6 -#+ocaml-stdlib-shims.e051031377f6abee710db639ab5a6f5bcbcd06bab0bf98d1b78050356e15954e +#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b +#+dune.1d96821471656a982ba38b4cdf267e22d9c0ae5cc62af3369060e787cbdda9be +#+ocaml-compiler-libs.4c652d4cfd4eb9ea5fe9265f49342902dea5f7ef98a77a0057f87e4a4c54a088 +#+ocaml-ppx_derivers.83244a3773b4267475d1b23c8528ccf242369dae37c855561186d3970012daee +#+ocaml-sexplib0.242d9dfbfafdcdb49d2c406a925d42dd66a2c28fa9fa3ca3d188ee041f1d6e0d +#+ocaml-stdlib-shims.fa59c7f13285261150667f50ab5169811b3febd0f28049ab4e1a113246f32caa #@untar:-j:sha256:2e223837e7cecc3bc84a432432c0a72f4e1d5be9165c9c33772f156db85db0b3:. diff --git a/variants/root-x86_64/ocaml-rresult b/variants/root-x86_64/ocaml-rresult @@ -4,11 +4,11 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.8c21f24d07485e61cf270c6f08b4835b300c5bbed438c00d4a15da7c4c310a82 -#+ocaml-findlib.c5f5e98a9aa394834979c1cf2a083031d07ba2a2abbb0593911ae01d121b8d76 -#+ocamlbuild.726cc4e6e87a0d957492fd5fcbf05be99360e092f45fba05b67fd554b315c799 -#+opam.bb163482eaff8861ff95b95fd081f93d4290ed31588c8993d7b0db525336c9bf -#+ocaml-topkg.405390a830aec8aeb2bca246a9603c172e9f2ed123ec1a27d3757bc7c15e0959 +#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b +#+ocaml-findlib.a39ecc09c12d26540182a6ec072aaa8d143eec8fd6fdc83fe10a1967d5a67bb4 +#+ocamlbuild.28bc3003392ee524dc5f2f801066501b38cc981cc11bae7afd2b76d7aa0c13c9 +#+opam.0b8b72eb508f113f4e05ccecbdf83b033511f6783ad9ade214a567b1416b8d9a +#+ocaml-topkg.9a47e3784212f25fbfa42e05f14746bc58e165c657012db71bc3ab0b8d5e0ae0 #@untar:-j:sha256:11aa7f5b83460e60431e3154e3e32c071d46e151ea5760cf24377805bf975540:. diff --git a/variants/root-x86_64/ocaml-sexplib0 b/variants/root-x86_64/ocaml-sexplib0 @@ -4,8 +4,8 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.8c21f24d07485e61cf270c6f08b4835b300c5bbed438c00d4a15da7c4c310a82 -#+dune.c3b1edee8563f4d0ff8da72aa485efe3d03e0f0e63b09f9a4efbfa6cded23597 +#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b +#+dune.1d96821471656a982ba38b4cdf267e22d9c0ae5cc62af3369060e787cbdda9be #@untar:-z:sha256:86dba26468194512f789f2fb709063515a9cb4e5c4461c021c239a369590701d:. diff --git a/variants/root-x86_64/ocaml-stdlib-shims b/variants/root-x86_64/ocaml-stdlib-shims @@ -4,8 +4,8 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.8c21f24d07485e61cf270c6f08b4835b300c5bbed438c00d4a15da7c4c310a82 -#+dune.c3b1edee8563f4d0ff8da72aa485efe3d03e0f0e63b09f9a4efbfa6cded23597 +#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b +#+dune.1d96821471656a982ba38b4cdf267e22d9c0ae5cc62af3369060e787cbdda9be #@untar:-j:sha256:babf72d3917b86f707885f0c5528e36c63fccb698f4b46cf2bab5c7ccdd6d84a:. diff --git a/variants/root-x86_64/ocaml-topkg b/variants/root-x86_64/ocaml-topkg @@ -4,10 +4,10 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.8c21f24d07485e61cf270c6f08b4835b300c5bbed438c00d4a15da7c4c310a82 -#+ocaml-findlib.c5f5e98a9aa394834979c1cf2a083031d07ba2a2abbb0593911ae01d121b8d76 -#+ocamlbuild.726cc4e6e87a0d957492fd5fcbf05be99360e092f45fba05b67fd554b315c799 -#+opam.bb163482eaff8861ff95b95fd081f93d4290ed31588c8993d7b0db525336c9bf +#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b +#+ocaml-findlib.a39ecc09c12d26540182a6ec072aaa8d143eec8fd6fdc83fe10a1967d5a67bb4 +#+ocamlbuild.28bc3003392ee524dc5f2f801066501b38cc981cc11bae7afd2b76d7aa0c13c9 +#+opam.0b8b72eb508f113f4e05ccecbdf83b033511f6783ad9ade214a567b1416b8d9a #@untar:-j:sha256:452082626e651ac4b1633c2b4ae4cad7abeb1fb6a13046e699f95eec58b5d1c7:. diff --git a/variants/root-x86_64/ocaml:dynlink b/variants/root-x86_64/ocaml:dynlink @@ -4,8 +4,8 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+m4.9191d0c69527b5e503257c2af7aeb2ec2dd614e9999de0c0006d481a62b59c1e #@untar:-J:sha256:dfaa8a2e11c799bc1765d8bef44911406ee5f4803027190382a939f88c912266:. diff --git a/variants/root-x86_64/ocaml_intrinsics_kernel b/variants/root-x86_64/ocaml_intrinsics_kernel @@ -4,8 +4,8 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+ocaml.8c21f24d07485e61cf270c6f08b4835b300c5bbed438c00d4a15da7c4c310a82 -#+dune.c3b1edee8563f4d0ff8da72aa485efe3d03e0f0e63b09f9a4efbfa6cded23597 +#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b +#+dune.1d96821471656a982ba38b4cdf267e22d9c0ae5cc62af3369060e787cbdda9be #@untar:-z:sha256:c988b7769a59749631c3c98ba5edd1d2fe91f5dc380b5e0593c073c92f4bee01:. diff --git a/variants/root-x86_64/ocamlbuild b/variants/root-x86_64/ocamlbuild @@ -4,9 +4,9 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 -#+ocaml.8c21f24d07485e61cf270c6f08b4835b300c5bbed438c00d4a15da7c4c310a82 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+m4.9191d0c69527b5e503257c2af7aeb2ec2dd614e9999de0c0006d481a62b59c1e +#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b #@untar:-z:sha256:2ba6857f2991b7f69368e8db818b163d31cf5a367f15f5953bf8f01a77b3d4fc:. @@ -19,11 +19,20 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? - if test x '!=' "x$interp_info"; then - printf '%s\n' "Error: '$1' is a dynamic binary!" - exit 1 - fi + case $interp_info in + ('') + printf '%s\n' "Error: '$1' is not a dynamic binary!" + exit 1 + ;; + (*'/versions/musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676/x86_64-linux-musl/lib/ld-musl-x86_64.so.1') + return 0 + ;; + (*) + printf '%s\n' "Error: '$1' unexpected linker path!" + exit 1 + esac } prefix=/versions/$pthbs_package @@ -44,7 +53,7 @@ make DESTDIR="$pthbs_destdir" install -check_static command/ocamlbuild +check_dynamic command/ocamlbuild diff --git a/variants/root-x86_64/opam b/variants/root-x86_64/opam @@ -2,13 +2,13 @@ #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b -#+diffutils.dbe0e2258153174e9bde5107bab7a436d8c4d8b88e9d74f35eb72b67cfc73148 -#+patch.1f7ab95c511ea31573c4b2e3338bd15925cd1b93631a0681388475e41678d93f -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 +#+diffutils.566986f3321e239718d1356b3131c82833ade565b9c1a5d0dfe1b03be65f5701 +#+patch.aaad0551089641f4c59cb166e6c41262d1a1b95ab18c52f4c02746951a141602 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+getconf.a13baa310359caefe186a823f0386190b6286fccf30aaf8301e115f3dc973d44 -#+ocaml.8c21f24d07485e61cf270c6f08b4835b300c5bbed438c00d4a15da7c4c310a82 -#+dune.c3b1edee8563f4d0ff8da72aa485efe3d03e0f0e63b09f9a4efbfa6cded23597 +#+getconf.0d39c75a75e6b938e367a7c53998e6c38a20cf8bf46407cab3bf765e512e5cfd +#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b +#+dune.1d96821471656a982ba38b4cdf267e22d9c0ae5cc62af3369060e787cbdda9be #@untar:-z:sha256:c4d053029793c714e4e7340b1157428c0f90783585fb17f35158247a640467d9:. @@ -21,6 +21,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" @@ -46,7 +47,7 @@ export DUNE_CACHE=disabled --infodir="$prefix/info" \ --localedir="$prefix/locale" \ --localstatedir='/var/pthbs' \ - --with-dune='/versions/dune.c3b1edee8563f4d0ff8da72aa485efe3d03e0f0e63b09f9a4efbfa6cded23597/command/dune' \ + --with-dune='/versions/dune.1d96821471656a982ba38b4cdf267e22d9c0ae5cc62af3369060e787cbdda9be/command/dune' \ --with-mccs \ --with-vendored-deps \ --enable-static diff --git a/variants/root-x86_64/openssl b/variants/root-x86_64/openssl @@ -2,7 +2,7 @@ #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 #@untar:-z:sha256:712590fd20aaa60ec75d778fe5b810d6b829ca7fb1e530577917a131f9105539:. @@ -22,6 +22,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/patch b/variants/root-x86_64/patch @@ -4,8 +4,8 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+m4.9191d0c69527b5e503257c2af7aeb2ec2dd614e9999de0c0006d481a62b59c1e #@untar:-J:sha256:ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd:. @@ -48,6 +48,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/patchelf:bootstrap b/variants/root-x86_64/patchelf:bootstrap @@ -43,6 +43,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/pkgconf b/variants/root-x86_64/pkgconf @@ -4,8 +4,8 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+m4.9191d0c69527b5e503257c2af7aeb2ec2dd614e9999de0c0006d481a62b59c1e #@untar:-J:sha256:3a224f2accf091b77a5781316e27b9ee3ba82c083cc2e539e08940b68a44fec5:. @@ -48,6 +48,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/pkgconf-pkg-config b/variants/root-x86_64/pkgconf-pkg-config @@ -1,6 +1,6 @@ #!/usr/bin/env pthbs-build #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 -#+pkgconf.701d832dbca978256fbf2fdc934d79dc080dd0b5c1b16251489b369a1effb515 +#+pkgconf.3fe7bf2fba1b5bf85fa1d24c097f7744fa13b16d89e09038592e1495a995e353 mkdir -p "$pthbs_destdir/versions/$pthbs_package" cd "$pthbs_destdir/versions/$pthbs_package" diff --git a/variants/root-x86_64/popt b/variants/root-x86_64/popt @@ -4,8 +4,8 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+m4.9191d0c69527b5e503257c2af7aeb2ec2dd614e9999de0c0006d481a62b59c1e #@untar:-z:sha256:c25a4838fc8e4c1c8aacb8bd620edb3084a3d63bf8987fdad3ca2758c63240f9:. @@ -48,6 +48,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/pthbs-banginstall b/variants/root-x86_64/pthbs-banginstall @@ -2,7 +2,7 @@ #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b -#+zsh.86584889aa0a3af405974c69ab43869f82e00acdba5340528e5dd20757f7dfc8 +#+zsh.55516f3be847b82216df2719107cef2443e6ca78a25e640c91ce958a57ffefbf #@sha256:1e021bddaf5c020ede9107656494715236a894557b99035365fc999605541b2d:pthbs-banginstall diff --git a/variants/root-x86_64/rsync b/variants/root-x86_64/rsync @@ -3,12 +3,12 @@ #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 -#+nawk.8521bf13f53618b7897b7f2e070a506a0101c985f6b9bb527d5eb15d8e8d4858 -#+popt.08360266ade94b08f97447cd43492a9371bcbf5945d818b15d39a1b36f0f3d40 -#+libressl.86f9dd5a8a3bb042d9561ef187d7fb64f9cc2be3bb707b9e171208bae5c684ef -#+zstd.38b14331a2c89a3fc5d568ddddc14918031315ba2a24b6ffa8bd874c6f54bbc1 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+m4.9191d0c69527b5e503257c2af7aeb2ec2dd614e9999de0c0006d481a62b59c1e +#+nawk.8fa343bf9be41a9701620e63eced62e002ec008a1eeb1beb2ce7986e6d7351f9 +#+popt.8f804ea33454d1a76538aa944ec17d1c891cfefa668abb70e24771939397f197 +#+libressl.2da188e728e941d7851e1179e85211e90620f9fb750b9fa064df2a87a6e590a4 +#+zstd.cab786b9c2ab7a9f45379d06b7c76011295a6725f374d1f5dbcd33e18df2bada #@untar:-z:sha256:4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb:. @@ -51,6 +51,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/s6 b/variants/root-x86_64/s6 @@ -3,9 +3,9 @@ #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+skalibs.a26d2e6f716163365561db4c61d78907be5ed9b34cfbc9d2475962029ba39aeb -#+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+skalibs.7e1cc77f32e81bc7517dc10d6eaa7704bb89aaf6a4f35f88a9e400170aa93edb +#+execline.b282f9d9ee24feffdf9ff72510c1471360d0819b0a4f7e9cf5a84679d066aa85 #@git:0e02fe0e92b8f9a619fc355babad2c78c009c1f1:s6 @@ -22,7 +22,7 @@ cd 's6' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.a26d2e6f716163365561db4c61d78907be5ed9b34cfbc9d2475962029ba39aeb/sysdeps' \ + --with-sysdeps='/versions/skalibs.7e1cc77f32e81bc7517dc10d6eaa7704bb89aaf6a4f35f88a9e400170aa93edb/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/root-x86_64/s6-dns b/variants/root-x86_64/s6-dns @@ -3,8 +3,8 @@ #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+skalibs.a26d2e6f716163365561db4c61d78907be5ed9b34cfbc9d2475962029ba39aeb +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+skalibs.7e1cc77f32e81bc7517dc10d6eaa7704bb89aaf6a4f35f88a9e400170aa93edb #@git:dc80225c0a78346300d100f0bf0182ed338c4b01:s6-dns @@ -21,7 +21,7 @@ cd 's6-dns' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.a26d2e6f716163365561db4c61d78907be5ed9b34cfbc9d2475962029ba39aeb/sysdeps' \ + --with-sysdeps='/versions/skalibs.7e1cc77f32e81bc7517dc10d6eaa7704bb89aaf6a4f35f88a9e400170aa93edb/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/root-x86_64/s6-linux-init b/variants/root-x86_64/s6-linux-init @@ -3,10 +3,10 @@ #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+skalibs.a26d2e6f716163365561db4c61d78907be5ed9b34cfbc9d2475962029ba39aeb -#+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284 -#+s6.344af4b89dee417e72484532005f0a223e20675a15daac49d498a554812bac61 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+skalibs.7e1cc77f32e81bc7517dc10d6eaa7704bb89aaf6a4f35f88a9e400170aa93edb +#+execline.b282f9d9ee24feffdf9ff72510c1471360d0819b0a4f7e9cf5a84679d066aa85 +#+s6.825c2fd936a972faf7f4c21aa0d3b91760d4fe1acb0d80d94d71ab1ec5b0ae83 #@git:b298e515efe16210048e504e3aec89ea1e627b73:s6-linux-init @@ -23,7 +23,7 @@ cd 's6-linux-init' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.a26d2e6f716163365561db4c61d78907be5ed9b34cfbc9d2475962029ba39aeb/sysdeps' \ + --with-sysdeps='/versions/skalibs.7e1cc77f32e81bc7517dc10d6eaa7704bb89aaf6a4f35f88a9e400170aa93edb/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/root-x86_64/s6-linux-utils b/variants/root-x86_64/s6-linux-utils @@ -3,8 +3,8 @@ #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+skalibs.a26d2e6f716163365561db4c61d78907be5ed9b34cfbc9d2475962029ba39aeb +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+skalibs.7e1cc77f32e81bc7517dc10d6eaa7704bb89aaf6a4f35f88a9e400170aa93edb #@git:a9e7acac41a8854546246dd39cb4daee54ead2cb:s6-linux-utils @@ -21,7 +21,7 @@ cd 's6-linux-utils' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.a26d2e6f716163365561db4c61d78907be5ed9b34cfbc9d2475962029ba39aeb/sysdeps' \ + --with-sysdeps='/versions/skalibs.7e1cc77f32e81bc7517dc10d6eaa7704bb89aaf6a4f35f88a9e400170aa93edb/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/root-x86_64/s6-networking b/variants/root-x86_64/s6-networking @@ -3,12 +3,12 @@ #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+skalibs.a26d2e6f716163365561db4c61d78907be5ed9b34cfbc9d2475962029ba39aeb -#+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284 -#+s6.344af4b89dee417e72484532005f0a223e20675a15daac49d498a554812bac61 -#+s6-dns.66def5b5ecaa018779d26f6f341b8477f6e2ef8e6aee5e4f30e2f4ee36d59299 -#+libressl.86f9dd5a8a3bb042d9561ef187d7fb64f9cc2be3bb707b9e171208bae5c684ef +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+skalibs.7e1cc77f32e81bc7517dc10d6eaa7704bb89aaf6a4f35f88a9e400170aa93edb +#+execline.b282f9d9ee24feffdf9ff72510c1471360d0819b0a4f7e9cf5a84679d066aa85 +#+s6.825c2fd936a972faf7f4c21aa0d3b91760d4fe1acb0d80d94d71ab1ec5b0ae83 +#+s6-dns.00c6e1080440c8475c0ec8bed3070199c9a2a9ec293cc0d2afbd233e720dfa47 +#+libressl.2da188e728e941d7851e1179e85211e90620f9fb750b9fa064df2a87a6e590a4 #@git:12b40106ed1727274cd6af379c4ba0ca7161700b:s6-networking @@ -25,7 +25,7 @@ cd 's6-networking' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.a26d2e6f716163365561db4c61d78907be5ed9b34cfbc9d2475962029ba39aeb/sysdeps' \ + --with-sysdeps='/versions/skalibs.7e1cc77f32e81bc7517dc10d6eaa7704bb89aaf6a4f35f88a9e400170aa93edb/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/root-x86_64/s6-portable-utils b/variants/root-x86_64/s6-portable-utils @@ -3,8 +3,8 @@ #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+skalibs.a26d2e6f716163365561db4c61d78907be5ed9b34cfbc9d2475962029ba39aeb +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+skalibs.7e1cc77f32e81bc7517dc10d6eaa7704bb89aaf6a4f35f88a9e400170aa93edb #@git:dc96d8a020e83b16dd7a8bd093bdb00ab2b944c0:s6-portable-utils @@ -21,7 +21,7 @@ cd 's6-portable-utils' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.a26d2e6f716163365561db4c61d78907be5ed9b34cfbc9d2475962029ba39aeb/sysdeps' \ + --with-sysdeps='/versions/skalibs.7e1cc77f32e81bc7517dc10d6eaa7704bb89aaf6a4f35f88a9e400170aa93edb/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/root-x86_64/s6-rc b/variants/root-x86_64/s6-rc @@ -3,10 +3,10 @@ #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+skalibs.a26d2e6f716163365561db4c61d78907be5ed9b34cfbc9d2475962029ba39aeb -#+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284 -#+s6.344af4b89dee417e72484532005f0a223e20675a15daac49d498a554812bac61 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+skalibs.7e1cc77f32e81bc7517dc10d6eaa7704bb89aaf6a4f35f88a9e400170aa93edb +#+execline.b282f9d9ee24feffdf9ff72510c1471360d0819b0a4f7e9cf5a84679d066aa85 +#+s6.825c2fd936a972faf7f4c21aa0d3b91760d4fe1acb0d80d94d71ab1ec5b0ae83 #@git:a4756f00b3823952580d1fee704675c6f813a248:s6-rc @@ -23,7 +23,7 @@ cd 's6-rc' --bindir="${prefix}/command" \ --libdir="${prefix}/library" \ --shebangdir="${prefix}/command" \ - --with-sysdeps='/versions/skalibs.a26d2e6f716163365561db4c61d78907be5ed9b34cfbc9d2475962029ba39aeb/sysdeps' \ + --with-sysdeps='/versions/skalibs.7e1cc77f32e81bc7517dc10d6eaa7704bb89aaf6a4f35f88a9e400170aa93edb/sysdeps' \ --with-include="$pthbs_build_environment/include" \ --with-lib="$pthbs_build_environment/library" \ --with-dynlib="$pthbs_build_environment/library.so" \ diff --git a/variants/root-x86_64/skalibs b/variants/root-x86_64/skalibs @@ -3,7 +3,7 @@ #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c #@git:96b537f42695da1b865588baf591fdfcae76bd41:skalibs diff --git a/variants/root-x86_64/snaprep b/variants/root-x86_64/snaprep @@ -2,8 +2,8 @@ #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b -#+zsh.86584889aa0a3af405974c69ab43869f82e00acdba5340528e5dd20757f7dfc8 -#+pthbs-banginstall.0442e58611ea2fc27a0a57a4c1b9b8696d799e9ebb737f3548553a61f845e34b +#+zsh.55516f3be847b82216df2719107cef2443e6ca78a25e640c91ce958a57ffefbf +#+pthbs-banginstall.47878a453e8bccc968de24b08fdb9ac896d016821936c4cb8974968875eadaa2 #@git:e9d8af262eb5e25536ea9778e3ed57aebb55488c:snaprep diff --git a/variants/root-x86_64/strace b/variants/root-x86_64/strace @@ -4,10 +4,10 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 -#+patch.1f7ab95c511ea31573c4b2e3338bd15925cd1b93631a0681388475e41678d93f -#+libunwind.6319756af6b1bee00a97b7501a864bd37adc27792377e5242cc5d8258e509235 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+m4.9191d0c69527b5e503257c2af7aeb2ec2dd614e9999de0c0006d481a62b59c1e +#+patch.aaad0551089641f4c59cb166e6c41262d1a1b95ab18c52f4c02746951a141602 +#+libunwind.ce5bea79c22ed87be3b4317775093e285e5b009b1c3ead133c7eeac421e46cf7 #@sha256:37d93db7135d47852dbe763f1b18b3aeab142431a6f5268a17fc700387a326e4:strace-6.5-static.patch #@untar:-J:sha256:e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17:. @@ -51,6 +51,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/system-config b/variants/root-x86_64/system-config @@ -1,21 +1,21 @@ #!/usr/bin/env pthbs-build #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 -#+nawk.8521bf13f53618b7897b7f2e070a506a0101c985f6b9bb527d5eb15d8e8d4858 -#+diffutils.dbe0e2258153174e9bde5107bab7a436d8c4d8b88e9d74f35eb72b67cfc73148 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+aat.1a24f86810721d21e38b938be940549908121eb386821cded1a27ac973c8d47e -#+fileset.8d3627d93e7b4c33483589e8602b462d3fcd31d6f38adde5ee53c024197c7286 -#+rsync.a3914e6a58e85cc838ef8c8cda9ec4ba6e49cdd7376d09a2d0c6b072c656c3e7 -#+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284 -#+kbd.6c8d2c7d8367fa6fe1ec7df2aa44c09f120f7ba886fc69cd39e336f8cd99121c -#+mdevd.0502ff0a0d6e4f3b58469d0d3aef8816631718d5375ec0d41913dfa9121590fb -#+s6-linux-utils.2e5ac9209104c458e8935a4b4e9ce3ed6e9aa3e6c4d85675a1e945d1fe77530f -#+s6-rc.9416ba0fe405fc2a019beeee1b35a666324184886c12b89deb929c515ca06183 -#+s6.344af4b89dee417e72484532005f0a223e20675a15daac49d498a554812bac61 -#+zsh.86584889aa0a3af405974c69ab43869f82e00acdba5340528e5dd20757f7dfc8 -#+system-config-scripts.c533391a1fcb035cbc2e4bad71f1dc5c40ed8b2c37d0dcd2cc7929c1dea80b5f -#+logincaps.507ec1380a0988547542ae0ad146daffd92e08ab8faf964323c28f430edcc406 +#+nawk.8fa343bf9be41a9701620e63eced62e002ec008a1eeb1beb2ce7986e6d7351f9 +#+diffutils.566986f3321e239718d1356b3131c82833ade565b9c1a5d0dfe1b03be65f5701 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+aat.c426f699aac42c85b0b49c87fa06dc27e1a84210d66104421126c14279dd89f3 +#+fileset.29f2264850fdb33fdd55b943c8effb3928bda1bf97901c5464faa1bba70b0f72 +#+rsync.88a1ff8658f8a443a45b185c6099a3859966230ecb535a1c230f48fd9b74d6d0 +#+execline.b282f9d9ee24feffdf9ff72510c1471360d0819b0a4f7e9cf5a84679d066aa85 +#+kbd.db2111b19237cc12e5dc3c7a1ad4d9eefbe180568116e3c46d750e1a4b1dc505 +#+mdevd.ea411dccb9b77c3d6a37830552fef579006b94a4b56f0c975f78dcf713698f75 +#+s6-linux-utils.588fdfd1940fc620f1f3d0bb0e9c45ae9ac9d52160ba8896dc553060d0909527 +#+s6-rc.83be9ae6e6fe5025f446343c23fc8eb904149ef477f419387ee7bd6c5484d9fa +#+s6.825c2fd936a972faf7f4c21aa0d3b91760d4fe1acb0d80d94d71ab1ec5b0ae83 +#+zsh.55516f3be847b82216df2719107cef2443e6ca78a25e640c91ce958a57ffefbf +#+system-config-scripts.9324b5eb412564369d5960e3db212e690260eee2e236e72668832ec6e4ef66ba +#+logincaps.865774a46882681cabdb0667c312f750c4cc19401b8a51eaba1207ffc4f8b39e #+busybox-modutils.ebb7b2cc2e280cc5c68f2c7ccd8dd75304de57061e314de8459057fb2b7c0209 #@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.8ee086610c93dc1136a8333386f1d0185279dec55a500fe57d80eb19e4b58280' \ - 'pthbs_path_mdevd=/versions/env.e8aea96d6e0d86815b6d12eb1e504bb4460a9caf303b1e1740575c2131071ea2' \ + 'pthbs_path_containers=/versions/env.267449cef3a6c30e3f05298910ac537c98c778eef15d1f5cd8b7c3958f64e305' \ + 'pthbs_path_mdevd=/versions/env.c6cf478e232d67742d7ee7e4c18be6099f631c02aa5fa5bff982f440e9dba800' \ 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 @@ -2,12 +2,12 @@ #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b -#+s6.344af4b89dee417e72484532005f0a223e20675a15daac49d498a554812bac61 -#+s6-rc.9416ba0fe405fc2a019beeee1b35a666324184886c12b89deb929c515ca06183 -#+s6-portable-utils.07e8ff4d2d45a743ec810d3e27268460d201bafbb0a765756da09179758d4b0d -#+s6-linux-init.e17bf07f726729c579bb12c1d25dad4bb263f96509f7ea852bb44d50737d0b4d -#+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284 -#+system-config-rc.f195ae3ca842cf1421012883b80b03e2d31c16ea2445a4899365620f1de0eebd +#+s6.825c2fd936a972faf7f4c21aa0d3b91760d4fe1acb0d80d94d71ab1ec5b0ae83 +#+s6-rc.83be9ae6e6fe5025f446343c23fc8eb904149ef477f419387ee7bd6c5484d9fa +#+s6-portable-utils.e7aa5bc9d2f2f5ff49678a2579f7a6d1a5442871b7c69a81060d20118c9fd331 +#+s6-linux-init.a5c1bae8bc5bfa54917a4f0119b268f52011a033f8583060487bc3e9dd8cb1e8 +#+execline.b282f9d9ee24feffdf9ff72510c1471360d0819b0a4f7e9cf5a84679d066aa85 +#+system-config-rc.a019fae4bf4f0dc7481fc6ada3a90c94a4b7bccc4b4bcfe8cfe332602be30406 # - build script start - @@ -32,7 +32,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -s6rcdb=/versions/system-config-rc.f195ae3ca842cf1421012883b80b03e2d31c16ea2445a4899365620f1de0eebd/config/s6-rc-db +s6rcdb=/versions/system-config-rc.a019fae4bf4f0dc7481fc6ada3a90c94a4b7bccc4b4bcfe8cfe332602be30406/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 @@ -3,9 +3,9 @@ #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc -#+s6-rc.9416ba0fe405fc2a019beeee1b35a666324184886c12b89deb929c515ca06183 -#+fileset.8d3627d93e7b4c33483589e8602b462d3fcd31d6f38adde5ee53c024197c7286 -#+system-config.6a7b108b1c4f4d1c71e2d43fceac30f1724e4728968395c0ffae119375b68524 +#+s6-rc.83be9ae6e6fe5025f446343c23fc8eb904149ef477f419387ee7bd6c5484d9fa +#+fileset.29f2264850fdb33fdd55b943c8effb3928bda1bf97901c5464faa1bba70b0f72 +#+system-config.597773922b4d29324e535e8c23a640fe86f313f1a8808d43fe4dbd7b73136452 # - build script start - @@ -15,7 +15,7 @@ dest=${pthbs_destdir%/}${prefix} cd '.' -src=/versions/system-config.6a7b108b1c4f4d1c71e2d43fceac30f1724e4728968395c0ffae119375b68524/config/s6-rc-source +src=/versions/system-config.597773922b4d29324e535e8c23a640fe86f313f1a8808d43fe4dbd7b73136452/config/s6-rc-source s6-rc-compile ./s6-rc-db "$src" mkdir -p "$dest/config" mv -v s6-rc-db "$dest/config/" diff --git a/variants/root-x86_64/system-config-scripts b/variants/root-x86_64/system-config-scripts @@ -2,8 +2,8 @@ #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b -#+zsh.86584889aa0a3af405974c69ab43869f82e00acdba5340528e5dd20757f7dfc8 -#+pthbs-banginstall.0442e58611ea2fc27a0a57a4c1b9b8696d799e9ebb737f3548553a61f845e34b +#+zsh.55516f3be847b82216df2719107cef2443e6ca78a25e640c91ce958a57ffefbf +#+pthbs-banginstall.47878a453e8bccc968de24b08fdb9ac896d016821936c4cb8974968875eadaa2 #@git:dc793695cc0632a808af9d4415f3b0cf0f4dfba2:system-config-scripts diff --git a/variants/root-x86_64/system-config-zsh b/variants/root-x86_64/system-config-zsh @@ -2,7 +2,7 @@ #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b -#+zsh.86584889aa0a3af405974c69ab43869f82e00acdba5340528e5dd20757f7dfc8 +#+zsh.55516f3be847b82216df2719107cef2443e6ca78a25e640c91ce958a57ffefbf #@git:6dfbe33079e2f8c64c5daed29aa1ea3e7e3f2d59:system-config-zsh diff --git a/variants/root-x86_64/user-env b/variants/root-x86_64/user-env @@ -2,8 +2,8 @@ #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b -#+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284 -#+pthbs-banginstall.0442e58611ea2fc27a0a57a4c1b9b8696d799e9ebb737f3548553a61f845e34b +#+execline.b282f9d9ee24feffdf9ff72510c1471360d0819b0a4f7e9cf5a84679d066aa85 +#+pthbs-banginstall.47878a453e8bccc968de24b08fdb9ac896d016821936c4cb8974968875eadaa2 #@sha256:664430d033e0b491a5ed90cb39cb17cddb57ac0be9f3f2bf014264f3c17d55df:user-env diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment @@ -1,42 +1,42 @@ #!/usr/bin/env pthbs-build #+busybox.05cde6bebcef146cc4de9201c82e0ef427702cc3bfe1acb48c0587542ba53002 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+diffutils.dbe0e2258153174e9bde5107bab7a436d8c4d8b88e9d74f35eb72b67cfc73148 -#+patch.1f7ab95c511ea31573c4b2e3338bd15925cd1b93631a0681388475e41678d93f -#+flex.a0b530df71023dab46f59c8c0a6255bae4c6e8e8d88087364e36fcc86318f41b -#+bison.50a879da42f360f6a461ecb3eaafaed1ee77389f064b469614f27328bbd15e44 -#+rsync.a3914e6a58e85cc838ef8c8cda9ec4ba6e49cdd7376d09a2d0c6b072c656c3e7 -#+execline.c677b46c36eac37bee97ce38c09c501d27babea0737cbab9fb21a3ec9b194284 -#+s6.344af4b89dee417e72484532005f0a223e20675a15daac49d498a554812bac61 -#+s6-rc.9416ba0fe405fc2a019beeee1b35a666324184886c12b89deb929c515ca06183 -#+s6-portable-utils.07e8ff4d2d45a743ec810d3e27268460d201bafbb0a765756da09179758d4b0d -#+s6-linux-utils.2e5ac9209104c458e8935a4b4e9ce3ed6e9aa3e6c4d85675a1e945d1fe77530f -#+s6-linux-init.e17bf07f726729c579bb12c1d25dad4bb263f96509f7ea852bb44d50737d0b4d -#+mdevd.0502ff0a0d6e4f3b58469d0d3aef8816631718d5375ec0d41913dfa9121590fb -#+s6-dns.66def5b5ecaa018779d26f6f341b8477f6e2ef8e6aee5e4f30e2f4ee36d59299 -#+libressl.86f9dd5a8a3bb042d9561ef187d7fb64f9cc2be3bb707b9e171208bae5c684ef -#+s6-networking.2e3a2b62476afed6b35e208fda1dfb764dc27b8319ec876411dcdb0c8e3bdc3e -#+zsh.86584889aa0a3af405974c69ab43869f82e00acdba5340528e5dd20757f7dfc8 -#+pthbs-banginstall.0442e58611ea2fc27a0a57a4c1b9b8696d799e9ebb737f3548553a61f845e34b -#+aat.1a24f86810721d21e38b938be940549908121eb386821cded1a27ac973c8d47e -#+confz.953faaabf2a7a6ab4aa9b374f83addbcc1ba98bfa195cf8cc9cb2fcb2595ffdb -#+containers.e523e49b939faba9a6f87694d6888765c3506d2484fde2227349e35bbcf41394 -#+fileset.8d3627d93e7b4c33483589e8602b462d3fcd31d6f38adde5ee53c024197c7286 -#+logincaps.507ec1380a0988547542ae0ad146daffd92e08ab8faf964323c28f430edcc406 -#+snaprep.756763e7b0d2cc247a6b4a517b1d1eca3cb04cbfbfef374541079c63f0c896c8 -#+curl.718c045c064f1e9fd5a7c71f50384345e35e1fc80e3ae7fdacadce73454dd3e7 -#+git.96c05646b93e3a672c5591f704106d3f6fea912d796cd0df6abd655b243d86eb -#+xbps.e7b102cdf29fa99c56eeacce8ade331896a379fad11189131b0d1efb4160a454 -#+apk-tools.714e1cb8bc861dec1710a25476f209f7b0602d954f74194d58c16747c5a3ad38 -#+getent.219406db8d31c860d8fb9052a1158f072c8b77ef4d1b71ef24e5fcc649201521 -#+getconf.a13baa310359caefe186a823f0386190b6286fccf30aaf8301e115f3dc973d44 -#+iconv.7afe835f0a03884e71f41bd2a96a88e9e1e73233137cb94da9f73a6721ed3001 -#+libcap.e2f548b558f389ead47900a784150f4165c128f846d2cc0c6ef9b1ee7b3da249 -#+applyuidgid-caps.d4cb37c46563dc1996e3faab76bc55168f85f449771a86fed5ad520ee406e07e -#+ccx-utils.769c165236aa3bc0564901e48e65c035ab3d342564dd1a440a512347d62d4ce9 -#+user-env.f9ab8060b8c6970d3b785694ef1f839f47c9eb31a0c13c0529f365583552db01 -#+strace.f67bc48859477eb362b356c2f4fd4d3a6a38fb3d32969338ec7f87dd48634904 -#+mlog.f9e7afa9325b4affd4298e6de0a07d22a074799f0ea7bda1e3fb58a37b98e398 -#+findutils.1edbb84f016e9dc61540b8396e85a2163570b9281a408f8787f17e404f685ce0 -#+nawk.8521bf13f53618b7897b7f2e070a506a0101c985f6b9bb527d5eb15d8e8d4858- \ No newline at end of file +#+diffutils.566986f3321e239718d1356b3131c82833ade565b9c1a5d0dfe1b03be65f5701 +#+patch.aaad0551089641f4c59cb166e6c41262d1a1b95ab18c52f4c02746951a141602 +#+flex.23f90e59737b0916506d7a180a53ad1ea620592ecff2d7e3aa8ece88c152af33 +#+bison.5aa6c06f7231813e87b8417220b93d58ff09fbde70b348f781fb42aec2880251 +#+rsync.88a1ff8658f8a443a45b185c6099a3859966230ecb535a1c230f48fd9b74d6d0 +#+execline.b282f9d9ee24feffdf9ff72510c1471360d0819b0a4f7e9cf5a84679d066aa85 +#+s6.825c2fd936a972faf7f4c21aa0d3b91760d4fe1acb0d80d94d71ab1ec5b0ae83 +#+s6-rc.83be9ae6e6fe5025f446343c23fc8eb904149ef477f419387ee7bd6c5484d9fa +#+s6-portable-utils.e7aa5bc9d2f2f5ff49678a2579f7a6d1a5442871b7c69a81060d20118c9fd331 +#+s6-linux-utils.588fdfd1940fc620f1f3d0bb0e9c45ae9ac9d52160ba8896dc553060d0909527 +#+s6-linux-init.a5c1bae8bc5bfa54917a4f0119b268f52011a033f8583060487bc3e9dd8cb1e8 +#+mdevd.ea411dccb9b77c3d6a37830552fef579006b94a4b56f0c975f78dcf713698f75 +#+s6-dns.00c6e1080440c8475c0ec8bed3070199c9a2a9ec293cc0d2afbd233e720dfa47 +#+libressl.2da188e728e941d7851e1179e85211e90620f9fb750b9fa064df2a87a6e590a4 +#+s6-networking.c4474f16c30a09046f30e379d46c286f20d510be09dc74264337a2a2ee3a0bc6 +#+zsh.55516f3be847b82216df2719107cef2443e6ca78a25e640c91ce958a57ffefbf +#+pthbs-banginstall.47878a453e8bccc968de24b08fdb9ac896d016821936c4cb8974968875eadaa2 +#+aat.c426f699aac42c85b0b49c87fa06dc27e1a84210d66104421126c14279dd89f3 +#+confz.2d770247c8db0a8e9584790027f1660ada8cd61f289ed17e9b7e1c180a71f7cf +#+containers.9f88a776ab0eadd3df4319a921acc45df401ebb3debe3312c0bc0cae483d7b7e +#+fileset.29f2264850fdb33fdd55b943c8effb3928bda1bf97901c5464faa1bba70b0f72 +#+logincaps.865774a46882681cabdb0667c312f750c4cc19401b8a51eaba1207ffc4f8b39e +#+snaprep.a83757ac0cdf2238775d5d5510aaa3b41ab720da2d94e58fcd97c07d79c5bf4a +#+curl.1396e916eb30f88da26b2eeb0ef68399956d9795553abd3ad852b482e03a954d +#+git.17eb39bfdebfff1476f0c165b6cb307d201a158fc27205fd9b5dfd78815aadd6 +#+xbps.c751a992d63d8aacc9f505cd6785d558c8d035ac64ab4d094a2fec116d76eb7a +#+apk-tools.d40e662b741fcd12dafc2570f34540c959f20672e7722f81e0dac942cc80e817 +#+getent.fe07497583b34512d19c03ae6808b82a21e66e40b257254c1ed7b8bc5065e8ec +#+getconf.0d39c75a75e6b938e367a7c53998e6c38a20cf8bf46407cab3bf765e512e5cfd +#+iconv.3bba9aeadf167fae13cd8b021cc229d3f5425c9a17cb86a66d73666d471c9136 +#+libcap.538a4a5e4ae9be5d1981b0ca4f47d4d0943a441271c2ad94f62fb98b7b1f8201 +#+applyuidgid-caps.f17b0d1363162311100e1e04646bd4c15cdf6d36b216f54ba128dcf71309e65e +#+ccx-utils.c0ea397fa2cbbb6fa18bf57a54fe2b709e459c63481428b2c3df2464f098e641 +#+user-env.c3c2ae10ea1310e3e9e2bf7c1cfdaf61c2f1f824bae5cd4baf4b4540c3881477 +#+strace.19444191f6ab164a01b3304017ed278635f340205b1d28fa6d3c7e2d5227167a +#+mlog.92af644369ffdc31db302c3777e519b54913ec535e87df1a4a775b98bd4f96c5 +#+findutils.8fb6b0f98e900ae929a7a697bf0283f8c78df0571b5c508fd68b74aeea3eb750 +#+nawk.8fa343bf9be41a9701620e63eced62e002ec008a1eeb1beb2ce7986e6d7351f9+ \ No newline at end of file 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.4171d86d0225bb940ba400a7a0c7406abfdd168efe92d1f393abb62b3c5c168a- \ No newline at end of file +#+linux-qemu-guest.cc8d53ace988d6c08555b32e4072dce8f4b7edf3f675cc801283be03377834ce+ \ No newline at end of file diff --git a/variants/root-x86_64/wip.environment b/variants/root-x86_64/wip.environment @@ -1,9 +1,9 @@ #!/usr/bin/env pthbs-build -#+ocaml.8c21f24d07485e61cf270c6f08b4835b300c5bbed438c00d4a15da7c4c310a82 -#+dune.c3b1edee8563f4d0ff8da72aa485efe3d03e0f0e63b09f9a4efbfa6cded23597 -#+ocamlbuild.726cc4e6e87a0d957492fd5fcbf05be99360e092f45fba05b67fd554b315c799 -#+ocaml-base.4d0e9e0eb7f6acace8af2f6e42180a88cafc16924f4da8b5d771990c0bf95324 -#+opam.bb163482eaff8861ff95b95fd081f93d4290ed31588c8993d7b0db525336c9bf -#+ocaml-bos.25ad25f1cd5f0cd688d83546ca657a4fbc5b9e5c2afe6abeff293d97dc2257a2 -#+ocaml-lun.c7fb3a46515f91a0db1b5b973f9bda611ff56a18571c355c9cf49942ca6f03da -#+ocaml-ppx_deriving.bd8a6f905562254bb667b5dc131e2edc052a0e58d491523c2222367c4d9b3f22- \ No newline at end of file +#+ocaml.ba81c983078f2eb4325ae063107f1389fde38fee0af5d1d92a90ea983d99c80b +#+dune.1d96821471656a982ba38b4cdf267e22d9c0ae5cc62af3369060e787cbdda9be +#+ocamlbuild.28bc3003392ee524dc5f2f801066501b38cc981cc11bae7afd2b76d7aa0c13c9 +#+ocaml-base.969bf51836a62e6d24ea34fcdde62386bfb3a9683d23d4f85db7ea60abc27096 +#+opam.0b8b72eb508f113f4e05ccecbdf83b033511f6783ad9ade214a567b1416b8d9a +#+ocaml-bos.265a1ef33d971da8650eb4b69da8283920f7cb146df78690e5b98e72e99efac9 +#+ocaml-lun.207c7cfb3c3ed78de49385c233488036b63e50d3ac2d0863715f2f706a23a47e +#+ocaml-ppx_deriving.f378e5fd69891041cec22fbd3b68cb3078c3d62ccf86b1324cdb8d8d78c73dd7+ \ No newline at end of file diff --git a/variants/root-x86_64/xbps b/variants/root-x86_64/xbps @@ -3,10 +3,10 @@ #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+libarchive.5aff27330d5fcb7f41de35cd02349baee7d80da706457bbb7dbb9c235f2c51e7 -#+libressl.86f9dd5a8a3bb042d9561ef187d7fb64f9cc2be3bb707b9e171208bae5c684ef -#+pkgconf-pkg-config.035ed72618fdde9058d87fb11cd6374080eef9927f78b0cd97cfc5afdfc21388 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+libarchive.4afeb95a757504925ab02413bfc2c7fe092f622c633daf31525be758166ee258 +#+libressl.2da188e728e941d7851e1179e85211e90620f9fb750b9fa064df2a87a6e590a4 +#+pkgconf-pkg-config.f468b6bdd77bccfc86d0814786e4a380f1370e89c2849de59ec2ef56fec84710 #@untar:-z:sha256:a6607e83fcd654a0ae846d729e43fefd8da9a61323e91430f884caf895b4f59b:. @@ -25,6 +25,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/zsh b/variants/root-x86_64/zsh @@ -4,10 +4,10 @@ #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 -#+m4.d87711c3b6d7cdea0f3b7a7af19a969fb6293d09aa1f310a4df3098201e26838 -#+netbsd-curses.8a5103b489cac54a30a106bb51046d98c27491d771c46f553caefbe0fa66df77 -#+libbsd.9006d67e42b588120014d618f0513911bac9a1164e0be71280c0db498b60fd18 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c +#+m4.9191d0c69527b5e503257c2af7aeb2ec2dd614e9999de0c0006d481a62b59c1e +#+netbsd-curses.809febf41c26259736b072fcda38189d305faef167fc77b9a9ae101de7141066 +#+libbsd.e87bde0cb5bc616b506633ac719c245383d7ba4243993a1cb21268e783ccb49a #@git:c73505cc47870bd09e8e204d98ac5976e0d4cb52:zsh_config #@untar:-J:sha256:9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5:. @@ -51,6 +51,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!" diff --git a/variants/root-x86_64/zstd b/variants/root-x86_64/zstd @@ -3,7 +3,7 @@ #+busybox-findutils.2c87d98d861d724e141128f395bed58e70601468aee2a192d77d5791d83772b7 #+busybox-awk.a5b9d5a1c719361e565a642a57d44356c26855fb0eda30c03eaf582ba6c3194b #+musl-cross-make.ef7f483eefcad5b8f2d6c8329e61a0acaca7864b88e9521cb839392c62f45676 -#+gnu-make.72c6cd66010255e26a13af335dd8220c935dfc6e811ca0f28226e35f6099ff15 +#+gnu-make.6c204d453a2d9b4e29dd7b9f93fc7c5a928284402b8646493cf72004f748753c #+busybox-diffutils.977bc00da27e0150d3b3d395fe42cf24e0364b03390cab81002f27b34158d9fc #@untar:-z:sha256:98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1:. @@ -23,6 +23,7 @@ check_static() { printf '%s\n' "Error: file '$1' doesn't exist!" exit 1 fi + local interp_info || true interp_info=$(readelf --string-dump=.interp "$exe") || exit $? if test x '!=' "x$interp_info"; then printf '%s\n' "Error: '$1' is a dynamic binary!"